tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ANDROID: vendor_hooks: add hooks for exting task's swp_entrys

Browse Source 
The process exit time is mainly caused by freeing its swp_entrys. When low memory triggers to kill lots of processes exit simultaneously, there is a problem of CPU high load occupied by the exiting processes.

This feature is used to asynchronously maintain and release the swp_entrys of the exiting process to accelerate the efficiency of the exiting process.

Bug: 418960020
Bug: 340798358
Bug: 341232502
Change-Id: I6fc0b813e7ac6a0796e08ce7a17d5ff3ab2b799b
Signed-off-by: Qianfeng Rong <rongqianfeng@vivo.corp-partner.google.com>
(cherry picked from commit e5475062920013f2ca65a6791023211f8be315ea)
This commit is contained in:
Qianfeng Rong
2024-05-17 18:53:22 +08:00
committed by Justin Jiang
parent 0629d7c40c
commit c7cef0a951
5 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/android/vendor_hooks.c
+5
View File
@@ -537,3 +537,8 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_calculate_totalreserve_pages);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_madvise_cold_pageout_skip); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_madvise_cold_pageout_skip);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_rmqueue_pcplist_override_batch); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_rmqueue_pcplist_override_batch);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_do_group_exit); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_do_group_exit);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_swapmem_gather_init);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_swapmem_gather_add_bypass);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_swapmem_gather_finish);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_oom_swapmem_gather_init);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_oom_swapmem_gather_finish);
include/trace/hooks/mm.h
+15
View File
@@ -487,6 +487,21 @@ DECLARE_HOOK(android_vh_rmqueue_pcplist_override_batch,
DECLARE_HOOK(android_vh_do_group_exit, DECLARE_HOOK(android_vh_do_group_exit,
TP_PROTO(struct task_struct *tsk), TP_PROTO(struct task_struct *tsk),
TP_ARGS(tsk)); TP_ARGS(tsk));
DECLARE_HOOK(android_vh_swapmem_gather_init,
TP_PROTO(struct mm_struct *mm),
TP_ARGS(mm));
DECLARE_HOOK(android_vh_swapmem_gather_add_bypass,
TP_PROTO(struct mm_struct *mm, swp_entry_t entry, int nr, bool *bypass),
TP_ARGS(mm, entry, nr, bypass));
DECLARE_HOOK(android_vh_swapmem_gather_finish,
TP_PROTO(struct mm_struct *mm),
TP_ARGS(mm));
DECLARE_HOOK(android_vh_oom_swapmem_gather_init,
TP_PROTO(struct mm_struct *mm),
TP_ARGS(mm));
DECLARE_HOOK(android_vh_oom_swapmem_gather_finish,
TP_PROTO(struct mm_struct *mm),
TP_ARGS(mm));
#endif /* _TRACE_HOOK_MM_H */ #endif /* _TRACE_HOOK_MM_H */
/* This part must be outside protection */ /* This part must be outside protection */
mm/memory.c
+5
View File
@@ -1604,6 +1604,7 @@ static unsigned long zap_pte_range(struct mmu_gather *tlb,
pte_t *pte; pte_t *pte;
swp_entry_t entry; swp_entry_t entry;
int nr; int nr;
bool bypass = false;
tlb_change_page_size(tlb, PAGE_SIZE); tlb_change_page_size(tlb, PAGE_SIZE);
init_rss_vec(rss); init_rss_vec(rss);
@@ -1663,6 +1664,9 @@ static unsigned long zap_pte_range(struct mmu_gather *tlb,
if (!should_zap_cows(details)) if (!should_zap_cows(details))
continue; continue;
rss[MM_SWAPENTS] -= nr; rss[MM_SWAPENTS] -= nr;
trace_android_vh_swapmem_gather_add_bypass(mm, entry, nr, &bypass);
if (bypass)
goto skip;
free_swap_and_cache_nr(entry, nr); free_swap_and_cache_nr(entry, nr);
} else if (is_migration_entry(entry)) { } else if (is_migration_entry(entry)) {
folio = pfn_swap_entry_folio(entry); folio = pfn_swap_entry_folio(entry);
@@ -1694,6 +1698,7 @@ static unsigned long zap_pte_range(struct mmu_gather *tlb,
pr_alert("unrecognized swap entry 0x%lx\n", entry.val); pr_alert("unrecognized swap entry 0x%lx\n", entry.val);
WARN_ON_ONCE(1); WARN_ON_ONCE(1);
} }
skip:
clear_not_present_full_ptes(mm, addr, pte, nr, tlb->fullmm); clear_not_present_full_ptes(mm, addr, pte, nr, tlb->fullmm);
zap_install_uffd_wp_if_needed(vma, addr, pte, nr, details, ptent); zap_install_uffd_wp_if_needed(vma, addr, pte, nr, details, ptent);
} while (pte += nr, addr += PAGE_SIZE * nr, addr != end); } while (pte += nr, addr += PAGE_SIZE * nr, addr != end);
mm/mmap.c
+2
View File
@@ -1952,9 +1952,11 @@ void exit_mmap(struct mm_struct *mm)
lru_add_drain(); lru_add_drain();
flush_cache_mm(mm); flush_cache_mm(mm);
tlb_gather_mmu_fullmm(&tlb, mm); tlb_gather_mmu_fullmm(&tlb, mm);
trace_android_vh_swapmem_gather_init(mm);
/* update_hiwater_rss(mm) here? but nobody should be looking */ /* update_hiwater_rss(mm) here? but nobody should be looking */
/* Use ULONG_MAX here to ensure all VMAs in the mm are unmapped */ /* Use ULONG_MAX here to ensure all VMAs in the mm are unmapped */
unmap_vmas(&tlb, &vmi.mas, vma, 0, ULONG_MAX, ULONG_MAX, false); unmap_vmas(&tlb, &vmi.mas, vma, 0, ULONG_MAX, ULONG_MAX, false);
trace_android_vh_swapmem_gather_finish(mm);
mmap_read_unlock(mm); mmap_read_unlock(mm);
/* /*
mm/oom_kill.c
+4
View File
@@ -53,6 +53,8 @@
#define CREATE_TRACE_POINTS #define CREATE_TRACE_POINTS
#include <trace/events/oom.h> #include <trace/events/oom.h>
#undef CREATE_TRACE_POINTS
#include <trace/hooks/mm.h>
#undef CREATE_TRACE_POINTS #undef CREATE_TRACE_POINTS
#include <trace/hooks/mm.h> #include <trace/hooks/mm.h>
@@ -531,6 +533,7 @@ bool __oom_reap_task_mm(struct mm_struct *mm)
*/ */
set_bit(MMF_UNSTABLE, &mm->flags); set_bit(MMF_UNSTABLE, &mm->flags);
trace_android_vh_oom_swapmem_gather_init(mm);
for_each_vma(vmi, vma) { for_each_vma(vmi, vma) {
if (vma->vm_flags & (VM_HUGETLB|VM_PFNMAP)) if (vma->vm_flags & (VM_HUGETLB|VM_PFNMAP))
continue; continue;
@@ -563,6 +566,7 @@ bool __oom_reap_task_mm(struct mm_struct *mm)
tlb_finish_mmu(&tlb); tlb_finish_mmu(&tlb);
} }
} }
trace_android_vh_oom_swapmem_gather_finish(mm);
return ret; return ret;
} }