From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) (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 836A2425CE1 for ; Wed, 13 May 2026 13:10:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.52 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778677847; cv=none; b=UbNXFaPCxXfP1UP7OQjECCa40PhMLwmCyWxcbWqHZJhE+AcIDUcLzPOGlWLgQJdDTNeu+KIUZokjztfWep9NlqYXciWXBvVHjlCnAoQTuqpi764S9mHLvlIkHCbKBROZRb8uEHXuKYIbFF3XoBhcvuaRnAyulg729G85v2Xe834= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778677847; c=relaxed/simple; bh=acswuqYwQNO76pT5QiAYTmOzrzDejXyWsKITCUk4JIU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sdoBbg8zGnrw8zJRsMlgBLy+BaJlxo7Sv7az/+gcjtOEL4sOZQBrbBsEyfjxhS7zyi5W04QJ5QbPzmJR7GlTphXTuoZjGvlvtKXWuWIUMcJapOYRIuR+ZYJSe51+VD+OZWuYAg+4m5iBgjQfdwsy5pVgTv2wjmAN6exRg4RiCqU= 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=gkvSMgvT; arc=none smtp.client-ip=209.85.216.52 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="gkvSMgvT" Received: by mail-pj1-f52.google.com with SMTP id 98e67ed59e1d1-366070f71adso6050732a91.2 for ; Wed, 13 May 2026 06:10:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1778677846; x=1779282646; 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=K6tm8+Tn6qMHHNbiluBNgNTiouQaD7hYoUCXgTq5wuU=; b=gkvSMgvTyp2CY/KdbbBfyxE2XwFAFYLPjzOpXDSliuNda6i4Bkn2aRt4tMqsMcHPER qoQ8vi880xC9NCrcEHe0wDgLCgWK25WbPdydIKmTLP4JJSnE5P0j71wvEGDfUoVqk4aM KsaOHYwUBJT7d2Y3FPl0miE1FzR2demKrxJHvfhbtdDGDX6l99eveA6KYP4h0uR34XmB 1dKYVqbMOiMA+ftglm0RO6sXrbALXODFXe1WmC1NTkmp3HfMdBItTGP37kK+HsuhE2yF ykxgR9TXZKYCqKAkmk9TRbzp8ALCxnc34sZdI9fyU0hTC0Qxt5nD2cEpJSPS2hLsPEZb 6n4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778677846; x=1779282646; 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=K6tm8+Tn6qMHHNbiluBNgNTiouQaD7hYoUCXgTq5wuU=; b=KvJMl1Fqo1rHRinrSra6jUDmaSbftcw64T3p+6euVNXVekEVMcb9HiQVi0V9BUnwyy UN4UFITRcpkE1mx94df4f1wGYjzciB81VOxtHqfXZ1TNlpAjHXBESQQf5GIG1rZBbpvt h7t+rkn0ETTb9Uc9dDYd4pR6gbOtHB/14Zah2Vu4HOpaFmpnJYUDYnL1lRr63dD0ZcTd LAuRmiiJQnlsUfwwFRxdR9ewl53D+BJyCH33JGHwOe1PT7vQNoGaSnPkbwdjU5MHJgtP JhmclnybGXqSM5CLlyNgJfmgFAwVM+3ji4ugjXx8bJWVNGPusUq/znBNOpDkS9XtOqzU X3mQ== X-Forwarded-Encrypted: i=1; AFNElJ8uCgr1RnZHv2pAGIOS0AAWosRQHh+799SbV5Us8PyHi8RVJ6x/WgUXaDTpMRNf2uU96g5sNJnz7+6XW6M=@vger.kernel.org X-Gm-Message-State: AOJu0YxMsnR5O4PekWEPT7F1/IzeKqa+Ar5ASNxlQxlQ3Cyx6GnKktGu mXeceYwv/q3520hZL9X8myUzzytWWtoueQdFUFSL2hqx+yCyXfxX6tNmVwC1tapOSd4= X-Gm-Gg: Acq92OHqn3fn6g3zZf1piKqFAQZm/DCY7iMcoEDN0t2HP9hsb61zzqN4vtn/iINDmGo flhIq0x7LvKLa+fA7T8W1ztdbod1RhvEaJfySTIZBHNtXO2vOvwse1ZXNsmrgBut/n2RPJPsug1 c7HDVst/paxxugJB2SXnHQFsdx9y1K5159kYHPdWsWLaGSm9fLNSIfb8SJvzp+uTV5FWqGG0Nyk XNg97ez09fN72i62VNXQIcYtCEeV2/EWMUn6KJ26cknK90LnGCQY4FYU6yoHvCb2SQTrVp35Olz Q6AVfo4zSZwbk/T9rCy9xctyvguJQZxg66sOLYKcm+qgvy1hIK2MMP4Idlu5fUaIrY9HYZTduX9 VmvTHjC4ZxoZ54rxXpb1NB9VaN8v5mzofGvX+ZMmRmd+hBebubTa4N/VzTtYguA/LQxCOT/WXT7 4shmh56+3C1+Zn/q5xyAGmb11vlGgtYsXeKUOr92iEO7r48EtQXLfoGQYKJIc= X-Received: by 2002:a17:902:d584:b0:2b0:ac1e:9720 with SMTP id d9443c01a7336-2bd30210d95mr31196025ad.23.1778677845712; Wed, 13 May 2026 06:10:45 -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.40 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 13 May 2026 06:10:45 -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 35/69] mm/hugetlb: Remove HUGE_BOOTMEM_HVO Date: Wed, 13 May 2026 21:05:03 +0800 Message-ID: <20260513130542.35604-36-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 The HUGE_BOOTMEM_HVO flag tracked whether a bootmem huge page had already gone through the old early vmemmap optimization path. Now that HugeTLB uses section-based vmemmap optimization, that state is already reflected in the section order. Remove HUGE_BOOTMEM_HVO and its helper, and use the section state directly when deciding whether to mark a folio as vmemmap-optimized. Signed-off-by: Muchun Song --- include/linux/hugetlb.h | 5 ++--- include/linux/mmzone.h | 7 ++++++- mm/hugetlb.c | 12 +----------- mm/hugetlb_vmemmap.c | 2 -- 4 files changed, 9 insertions(+), 17 deletions(-) diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index dce8969961ea..18af8f304b95 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h @@ -695,9 +695,8 @@ struct huge_bootmem_page { unsigned long flags; }; -#define HUGE_BOOTMEM_HVO 0x0001 -#define HUGE_BOOTMEM_ZONES_VALID 0x0002 -#define HUGE_BOOTMEM_CMA 0x0004 +#define HUGE_BOOTMEM_ZONES_VALID BIT(0) +#define HUGE_BOOTMEM_CMA BIT(1) int isolate_or_dissolve_huge_folio(struct folio *folio, struct list_head *list); int replace_free_hugepage_folios(unsigned long start_pfn, unsigned long end_pfn); diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index a60fd5785fa5..9b87d798a365 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -117,6 +117,11 @@ #define NR_OPTIMIZABLE_FOLIO_ORDERS \ (__NR_OPTIMIZABLE_FOLIO_ORDERS > 0 ? __NR_OPTIMIZABLE_FOLIO_ORDERS : 0) +static inline bool order_vmemmap_optimizable(unsigned int order) +{ + return order >= OPTIMIZABLE_FOLIO_MIN_ORDER; +} + enum migratetype { MIGRATE_UNMOVABLE, MIGRATE_MOVABLE, @@ -2262,7 +2267,7 @@ static inline bool section_vmemmap_optimizable(const struct mem_section *section if (!is_power_of_2(sizeof(struct page))) return false; - return section_order(section) >= OPTIMIZABLE_FOLIO_MIN_ORDER; + return order_vmemmap_optimizable(section_order(section)); } #ifndef CONFIG_HAVE_ARCH_PFN_VALID diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 080f130017e3..abd79bb85b1c 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -3169,11 +3169,6 @@ static void __init hugetlb_folio_init_vmemmap(struct folio *folio, prep_compound_head(&folio->page, huge_page_order(h)); } -static bool __init hugetlb_bootmem_page_prehvo(struct huge_bootmem_page *m) -{ - return m->flags & HUGE_BOOTMEM_HVO; -} - static bool __init hugetlb_bootmem_page_earlycma(struct huge_bootmem_page *m) { return m->flags & HUGE_BOOTMEM_CMA; @@ -3265,12 +3260,7 @@ static void __init gather_bootmem_prealloc_node(unsigned long nid) OPTIMIZED_FOLIO_VMEMMAP_NR_STRUCT_PAGES); init_new_hugetlb_folio(folio); - if (hugetlb_bootmem_page_prehvo(m)) { - /* - * If pre-HVO was done, just set the - * flag, the HVO code will then skip - * this folio. - */ + if (order_vmemmap_optimizable(pfn_to_section_order(folio_pfn(folio)))) { folio_set_hugetlb_vmemmap_optimized(folio); section_set_order_range(folio_pfn(folio), folio_nr_pages(folio), 0); } diff --git a/mm/hugetlb_vmemmap.c b/mm/hugetlb_vmemmap.c index 730190390ba9..66362e553870 100644 --- a/mm/hugetlb_vmemmap.c +++ b/mm/hugetlb_vmemmap.c @@ -718,8 +718,6 @@ void __init hugetlb_vmemmap_optimize_bootmem_page(struct huge_bootmem_page *m) return; section_set_order_range(pfn, pages_per_huge_page(h), huge_page_order(h)); - if (section_vmemmap_optimizable(__pfn_to_section(pfn))) - m->flags |= HUGE_BOOTMEM_HVO; } static const struct ctl_table hugetlb_vmemmap_sysctls[] = { -- 2.54.0