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, we will check that the vma span at least one PUD aligned
size and the start,end range overlap the aligned range of vma.

With above example, the aligned vma range is (1G, 3G), so if (start, end)
range is within (1G-4M, 1G), or within (3G, 3G+4M), then no adjustment to
both start and end.  Otherwise, we will have chance to adjust start
downwards or end upwards without exceeding (vm_start, vm_end).

Mike:

: The 'adjusted range' is used for calls to mmu notifiers and cache(tlb)
: flushing.  Since the current code unnecessarily expands the range in some
: cases, more entries than necessary would be flushed.  This would/could
: result in performance degradation.  However, this is highly dependent on
: the user runtime.  Is there a combination of vma layout and calls to
: actually hit this issue?  If the issue is hit, will those entries
: unnecessarily flushed be used again and need to be unnecessarily reloaded?

Link: https://lkml.kernel.org/r/20210104081631.2921415-1-lixinhai.lxh@gmail.com
Fixes: 75802ca66354 ("mm/hugetlb: fix calculation of adjust_range_if_pmd_sharing_possible")
Signed-off-by: Li Xinhai <lixinhai.lxh@gmail.com>
Suggested-by: Mike Kravetz <mike.kravetz@oracle.com>
Reviewed-by: Mike Kravetz <mike.kravetz@oracle.com>
Cc: Peter Xu <peterx@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index dd56e205e7ab1c0b9208a9cceb97a1b3288fb7bf..66edef56a070079a446d2ccfbd32a6196d3049c8 100644 (file)
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -5288,21 +5288,23 @@ static bool vma_shareable(struct vm_area_struct *vma, unsigned long addr)
 void adjust_range_if_pmd_sharing_possible(struct vm_area_struct *vma,
                                unsigned long *start, unsigned long *end)
 {
-       unsigned long a_start, a_end;
+       unsigned long v_start = ALIGN(vma->vm_start, PUD_SIZE),
+               v_end = ALIGN_DOWN(vma->vm_end, PUD_SIZE);
 
-       if (!(vma->vm_flags & VM_MAYSHARE))
+       /*
+        * vma need span at least one aligned PUD size and the start,end range
+        * must at least partialy within it.
+        */
+       if (!(vma->vm_flags & VM_MAYSHARE) || !(v_end > v_start) ||
+               (*end <= v_start) || (*start >= v_end))
                return;
 
        /* Extend the range to be PUD aligned for a worst case scenario */
-       a_start = ALIGN_DOWN(*start, PUD_SIZE);
-       a_end = ALIGN(*end, PUD_SIZE);
+       if (*start > v_start)
+               *start = ALIGN_DOWN(*start, PUD_SIZE);
 
-       /*
-        * Intersect the range with the vma range, since pmd sharing won't be
-        * across vma after all
-        */
-       *start = max(vma->vm_start, a_start);
-       *end = min(vma->vm_end, a_end);
+       if (*end < v_end)
+               *end = ALIGN(*end, PUD_SIZE);
 }
 
 /*