The patch titled
Subject: mm/hugetlb.c: fix unnecessary address expansion of pmd sharing
has been added to the -mm tree. Its filename is
mm-hugetlbc-fix-unnecessary-address-expansion-of-pmd-sharing.patch
This patch should soon appear at
https://ozlabs.org/~akpm/mmots/broken-out/mm-hugetlbc-fix-unnecessary-address-expansion-of-pmd-sharing.patch
and later at
https://ozlabs.org/~akpm/mmotm/broken-out/mm-hugetlbc-fix-unnecessary-address-expansion-of-pmd-sharing.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Li Xinhai <lixinhai.lxh@xxxxxxxxx>
Subject: mm/hugetlb.c: fix unnecessary address expansion of pmd sharing
The current code would unnecessarily expand the address range. Consider
one example, (start, end) = (1G-2M, 3G+2M), and (vm_start, vm_end) =
(1G-4M, 3G+4M), the expected adjustment should be keep (1G-2M, 3G+2M)
without expand. But the current result will be (1G-4M, 3G+4M). Actually,
the range (1G-4M, 1G) and (3G, 3G+4M) would never been involved in pmd
sharing.
After this patch, if pud aligned *start across vm_start, then we know the
*start and vm_start are in same pud_index, and vm_start is not pud
aligned, so don't adjust *start. Same logic applied to *end.
Link: https://lkml.kernel.org/r/20201229042125.2663029-1-lixinhai.lxh@xxxxxxxxx
Fixes: commit 75802ca66354 ("mm/hugetlb: fix calculation of adjust_range_if_pmd_sharing_possible")
Signed-off-by: Li Xinhai <lixinhai.lxh@xxxxxxxxx>
Cc: Mike Kravetz <mike.kravetz@xxxxxxxxxx>
Cc: Peter Xu <peterx@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/hugetlb.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
--- a/mm/hugetlb.c~mm-hugetlbc-fix-unnecessary-address-expansion-of-pmd-sharing
+++ a/mm/hugetlb.c
@@ -5269,11 +5269,16 @@ void adjust_range_if_pmd_sharing_possibl
a_end = ALIGN(*end, PUD_SIZE);
/*
- * Intersect the range with the vma range, since pmd sharing won't be
- * across vma after all
+ * If the PUD aligned address across vma range, then it means the
+ * vm_start/vm_end is not PUD aligned. In that case, we must don't
+ * adjust range because pmd sharing is not possbile at the start and/or
+ * end part of vma.
*/
- *start = max(vma->vm_start, a_start);
- *end = min(vma->vm_end, a_end);
+ if (a_start >= vma->vm_start)
+ *start = a_start;
+
+ if (a_end <= vma->vm_end)
+ *end = a_end;
}
/*
_
Patches currently in -mm which might be from lixinhai.lxh@xxxxxxxxx are
mm-hugetlbc-fix-unnecessary-address-expansion-of-pmd-sharing.patch
