From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) (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 E19533D6682 for ; Mon, 20 Jul 2026 09:31:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.172 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784539920; cv=none; b=LzMtHPJj3dEc3BGWlh9I9BdyWBT0zBhv7bMl9hpuJVVNJcJpIpk1UVPKibEw075HrCwdR0AF9Fbw0qvOyKmmd7PZp25N284mceuR3y5j0jH4/T86d2kb7MJfHufnNbxlXmPwlw+OzvKpl9QrXazfkK+owZI9kks3EEFjQwWDC1g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784539920; c=relaxed/simple; bh=cNl+6VBOHIoFsvdJJSSS0tC18U6xUXLvtG1I6EfSYtU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sA9P0/6WV7SBwksG0qtXuexQWQqW0Ue9+eQFQMrwpmTZ8lIcP4Js8GeSYNyKqS7bF6vvLAPu5BgoWbsZ/pmOPL792nxyxz6cPfWuuFrNIUYHiwOjHkBuy+pJVYox5SngFZYYs5+C9R+GzmCgkpG9sgcOLHEQQ+6VmHlI9SoF86E= 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=cjYrc9mu; arc=none smtp.client-ip=209.85.214.172 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="cjYrc9mu" Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-2cacf197759so107867315ad.2 for ; Mon, 20 Jul 2026 02:31:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1784539918; x=1785144718; 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:content-type; bh=ZFSAOL0DZsiwYlqzPouS8XnC2DPIgfqzINxJ7kc1Vuo=; b=cjYrc9mu/jj3pFbe/trmWYmZ4xSs2Nyvzsk2GzZUfJ62aKOllOp/iN+5TlyUq4+aLA sInQqQP3Nv8KsV72gGq2sxOTUDpSUYIWXOegkfUQnI8U5Bv9+PJfXVG3SLEjPCTDWSBm yXl4EQvVvq3Qt5yUlXcKDLXRtJxdU1T65w9gvlnRxn7ed+IbZ8fXdxEMLgo9mVcCbOF1 RvHXiNkeq3OUJRF4qHcgoXx7OPGUdhAraWfDV5Q+ZQdPYhQL/LwhUiQxt383IgAPCBM0 LCEyTbupy6f6iV6MQTlmjvcNa1NRYH3ZsOOFhTd8Az3ASn6NsCvUXLB6Gx5QycKTKLN4 iBmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784539918; x=1785144718; 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:content-type; bh=ZFSAOL0DZsiwYlqzPouS8XnC2DPIgfqzINxJ7kc1Vuo=; b=Ryl/h+km4Kn46fkpScHMKLaIfcp6Pc0SjtHNqEZsxqz0/HEnPCWlYi3Xmm6NLpbBFt aLyPtuwLKB2u9QCE/Q57/aL23KE5m4cVuv4wW5uVUXLktc/XJDOFLBnSiQ2PrI+ASb26 0EvREd3bQLN6alTH1GKpfDd3xjDPuuqOV5IHBsPVJW9+m1MGT7a+FEZP3d8JkWUJHCb/ BeefSAvooNq9bIRJrSGEs7CSouYV21a4011EZL5raqLuN83QbBfRJPkqSSbeX1eNsB5r J6xQrr8UBPJCRf76+yCSPG7shMJRp14B12DdBuntlwISPHXrVxslQC6QTeSboULTv1Yu blbQ== X-Forwarded-Encrypted: i=1; AHgh+Ros7Sq7jSuxH+RaxxrczFbM/6sHLGBAZpkn+Lm5HhRpfPi/faXWcphFKFX/2QP8zygl49vGfCQWM1buE34=@vger.kernel.org X-Gm-Message-State: AOJu0Yziwd/wVWeHTmzPiU7d0uE8NWshn486qJ9oWT5FthEYBNx5P7Hk F0wC2GQtz3HCYXF6QDsCCFuTsRLrjrNYn+r5TyTDP3CoxAfHRb8MBxZ4nAi9VPKK0cY= X-Gm-Gg: AfdE7ckuv1jyI1rcU2HAU0LtSwyTvf+PSVnX3HnQk+J2kC8cm0jSnoqHHMCQKx7OYMy OiMoSUQjLROpIb1AfOTP/j62rg3VMHCYmVTzILVEe0r3XJR34spPeegrye7d1PJhTAD5+1TgnqQ 9RSDCWdPRIdUPU6DcKvuxxk8/W9DVPOQ/YEcZWLevufzG9DC3685VXB40ZI6l7g44yVgwZOVgGT g4l5Ko5d1YRS7hbsa/9eaE7pAQ0VYwYe8Hu0IMeIu2kqbpaZtazkFV1aI2flLcFKA8qc/bvz2F2 8XRfFlsaN/45Y1Plxsro9B21JOb74ggsfefMoHxYsjSBaa0iM9BKgS5dXsHuTaO+4BTH86XA6q8 tVu+qbaqDHiMvy/xoxlPHWAYS9+FQvgj1XMAnTxvr6jS5Nfh0PfZCi8sRUBKXHXC7KDr5eA0Goy Mwiz8Oy8Pjd2fdUWTEZQxRhmoKUjDCEBvJkg== X-Received: by 2002:a17:902:e748:b0:2c1:98b7:ecf3 with SMTP id d9443c01a7336-2cf3494aebdmr144468675ad.23.1784539918154; Mon, 20 Jul 2026 02:31:58 -0700 (PDT) Received: from n232-176-004.byted.org ([36.110.163.101]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2cf347a7c9fsm53136455ad.84.2026.07.20.02.31.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jul 2026 02:31:57 -0700 (PDT) From: Muchun Song To: Andrew Morton , Oscar Salvador , David Hildenbrand Cc: Mike Rapoport , Vlastimil Babka , Lorenzo Stoakes , Michal Hocko , David Laight , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Muchun Song , Muchun Song Subject: [PATCH v2 02/17] mm/sparse-vmemmap: rename HVO order macros Date: Mon, 20 Jul 2026 17:31:12 +0800 Message-ID: <20260720093127.540540-3-songmuchun@bytedance.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260720093127.540540-1-songmuchun@bytedance.com> References: <20260720093127.540540-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 macros VMEMMAP_TAIL_MIN_ORDER and NR_VMEMMAP_TAILS describe the order range where HVO can be applied, but their names tie that range to the tail-page cache implementation. Rename them with a VMEMMAP_OPTIMIZATION prefix and use the new names in the HVO paths. This makes the code describe the optimization requirements rather than the tail-page cache implementation detail. No functional change intended. Signed-off-by: Muchun Song --- v2: - Rename the macros with a VMEMMAP_OPTIMIZATION prefix (suggested by Mike Rapoport) - Drop intermediate optimized-folio size macros (suggested by Mike Rapoport) --- include/linux/mmzone.h | 17 +++++++++-------- mm/hugetlb.c | 4 ++-- mm/hugetlb_vmemmap.c | 2 +- mm/sparse-vmemmap.c | 4 ++-- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index 04f3409edacb..82b0155d886f 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -107,13 +107,14 @@ is_power_of_2(sizeof(struct page)) ? \ MAX_FOLIO_NR_PAGES * sizeof(struct page) : 0) -/* - * vmemmap optimization (like HVO) is only possible for page orders that fill - * two or more pages with struct pages. - */ -#define VMEMMAP_TAIL_MIN_ORDER (ilog2(2 * PAGE_SIZE / sizeof(struct page))) -#define __NR_VMEMMAP_TAILS (MAX_FOLIO_ORDER - VMEMMAP_TAIL_MIN_ORDER + 1) -#define NR_VMEMMAP_TAILS (__NR_VMEMMAP_TAILS > 0 ? __NR_VMEMMAP_TAILS : 0) +/* The number of struct pages covered by the retained vmemmap pages with HVO enabled. */ +#define VMEMMAP_OPTIMIZATION_NR_STRUCT_PAGES (PAGE_SIZE / sizeof(struct page)) +#define VMEMMAP_OPTIMIZATION_MIN_ORDER (ilog2(VMEMMAP_OPTIMIZATION_NR_STRUCT_PAGES) + 1) + +#define __VMEMMAP_OPTIMIZATION_NR_ORDERS \ + (MAX_FOLIO_ORDER - VMEMMAP_OPTIMIZATION_MIN_ORDER + 1) +#define VMEMMAP_OPTIMIZATION_NR_ORDERS \ + (__VMEMMAP_OPTIMIZATION_NR_ORDERS > 0 ? __VMEMMAP_OPTIMIZATION_NR_ORDERS : 0) enum migratetype { MIGRATE_UNMOVABLE, @@ -1147,7 +1148,7 @@ struct zone { atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS]; atomic_long_t vm_numa_event[NR_VM_NUMA_EVENT_ITEMS]; #ifdef CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP - struct page *vmemmap_tails[NR_VMEMMAP_TAILS]; + struct page *vmemmap_tails[VMEMMAP_OPTIMIZATION_NR_ORDERS]; #endif } ____cacheline_internodealigned_in_smp; diff --git a/mm/hugetlb.c b/mm/hugetlb.c index db09f0ab6d97..b8e1569bda15 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -3358,7 +3358,7 @@ void __init hugetlb_bootmem_struct_page_init(void) struct zone *zone; for_each_zone(zone) { - for (int i = 0; i < NR_VMEMMAP_TAILS; i++) { + for (int i = 0; i < VMEMMAP_OPTIMIZATION_NR_ORDERS; i++) { struct page *tail, *p; unsigned int order; @@ -3366,7 +3366,7 @@ void __init hugetlb_bootmem_struct_page_init(void) if (!tail) continue; - order = i + VMEMMAP_TAIL_MIN_ORDER; + order = i + VMEMMAP_OPTIMIZATION_MIN_ORDER; p = page_to_virt(tail); /* * prep_and_add_bootmem_folios() can access pageblock diff --git a/mm/hugetlb_vmemmap.c b/mm/hugetlb_vmemmap.c index 917db0984143..ae8fdaa42118 100644 --- a/mm/hugetlb_vmemmap.c +++ b/mm/hugetlb_vmemmap.c @@ -494,7 +494,7 @@ static bool vmemmap_should_optimize_folio(const struct hstate *h, struct folio * static struct page *vmemmap_get_tail(unsigned int order, struct zone *zone) { - const unsigned int idx = order - VMEMMAP_TAIL_MIN_ORDER; + const unsigned int idx = order - VMEMMAP_OPTIMIZATION_MIN_ORDER; struct page *tail, *p; int node = zone_to_nid(zone); diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c index 5a2469fb1838..aa6a4a2fae98 100644 --- a/mm/sparse-vmemmap.c +++ b/mm/sparse-vmemmap.c @@ -329,12 +329,12 @@ static __meminit struct page *vmemmap_get_tail(unsigned int order, struct zone * unsigned int idx; int node = zone_to_nid(zone); - if (WARN_ON_ONCE(order < VMEMMAP_TAIL_MIN_ORDER)) + if (WARN_ON_ONCE(order < VMEMMAP_OPTIMIZATION_MIN_ORDER)) return NULL; if (WARN_ON_ONCE(order > MAX_FOLIO_ORDER)) return NULL; - idx = order - VMEMMAP_TAIL_MIN_ORDER; + idx = order - VMEMMAP_OPTIMIZATION_MIN_ORDER; tail = zone->vmemmap_tails[idx]; if (tail) return tail; -- 2.54.0