p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

uprobe: collapse THP pmd after removing all uprobes 

After all uprobes are removed from the huge page (with PTE pgtable), it is
possible to collapse the pmd and benefit from THP again.  This patch does
the collapse by calling collapse_pte_mapped_thp().

Link: http://lkml.kernel.org/r/20190815164525.1848545-7-songliubraving@fb.com
Signed-off-by: Song Liu <songliubraving@fb.com>
Acked-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Reported-by: kbuild test robot <lkp@intel.com>
Reviewed-by: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Song Liu 2019-09-23 15:38:33 -07:00 committed by Linus Torvalds
parent 27e1f82731
commit f385cb85a4
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
kernel/events/uprobes.c
View File

@ -26,6 +26,7 @@
#include <linux/percpu-rwsem.h> #include <linux/percpu-rwsem.h>
#include <linux/task_work.h> #include <linux/task_work.h>
#include <linux/shmem_fs.h> #include <linux/shmem_fs.h>
#include <linux/khugepaged.h>
#include <linux/uprobes.h> #include <linux/uprobes.h>
@ -472,6 +473,7 @@ int uprobe_write_opcode(struct arch_uprobe *auprobe, struct mm_struct *mm,
struct page *old_page, *new_page; struct page *old_page, *new_page;
struct vm_area_struct *vma; struct vm_area_struct *vma;
int ret, is_register, ref_ctr_updated = 0; int ret, is_register, ref_ctr_updated = 0;
bool orig_page_huge = false;
is_register = is_swbp_insn(&opcode); is_register = is_swbp_insn(&opcode);
uprobe = container_of(auprobe, struct uprobe, arch); uprobe = container_of(auprobe, struct uprobe, arch);
@ -529,6 +531,9 @@ int uprobe_write_opcode(struct arch_uprobe *auprobe, struct mm_struct *mm,
/* let go new_page */ /* let go new_page */
put_page(new_page); put_page(new_page);
new_page = NULL; new_page = NULL;
if (PageCompound(orig_page))
orig_page_huge = true;
} }
put_page(orig_page); put_page(orig_page);
} }
@ -547,6 +552,10 @@ int uprobe_write_opcode(struct arch_uprobe *auprobe, struct mm_struct *mm,
if (ret && is_register && ref_ctr_updated) if (ret && is_register && ref_ctr_updated)
update_ref_ctr(uprobe, mm, -1); update_ref_ctr(uprobe, mm, -1);
/* try collapse pmd for compound page */
if (!ret && orig_page_huge)
collapse_pte_mapped_thp(mm, vaddr);
return ret; return ret;
} }