Skip to contentSkip to conversation

mm/khugepaged: use round_{up,down}() for PMD alignment in madvise_collapse()

PATCH In review Ye Liu 3 participants 3 messages Apr 8 – Apr 9

Subsystems (2)
lore
Share & tools
lore

Ye Liu

author
#0 lore raw

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
index 1e2bff40d014..80d0b7136b58 100644
@@ -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
#1 lore raw
Quoted 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_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 +0 -0
index 1e2bff40d014..80d0b7136b58 100644

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
#2 lore raw
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_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 +0 -0
index 1e2bff40d014..80d0b7136b58 100644
@@ -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_DOWN when 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