From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) (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 E0DF725A33F for ; Wed, 13 May 2026 13:07:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.174 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778677666; cv=none; b=DAnX1FZIb/2v5nyUUJOqENFEoVvLaGK9MGHGdrLQUSp2NtdhLOCDO7sVkXg9Suv/uYlYwqxTz5GG5eroaEARy19aMeYfgl/zAND9jzXy6wRhVU8Lf2qHbmXarVpX5a1hlqbkIZh8lD376vZbOy5DSxvgUneblz76kFZoxOgwmRg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778677666; c=relaxed/simple; bh=pXE7NyEX0cadIwghtKff0WSV5yH/JbNy/ElKGKJRovA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UDg1+oxiKE6Cl48/GjMFPtCBgoZqcQrhcZbaK8APkkMw/91bpGV07oYNcwSdGxNGOVMGY+dD54TS1aDBX7LIb8vlkBO/hoFBJYtLw/B7MDUirlzmqbGpA6afQZzmKQhWkiIq0SkOo9RMIDOucHJ4FKtEoIpL4blmYGfjfl3GFqM= 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=Y5sOhlGY; arc=none smtp.client-ip=209.85.214.174 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="Y5sOhlGY" Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-2ba1e9d3687so44355275ad.3 for ; Wed, 13 May 2026 06:07:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1778677664; x=1779282464; 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=Bn/gOs/8i5hYCJdtJbGnpMg4EbzU/bTW8mznM7ekqW8=; b=Y5sOhlGYed6L2nLbRQuoQGNkXaDJ85JrKrdgHobBIVSPdOo/Wg13jxUugVz6U9dI4r nmhnzSqLJEorkVM2+LMcM+gBm8vf8VL1nLlqc6Xxa/yIb5/2I+LMc9EN1ZuL9YWO29Jg l5fzhTs9ajYemMmIpk7LnNodt0WP9Kt1AKwBGeXxbMU4qpK0yBgcPCmRHXY9456C1ZY7 /vKLutqva8h1wayqenD6LTSQR7qYs0Y+pUkGYUGGMyRsI7ojkOFwToYyMZkvoKcO6bGQ CYr1d3Rkw1Ej22l+i4hqilPL6tNy8kU1zfOYU6KcXtHWhZ/5yteCbT+GlQBIqPCCUU13 iD8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778677664; x=1779282464; 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=Bn/gOs/8i5hYCJdtJbGnpMg4EbzU/bTW8mznM7ekqW8=; b=TnCnkzNRYpsemZni0oGNNxuZLMxpLm96ru9UydivXOePgrsF3OnnEYD3e1m3YVP429 BkM3iPgJCeUrbZkgkoF51rxnZhaHM2dZDdmlATXi8XeYgxEd7wLYkrL/hCU+VJGWKUTl mmm5W6bDjIo0Y40EyxdSXts2aeSicIP7Ndbjfc2AChtaXTgtmHVkpVmTV4yyYuG4LwIp mjXmpd0CVyMLOLHRvG1iqRj8xvIiyoVsJorQgmF+haujeS97rAVsx4mjQHQronjS+OoV JlHHNMJ8rnM/rYxje3TXv1da7ferwAEFH64I2dikyoScdnXvfTQpsAsQyVGQZyVsbyAs GZVQ== X-Forwarded-Encrypted: i=1; AFNElJ8wjotpbvfRBLvWXjcMtc5LofGt7vqQ6Mn5WcOhA8YtKc0hmL3ed3ygPb7j1YoXcLLdCiVAkp4efNnJxIY=@vger.kernel.org X-Gm-Message-State: AOJu0YzVU6E5WOmIXGyZMU+jR6UHtmno/WtJrRiAAINDw14e3ecRcotk 4XpAp4RxyRKSOz97wV28gJz1kut89lhrK0OLsrAagRj0lZFz9fiY5IBoVgZj4z4ofFI= X-Gm-Gg: Acq92OFd4sRnedXFrEThfS+gLuDtBsRCPYDZvtmP1sJ1G2MVVMLuVkx5dgTTXPOY3Uj gf6TLdiIWre2rLjtB1FQrnjHEDXxS3G4nW8qX1aL2fzKx9jMYH79s+9DbJO1Vkkgbi0mHawLzE5 2yfsqdDeSZyitYhLA0XkloLTSUfsMyA+CxmOyaAp9w65hj9y7Dx9k0tvNe59y454lJj5muNowED NNXVMkeQRSirhI3mKXfTiEcuqwIxxn6oSBrO0IFl5LFNAS7bCkevXA5hwPRbxLI4RytMD2AZy+X mBQeDJ4ZbSNo93fO95jS1RMWQa06rpEMGe5pnhWtvjLF1HZA5n+AcfSs7SU8GTl1wt03UrcROg4 313ymCm+D6P2eonzXmSiWnkfspipJprpj2Bz3pnc1JHJyE1a/SvmaBtwv5o4JcwlkccgEX4IJoQ u46J8VEmajYfpDdqdHH44GSQ75zixRCvo7b55rKrwXoBJKbKutV354gUguPeg= X-Received: by 2002:a17:903:bcb:b0:2b9:cd2d:6f14 with SMTP id d9443c01a7336-2bd2f4f740fmr22511335ad.2.1778677663953; Wed, 13 May 2026 06:07:43 -0700 (PDT) Received: from PXLDJ45XCM.bytedance.net ([61.213.176.6]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2baf1e90854sm166641925ad.66.2026.05.13.06.07.38 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 13 May 2026 06:07:43 -0700 (PDT) From: Muchun Song To: Andrew Morton , David Hildenbrand , Muchun Song , Oscar Salvador , Michael Ellerman , Madhavan Srinivasan Cc: Lorenzo Stoakes , "Liam R . Howlett" , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , Nicholas Piggin , Christophe Leroy , Ackerley Tng , Frank van der Linden , aneesh.kumar@linux.ibm.com, joao.m.martins@oracle.com, linux-mm@kvack.org, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, Muchun Song Subject: [PATCH v2 02/69] mm/hugetlb_vmemmap: Fix __hugetlb_vmemmap_optimize_folios() Date: Wed, 13 May 2026 21:04:30 +0800 Message-ID: <20260513130542.35604-3-songmuchun@bytedance.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260513130542.35604-1-songmuchun@bytedance.com> References: <20260513130542.35604-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") Signed-off-by: Muchun Song --- 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 62e61af18c9a..4f58cd940f61 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