From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 08A3C3955FA for ; Fri, 12 Jun 2026 03:59:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.177 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781236763; cv=none; b=ocJIGGSVIZYORAqSVr+W1N1aKo+dyyCi+TQOUrVTZcGBkEJw+lM/c+cbRDnDHsNA69RpMEFwY8DEbSXK9P6b6YNUTIhVjKbAgJNG8jqlgmGdGTH1UDqYZVLtOHSG9rnmoXQ93oJJKeM3X3Ov5q9fQIoWcRRf4xL6iTowRzyALBE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781236763; c=relaxed/simple; bh=FFo5YVsN5RJTkQY/ToQ5Yxygot9j3fKn+T8WvprpE+0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dWUWmdg5wbb5hZ9pBIgYCRqCzuHmV0KjZxi8mjY6Iu/vCFsWdGoOp/B/0884Oh9RweiGK7CJJcPy546VD/vXlL3mMi42rrKMnE3Rs+lZ/qQUSuUkLzA7WTsdUTdr7/kATQeqcSMiDgUGGS3u8zEYEnVCR20gjHi21DUwaNq/+zw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=bytedance.com; spf=pass smtp.mailfrom=bytedance.com; dkim=pass (2048-bit key) header.d=bytedance.com header.i=@bytedance.com header.b=MvIHTsmB; arc=none smtp.client-ip=209.85.210.177 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=bytedance.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bytedance.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bytedance.com header.i=@bytedance.com header.b="MvIHTsmB" Received: by mail-pf1-f177.google.com with SMTP id d2e1a72fcca58-8423efd76c8so468359b3a.0 for ; Thu, 11 Jun 2026 20:59:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1781236761; x=1781841561; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=GLckvYu5EL2MaiuWaMvOvK8C88YkCBw4frh2Emu1ze4=; b=MvIHTsmBhUSl3/N+RL4IOIs3LDxos8NdcD6WI3EBazC5Y0nXuIWaaZbE8j3uY4lZbU TGWBomM7h7Pu7MkXJHrXUhSgVBNKGlQLYCWpkXKgP3P8LhH4DGIJ6HuqpACIT7Vi2e9S 7F0c4DzAYZ+NMjfwLX2IdfMWRzXlo+3bAqCxgY+TbjWCcq56/RkdvEAjLQTcYbF19M6Q /jwpLIxbZ60Nh+7tY0s3hOaYHKRO6GZO8md9ON+AW1djPnoQdsoWpSdN3UVDMIOfhyRm 1Y1zDyTeeJKKEQEtPNb4rl/5EvFhP9NOMx81AbbmtaYITdcuRhJkxLMAShPihGGAP4Rr pJ1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781236761; x=1781841561; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=GLckvYu5EL2MaiuWaMvOvK8C88YkCBw4frh2Emu1ze4=; b=Wu8WpRp7LYtvQqcAWPuZ1CjAhJbUK6ND04X/GTvzavsiHBAPhvYwLINfeK7wIw58Kk CKTNoZHs7szQ/Qi5oJaR+iSfUd/CrpPI1Fz4TqqMnvYu9WXRICastkJC+Fvd02OswGSX g/wCYJfPuMUgin006tpLw24w3QKOJU6CCQWjoRmzk5kmlAawXXvS9G265JJuyDeKkyNf Ev3y7YQ8BQf6KLX6mTCzFRxyFRtm4WcIvDmQCCO9CAnvDwWBgNj6LpqfT5+K+GVy+qQo gBscdrj16D7+aYgSK2Jas0OqHO3tRn6dBZT+07F1Fb3uLdBCqirgqSUm88rIF3vwmk6l QhrQ== X-Forwarded-Encrypted: i=1; AFNElJ9wOHj4BSNAZdDxVhwj9oj6fCNRyqzyVMTnVfxMQ8fb/66WwYu8YniFBtcdn0W0nxuJMw4620nHGebIwow=@vger.kernel.org X-Gm-Message-State: AOJu0Yw40n0wL4Vkn3g1LZ9taOya724DNyO5S8Bits0pJnHCYstK71Lg ExqokeYWlF+GQ73qxJybUduo9J4Ch2J+2eUizEJa19G491NQhDXs80bnnOcAJqJnaG0= X-Gm-Gg: Acq92OExiDSYQIkRrKFWwuLBQso3spRSRIeKPQuCfK7J5twTLN/Naulqz7tqJ2p0Mkl PazLS0uhpEzZ1DqhBWuwps8TjAFYflLHuXAVbS0MBU/zY1xfp0o9RxgmbVD7vVuhCbYl+rVQXkp 1mH+gvfW+K/mx05vT2WWLHM5wD5MAttO9pCbR1RXNyuuG2SaVHQn8d80fzVjbZR0NdOQ5X1lJvG LI96672j4RB+qOrqchFaHYsUNzK4QvuI0vs1IBSpy/ccG1a+gnFRgKozHY2aVzg1Hm66ootFKlO p81amniRsWw6CIika5MoU91hoRBbRYOB5oA1olHIBznJ5AmB99OC6IFHspcHStlgGZCPLF4UUWM oqnhTYOk15QpJobiFItu6+MlN7/2PFDRIL643fAqet5c14EhtWigvWqAzk1tEbClpMat8v0VXfy Q23g5odlVktfnnu1fD9t8ZXRjNn3PeY06tM01enwXYkys= X-Received: by 2002:a05:6a00:2d19:b0:842:4f49:71bc with SMTP id d2e1a72fcca58-8434cecab4dmr1092576b3a.46.1781236761177; Thu, 11 Jun 2026 20:59:21 -0700 (PDT) Received: from n232-176-004.byted.org ([36.110.163.99]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-8434ad03fdcsm643352b3a.24.2026.06.11.20.59.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Jun 2026 20:59:20 -0700 (PDT) From: Muchun Song To: Oscar Salvador , David Hildenbrand , Andrew Morton , Madhavan Srinivasan , Michael Ellerman Cc: Muchun Song , Mike Rapoport , Lorenzo Stoakes , "Liam R . Howlett" , Vlastimil Babka , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Nicholas Piggin , Christophe Leroy , Ritesh Harjani , "Aneesh Kumar K . V" , linuxppc-dev@lists.ozlabs.org, Mike Kravetz , Muchun Song , stable@vger.kernel.org Subject: [PATCH v4 02/19] mm/hugetlb_vmemmap: Fix __hugetlb_vmemmap_optimize_folios() Date: Fri, 12 Jun 2026 11:58:46 +0800 Message-ID: <20260612035903.2468601-3-songmuchun@bytedance.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260612035903.2468601-1-songmuchun@bytedance.com> References: <20260612035903.2468601-1-songmuchun@bytedance.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit __hugetlb_vmemmap_optimize_folios() uses incorrect arguments when handling bootmem HugeTLB folios. The section number passed to register_page_bootmem_memmap() is derived from the vmemmap virtual address of folio->page instead of the folio PFN, so the bootmem memmap metadata can be registered against the wrong section. The helper is also given HUGETLB_VMEMMAP_RESERVE_SIZE even though it expects a page count, not a size in bytes. In addition, the write-protect range is based on pages_per_huge_page(h), which does not cover the full HugeTLB vmemmap area and can leave part of the shared tail vmemmap mapping writable. Fix the section lookup to use folio_pfn(folio), use HUGETLB_VMEMMAP_RESERVE_PAGES when registering the reserved memmap pages, and use hugetlb_vmemmap_size(h) for the write-protect range. Fixes: 752fe17af693 ("mm/hugetlb: add pre-HVO framework") Cc: stable@vger.kernel.org Signed-off-by: Muchun Song Acked-by: Oscar Salvador --- mm/hugetlb_vmemmap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mm/hugetlb_vmemmap.c b/mm/hugetlb_vmemmap.c index c713c0d2593a..ea6af85bfec1 100644 --- a/mm/hugetlb_vmemmap.c +++ b/mm/hugetlb_vmemmap.c @@ -635,12 +635,12 @@ static void __hugetlb_vmemmap_optimize_folios(struct hstate *h, * mirrored tail page structs RO. */ spfn = (unsigned long)&folio->page; - epfn = spfn + pages_per_huge_page(h); + epfn = spfn + hugetlb_vmemmap_size(h); vmemmap_wrprotect_hvo(spfn, epfn, folio_nid(folio), HUGETLB_VMEMMAP_RESERVE_SIZE); - register_page_bootmem_memmap(pfn_to_section_nr(spfn), + register_page_bootmem_memmap(pfn_to_section_nr(folio_pfn(folio)), &folio->page, - HUGETLB_VMEMMAP_RESERVE_SIZE); + HUGETLB_VMEMMAP_RESERVE_PAGES); continue; } -- 2.54.0