From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out-189.mta0.migadu.com (out-189.mta0.migadu.com [91.218.175.189]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9CF8D3148DA for ; Thu, 9 Apr 2026 01:43:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.189 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775699018; cv=none; b=JsMFJE5oDaTXKt+saH9FDy/8P6XOZ6Uej1xEEuOVg6+cbkabRMbdmRcyfzcS6JshXjMrJi45rCBPaFYDpesXhjpwJK3ahnzxhVy6raPZ0Jx2Pv7ZkvvK/eWfosTO1SrVeSXRMQi+xK8B8Zc8bcxREHeN2H7sJLxBbvMqAmOh+Sc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775699018; c=relaxed/simple; bh=VWrFXP5vg26SRrvlYxps17xg7ne85D550ZVZYDwPaX0=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=IenESQzdEvEN0Hgqq4x7cVSxDjm2xMtJOb5veNWEwaRGwuZZAKa9XWtS18MRUm4ixXwawr2uJaP3Fj3YwWOZiyRXkp/eCU2H83LAgeAeBsASt7F6uZt9vvG7wMLq1plFn3J/gyXw4tTchyPgs5UA4jy9c5naHkKVjn+S255uHyk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=GCefANrc; arc=none smtp.client-ip=91.218.175.189 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="GCefANrc" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1775699014; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=YyOcfs4RbmFbfLD1gD7SLpTnMTWxwH0cAknM+2b/2so=; b=GCefANrcjTcgoArGavz/8QXmV7OhLYJwxPguf8WsExTszsNR4Be2PotIiq2No9MGAQOiPa Os8VwCeKssEKPdnYc3v453qu0flxDsJ7IUwuptzzKRXKrc42bVzlFcQepq+NcMeUdro/hc ZFNNCVi6jE2AC+DHkOoxObatUJmONrY= From: Ye Liu To: Andrew Morton , David Hildenbrand , Lorenzo Stoakes Cc: Ye Liu , Zi Yan , Baolin Wang , "Liam R. Howlett" , Nico Pache , Ryan Roberts , Dev Jain , Barry Song , Lance Yang , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] mm/khugepaged: use ALIGN helpers for PMD alignment Date: Thu, 9 Apr 2026 09:43:22 +0800 Message-ID: <20260409014323.2385982-1-ye.liu@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT From: Ye Liu 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. Signed-off-by: Ye Liu Changes in v2: - Switch to ALIGN()/ALIGN_DOWN() per David's suggestion. - Also convert collapse_scan_mm_slot() to keep PMD alignment helpers consistent within khugepaged. - Update the changelog accordingly. - Link to v1:https://lore.kernel.org/all/20260408093534.2373007-1-ye.liu@linux.dev/ --- mm/khugepaged.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 1e2bff40d014..1b1d1a881ec3 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -2518,8 +2518,8 @@ static void collapse_scan_mm_slot(unsigned int progress_max, 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; @@ -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 = 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; -- 2.43.0