mm/khugepaged: use round_{up,down}() for PMD alignment in madvise_collapse()
Subsystems (2)
PATCH 1/1 mm/khugepaged: use round_{up,down}() for PMD alignment in madvise_collapse()
From: Ye Liu <[email protected]>
The PMD alignment in madvise_collapse() is currently implemented using open-coded bitmask operations:
(start + ~HPAGE_PMD_MASK) & HPAGE_PMD_MASK
end & HPAGE_PMD_MASK
Replace them with round_up() and round_down(), which express the same alignment semantics more directly and match other PMD-alignment code paths in khugepaged.
No functional change intended.
--- mm/khugepaged.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
mm/khugepaged.c +2 -2
@@ -2835,8 +2835,8 @@ int madvise_collapse(struct vm_area_struct *vma, unsigned long start,mmgrab (mm);lru_add_drain_all (); - hstart = (start + ~HPAGE_PMD_MASK ) &HPAGE_PMD_MASK ; - hend = end &HPAGE_PMD_MASK ; + hstart =round_up (start,HPAGE_PMD_SIZE ); + hend =round_down (end,HPAGE_PMD_SIZE );for (addr = hstart; addr < hend; addr +=HPAGE_PMD_SIZE ) {enum scan_result result =SCAN_FAIL ;
Signature · 1 line
2.43.0
David Hildenbrand (Arm)
maintainerQuoted 24 lines · Ye Liu
From: Ye Liu <[email protected]>
The PMD alignment in
madvise_collapse()is currently implemented using open-coded bitmask operations:(start + ~HPAGE_PMD_MASK) &
HPAGE_PMD_MASK
end &HPAGE_PMD_MASKReplace them with
round_up()andround_down(), which express the same alignment semantics more directly and match other PMD-alignment code paths in khugepaged.No functional change intended.
Signed-off-by Ye Liu <[email protected]>--- mm/khugepaged.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)mm/khugepaged.c +0
-0
mm/khugepaged.c int madvise_collapse(struct vm_area_struct *vma, unsigned long start, · line 2842
Quoted 10 lines
mm/khugepaged.c +2
-2@@ -2835,8 +2835,8 @@ int madvise_collapse(struct vm_area_struct *vma, unsigned long start,mmgrab (mm);lru_add_drain_all (); - hstart = (start + ~HPAGE_PMD_MASK ) &HPAGE_PMD_MASK ; - hend = end &HPAGE_PMD_MASK ; + hstart =round_up (start,HPAGE_PMD_SIZE ); + hend =round_down (end,HPAGE_PMD_SIZE );for (addr = hstart; addr < hend; addr +=HPAGE_PMD_SIZE ) {enum scan_result result =SCAN_FAIL ;
I tend to prefer ALIGN / ALIGN_DOWN when dealing with sizes + addresses.
Signature · 3 lines
Cheers, David
Quoted 28 lines · David Hildenbrand (Arm)
Quoted 27 lines · Ye Liu
From: Ye Liu <[email protected]>
The PMD alignment in
madvise_collapse()is currently implemented using open-coded bitmask operations:(start + ~HPAGE_PMD_MASK) &
HPAGE_PMD_MASK
end &HPAGE_PMD_MASKReplace them with
round_up()andround_down(), which express the same alignment semantics more directly and match other PMD-alignment code paths in khugepaged.No functional change intended.
Signed-off-by Ye Liu <[email protected]>--- mm/khugepaged.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)mm/khugepaged.c +0
-0@@ -2835,8 +2835,8 @@ int madvise_collapse(struct vm_area_struct *vma, unsigned long start,mmgrab (mm);lru_add_drain_all ();
Quoted 9 lines
mm/khugepaged.c int madvise_collapse(struct vm_area_struct *vma, unsigned long start, · line 2842
Quoted 7 lines
mm/khugepaged.c +2
-2- hstart = (start + ~HPAGE_PMD_MASK ) &HPAGE_PMD_MASK ; - hend = end &HPAGE_PMD_MASK ; + hstart =round_up (start,HPAGE_PMD_SIZE ); + hend =round_down (end,HPAGE_PMD_SIZE );for (addr = hstart; addr < hend; addr +=HPAGE_PMD_SIZE ) {enum scan_result result =SCAN_FAIL ;I tend to prefer ALIGN /
ALIGN_DOWNwhen dealing with sizes + addresses.
Thanks, that makes sense.
I'll switch this to ALIGN()/ALIGN_DOWN() in v2 for the address/size alignment style preference.
Signature · 2 lines
Thanks, Ye Liu