Skip to contentSkip to conversation

mm-khugepaged-use-align-helpers-for-pmd-alignment.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message May 29

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: mm/khugepaged: use ALIGN helpers for PMD alignment
has been removed from the -mm tree. Its filename was
mm-khugepaged-use-align-helpers-for-pmd-alignment.patch

This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Ye Liu <[email protected]>
Subject: mm/khugepaged: use ALIGN helpers for PMD alignment
Date: Thu, 9 Apr 2026 09:43:22 +0800

PMD alignment in khugepaged is currently implemented using a mix of rounding helpers and open-coded bitmask operations.

Use ALIGN() and ALIGN_DOWN() consistently for PMD-sized address range alignment, matching the preferred style for address and size handling.

No functional change intended.

---

 mm/khugepaged.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
mm/khugepaged.c renamed from mm/khugepaged.c~mm-khugepaged-use-align-helpers-for-pmd-alignment +4 -4
@@ -2528,8 +2528,8 @@ static void collapse_scan_mm_slot(unsign
 			cc->progress++;
 			continue;
 		}
-		hstart = round_up(vma->vm_start, HPAGE_PMD_SIZE);
-		hend = round_down(vma->vm_end, HPAGE_PMD_SIZE);
+		hstart = ALIGN(vma->vm_start, HPAGE_PMD_SIZE);
+		hend = ALIGN_DOWN(vma->vm_end, HPAGE_PMD_SIZE);
 		if (khugepaged_scan.address > hend) {
 			cc->progress++;
 			continue;
@@ -2845,8 +2845,8 @@ int madvise_collapse(struct vm_area_stru
 	mmgrab(mm);
 	lru_add_drain_all();
 
-	hstart = (start + ~HPAGE_PMD_MASK) & HPAGE_PMD_MASK;
-	hend = end & HPAGE_PMD_MASK;
+	hstart = ALIGN(start, HPAGE_PMD_SIZE);
+	hend = ALIGN_DOWN(end, HPAGE_PMD_SIZE);
 
 	for (addr = hstart; addr < hend; addr += HPAGE_PMD_SIZE) {
 		enum scan_result result = SCAN_FAIL;

_

Patches currently in -mm which might be from [email protected] are

mm-khugepaged-fix-inconsistent-mmf_vm_hugepage-flag-due-to-allocation-failure-order.patch tools-mm-page-types-fix-typo-in-madvise-error-message.patch tools-mm-page-types-fix-ternary-operator-precedence-in-sigbus-handler.patch tools-mm-page-types-fix-kpageflags-option-argument-in-getopt_long.patch mm-memory-failure-remove-hugetlb-output-parameter-from-try_memory_failure_hugetlb.patch