From: Yang Shi yang@os.amperecomputing.com
mainline inclusion from mainline-v6.9-rc1 commit 05976a42b327d4f5a529a5e55cb8bfc2fa0bcca1 category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I98AW9 CVE: NA
-------------------------------------------------
We avoid allocating THP for temporary stack, even though khugepaged_enter_vma() is called for stack VMAs, it actualy returns false. So no need to call it in the first place at all.
Link: https://lkml.kernel.org/r/20231221065943.2803551-1-shy828301@gmail.com Signed-off-by: Yang Shi yang@os.amperecomputing.com Reviewed-by: Yin Fengwei fengwei.yin@intel.com Cc: Christopher Lameter cl@linux.com Cc: "Huang, Ying" ying.huang@intel.com Cc: Matthew Wilcox (Oracle) willy@infradead.org Cc: Rik van Riel riel@surriel.com Cc: kernel test robot oliver.sang@intel.com Signed-off-by: Andrew Morton akpm@linux-foundation.org (cherry picked from commit 05976a42b327d4f5a529a5e55cb8bfc2fa0bcca1) Signed-off-by: Kefeng Wang wangkefeng.wang@huawei.com --- mm/mmap.c | 2 -- 1 file changed, 2 deletions(-)
diff --git a/mm/mmap.c b/mm/mmap.c index b8c5486dfb25..6cd5d3f607e5 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -2069,7 +2069,6 @@ static int expand_upwards(struct vm_area_struct *vma, unsigned long address) } } anon_vma_unlock_write(vma->anon_vma); - khugepaged_enter_vma(vma, vma->vm_flags); mas_destroy(&mas); validate_mm(mm); return error; @@ -2163,7 +2162,6 @@ int expand_downwards(struct vm_area_struct *vma, unsigned long address) } } anon_vma_unlock_write(vma->anon_vma); - khugepaged_enter_vma(vma, vma->vm_flags); mas_destroy(&mas); validate_mm(mm); return error;