From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) (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 C3DF0429801 for ; Wed, 13 May 2026 13:10:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.178 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778677811; cv=none; b=fSmM5Wc11ymBo/5X4hzyOmbGp44gqzkJsZUlJLoglCJkAWwMstJjVHJzPZbRXkIvx0veDUQ277Tc9JHK7OfHBMSv5T9PEYM6g7e4Y3T/pK9qZsUG1O7hfjBRj4rVT59CR+rZIa4RXxpc1504EO6KUkxT6Qx21BrxapsrksZSVqg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778677811; c=relaxed/simple; bh=GxZVh14FnLEBP9UNDkmAbK2t9VvnGKzGg3eU8N9Dezc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HaJbQG2fPM2HR832QepLMNqOZVo3cqgGq1E+pvP5z2vFHRc3/l22Bt0v5qpTOM83BYGrNtGcWqcluNkaPVRqo0iaHXGLlUz4GpIbWojwP6VhKaY5gJ1Yg/bVMp0XcgJa/KA2Nyf/zqlM30HrWbXIRKcnq2T0Y/cY9h28phogTwI= 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=Of2b4knL; arc=none smtp.client-ip=209.85.214.178 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="Of2b4knL" Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-2b9ec9443c2so41143215ad.1 for ; Wed, 13 May 2026 06:10:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1778677808; x=1779282608; 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=wj09+T2FktkdLwU79u80MiVhyJiQtKDMnM2x4Hjwdtg=; b=Of2b4knLIG2fgnTdd3FyOruEZ5fVabUOIFIfWJtjyP055dOhbYCQ5LvRFGJS6jLQcP FrRBpWlSc+0YINdZ1FXfHpr2f2vsSRzGovkuwRnUodKr/DoRYbC+3Ve2WV0ysk5d7gvp Ex6veWPWgrfqqId4AITBkSaHRaBgfosX0jnX+hVW/K917ASksOfr1uvD0rFkjzSCWAq5 xPkl/zb8clsjpr79NNMUV0iVbOENcDp6u5yERI0TsOtqbKCS2p9WBniBJiU/BYD5xvTb lD8PxlezKgj2i9wNi3rwR4J5QZtMOkduci6TBXrI3miSwrynG4P/m4NkLq6/GSCa85tK tQAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778677808; x=1779282608; 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=wj09+T2FktkdLwU79u80MiVhyJiQtKDMnM2x4Hjwdtg=; b=dWjmYBIMSO2BtyzJ1Lg/XFjPfVzYU7XYf7mO/xAbCoK5xEkJJ9Y4LWZbbAm2L100zJ nTYci80lE93bmWWf/0A1+60m4QYxisA6tMAXrjHKzGX0y/YBD7wpcrK1txnpMFWEawZg h3NrBBzuUFB6PbpzNbrI80zA0rBTUlPKjQeThbiEEn8/yV5f/mW7UrzpKiS0rVonu0Nb vrAiESTOQovBi9fwzsI06WjyYKIHLi/2NG/N3gT0Dp114pAmG5x4x9yZvOAOU4lcnkFl h11636b4cGpfxv+srpt42jOnzTsqjYd7xKQV+KgkYnAf6snNwv7HgcAsxcgMfowFxqAw bVBQ== X-Forwarded-Encrypted: i=1; AFNElJ+/wGLFej4BWuYma1k51AkXUt8Nd5cKMafMqWM+nGd9JR22uTa1383kgW4RBeLs0co/EFZU7pFRZ9Mz5As=@vger.kernel.org X-Gm-Message-State: AOJu0Yxvj3tgQB3hw7AFZmps1T7R+xxzF9K6ikyX17wdiegiB0Z0CO2y XfI3JhGprsC3cNr5XflqbvgXfRw64CdFUHIz0Cy+yl8rOb9VzYj7I1OKOjQOcBUI8FU= X-Gm-Gg: Acq92OEAXNuYluuOmd0wC/YvpPmdx+tPV2MCxyK8LFmkb3fYwSbcVffO1b8Hwew+jwk uqjIIUTpYIcgHlMfJr1uzdQoEaBAH97TEJ0DOruScd8f6/h/+F566RmZLcvsTWhpBvwB5ykHjs+ v9LmzB798e551lmfzMI0KVs+9M8LSskBLhHvfX8T1mqolPaxQRaq9SjtL85ZUQWFF1hBVr1CLG+ vHCotv8q/8PhJ9eeJsX1gqGX1dKSqV4Sg6Isgc1G2ictQDwDo5wDUgZmYwGcgnGNm2/77ru6ohW upkzVXhnUslX1PVNSnuvH/4+BdqEXezl60Vtfssz6yLkrCp07EYnr0AAneqMp2e6Oly99cqG9T4 Xr/z7MyTxEnZWthEMeSpcSfDB4xhk2nCawZ1+z/dsEvUGrFHb6V34+And8K++VKLF25p7Gi6vAu z4lO6Pfe5yT+N5TRYVFexCVXxV21sEuBee3/tME4dHiiFn+IPsB7J1P6GqGdQV3XcDwYaMyQ== X-Received: by 2002:a17:902:b713:b0:2b0:6068:4c5f with SMTP id d9443c01a7336-2bcfcc3ce55mr52172605ad.8.1778677807808; Wed, 13 May 2026 06:10:07 -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.10.02 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 13 May 2026 06:10:07 -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 28/69] mm/hugetlb: Use generic vmemmap optimization macros Date: Wed, 13 May 2026 21:04:56 +0800 Message-ID: <20260513130542.35604-29-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 Vmemmap optimization is no longer hugetlb-specific, so the remaining hugetlb-local reserve macros are redundant. Replace them with the generic definitions to remove duplication and keep the hugetlb vmemmap code aligned with the common optimization macros. Signed-off-by: Muchun Song --- mm/hugetlb.c | 4 ++-- mm/hugetlb_vmemmap.c | 14 +++++++------- mm/hugetlb_vmemmap.h | 9 +-------- 3 files changed, 10 insertions(+), 17 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 53448b05ca11..8debe5c5abce 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -3222,7 +3222,7 @@ static void __init prep_and_add_bootmem_folios(struct hstate *h, * be no contention. */ hugetlb_folio_init_tail_vmemmap(folio, h, - HUGETLB_VMEMMAP_RESERVE_PAGES, + OPTIMIZED_FOLIO_VMEMMAP_NR_STRUCT_PAGES, pages_per_huge_page(h)); } hugetlb_bootmem_init_migratetype(folio, h); @@ -3261,7 +3261,7 @@ static void __init gather_bootmem_prealloc_node(unsigned long nid) WARN_ON(folio_ref_count(folio) != 1); hugetlb_folio_init_vmemmap(folio, h, - HUGETLB_VMEMMAP_RESERVE_PAGES); + OPTIMIZED_FOLIO_VMEMMAP_NR_STRUCT_PAGES); init_new_hugetlb_folio(folio); if (hugetlb_bootmem_page_prehvo(m)) diff --git a/mm/hugetlb_vmemmap.c b/mm/hugetlb_vmemmap.c index e9906d32a64c..4367118f8f57 100644 --- a/mm/hugetlb_vmemmap.c +++ b/mm/hugetlb_vmemmap.c @@ -407,7 +407,7 @@ static int __hugetlb_vmemmap_restore_folio(const struct hstate *h, vmemmap_start = (unsigned long)&folio->page; vmemmap_end = vmemmap_start + hugetlb_vmemmap_size(h); - vmemmap_start += HUGETLB_VMEMMAP_RESERVE_SIZE; + vmemmap_start += OPTIMIZED_FOLIO_VMEMMAP_SIZE; /* * The pages which the vmemmap virtual address range [@vmemmap_start, @@ -637,10 +637,10 @@ static void __hugetlb_vmemmap_optimize_folios(struct hstate *h, spfn = (unsigned long)&folio->page; epfn = spfn + hugetlb_vmemmap_size(h); vmemmap_wrprotect_hvo(spfn, epfn, folio_nid(folio), - HUGETLB_VMEMMAP_RESERVE_SIZE); + OPTIMIZED_FOLIO_VMEMMAP_SIZE); register_page_bootmem_memmap(pfn_to_section_nr(folio_pfn(folio)), &folio->page, - HUGETLB_VMEMMAP_RESERVE_PAGES); + OPTIMIZED_FOLIO_VMEMMAP_NR_STRUCT_PAGES); continue; } @@ -779,9 +779,9 @@ void __init hugetlb_vmemmap_init_early(int nid) zone = pfn_to_zone(nid, pfn); if (vmemmap_populate_hvo(start, end, huge_page_order(m->hstate), - zone, HUGETLB_VMEMMAP_RESERVE_SIZE)) + zone, OPTIMIZED_FOLIO_VMEMMAP_SIZE)) panic("Failed to allocate memmap for HugeTLB page\n"); - memmap_boot_pages_add(DIV_ROUND_UP(HUGETLB_VMEMMAP_RESERVE_SIZE, PAGE_SIZE)); + memmap_boot_pages_add(OPTIMIZED_FOLIO_VMEMMAP_PAGES); pnum = pfn_to_section_nr(pfn); ns = psize / section_size; @@ -826,8 +826,8 @@ static int __init hugetlb_vmemmap_init(void) { const struct hstate *h; - /* HUGETLB_VMEMMAP_RESERVE_SIZE should cover all used struct pages */ - BUILD_BUG_ON(__NR_USED_SUBPAGE > HUGETLB_VMEMMAP_RESERVE_PAGES); + /* OPTIMIZED_FOLIO_VMEMMAP_SIZE should cover all used struct pages */ + BUILD_BUG_ON(__NR_USED_SUBPAGE > OPTIMIZED_FOLIO_VMEMMAP_NR_STRUCT_PAGES); for_each_hstate(h) { if (hugetlb_vmemmap_optimizable(h)) { diff --git a/mm/hugetlb_vmemmap.h b/mm/hugetlb_vmemmap.h index 7ac49c52457d..66e11893d076 100644 --- a/mm/hugetlb_vmemmap.h +++ b/mm/hugetlb_vmemmap.h @@ -12,13 +12,6 @@ #include #include -/* - * Reserve one vmemmap page, all vmemmap addresses are mapped to it. See - * Documentation/mm/vmemmap_dedup.rst. - */ -#define HUGETLB_VMEMMAP_RESERVE_SIZE PAGE_SIZE -#define HUGETLB_VMEMMAP_RESERVE_PAGES (HUGETLB_VMEMMAP_RESERVE_SIZE / sizeof(struct page)) - #ifdef CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP int hugetlb_vmemmap_restore_folio(const struct hstate *h, struct folio *folio); long hugetlb_vmemmap_restore_folios(const struct hstate *h, @@ -43,7 +36,7 @@ static inline unsigned int hugetlb_vmemmap_size(const struct hstate *h) */ static inline unsigned int hugetlb_vmemmap_optimizable_size(const struct hstate *h) { - int size = hugetlb_vmemmap_size(h) - HUGETLB_VMEMMAP_RESERVE_SIZE; + int size = hugetlb_vmemmap_size(h) - OPTIMIZED_FOLIO_VMEMMAP_SIZE; if (!is_power_of_2(sizeof(struct page))) return 0; -- 2.54.0