From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) (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 B53144F7975 for ; Wed, 13 May 2026 13:23:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.50 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778678586; cv=none; b=HcJV8guKzvEz6FJnEtB+d4r63gyZX9kauHNg7WsRKpeWrA9Hoj15rguO9OT6G0BSll5WM2PN3cQs+ErbsXcK9H9t6t557jPSacBBLG7NzseKoaFmbD0lJTvgFJkKYLDJeAqtlSsRdX/uuDwTQ8X0kBnZ8uR+B7HFfjSSdtdg5fU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778678586; c=relaxed/simple; bh=6JAvYJ8qkzzErx+eeo/My/UIzm17CzNWcCiN1xII+NU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oiEwAKpDG0jK2y1VRHWuE27CwCXU95sa791rEm2roOvVhBuQHuM5YiYq6L+Xv6RHuNor8yuPBh+9DIcazNPkPOSWmxL9JkZOjK1icr9cNRHqOZWoL5bnDeui4lt+07jwFIGF2DG8d1CJdrixv5pATal4nRMPH6EGb310liI6EOc= 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=ksllMqpM; arc=none smtp.client-ip=209.85.216.50 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="ksllMqpM" Received: by mail-pj1-f50.google.com with SMTP id 98e67ed59e1d1-36608b2f2dcso4766669a91.2 for ; Wed, 13 May 2026 06:23:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1778678584; x=1779283384; 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=KmWs7Z/HY7dnLOeYCdnqk/zbv31syyn+Ltp9gTVRyME=; b=ksllMqpMnZHWSqvbx8h3EA18BVz0g75sZuwIm+fA2cUHRPOQ5NrV1KauXmx7lRUTI5 OssncuIRn1zoNgJWHaNRCUzb58NMEfegkFxRbAh13EWHU5D90AHtHPtnBwTZvnxO5hIK iUBTaaQdqFRRNYiJB2fZ+yHTt1i4U//BoB3tRd98lAj/c/D3842VkIM2WNRJ16KQzeg0 pzz9bpfjB/aHp9MRrxccWinSE5oKMUFV42UlZCv1hqzLu8CeorvoZrWCXec/dDwE0Erf VlmAWnEQPfDWqjKNNKmMmoeG8K4kp0in1NB3J9vwQ7grC0LFuiSxALDjDCmAaYiAfJbd N0vw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778678584; x=1779283384; 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=KmWs7Z/HY7dnLOeYCdnqk/zbv31syyn+Ltp9gTVRyME=; b=MzHrgDI69LJS0CVEeadXKibXs87IKn1cDMOKo2jnPpehdkjRPRFVVf/ieEjkIN3PU1 k+ppxj5sL7krg3jChaMkbcB3kBdvTzwdfl7NejXx8tQt5ACBJhFLfdpKNIfMeL2bWKZv WUddjpjigeFwUWv8iKUGudPu7UhZdVCZVcTgPVcdXhjeXYPt7rbL6yVdUk8uTkZD1qtv Dp0qDbavmjL0l5QsjLc45I/rm8LK8I5HDNbdcywhF366A6/vA0YX2EFjdX6op4dESsjJ vUcYnNvV1gnZi/pZDQ5x3w353wD41TLHYFjNl4GxUDZEcArCFtTc+5rz0xEobm/XsvHw sgbQ== X-Forwarded-Encrypted: i=1; AFNElJ9keHplrRlfdANX+d0H1cHscnMEl0TnnCFTAv9eqDvazDPIr6dNt2iqxPfy0bcLMAjKf6cBWAYQUT0LPSs=@vger.kernel.org X-Gm-Message-State: AOJu0YxA/I7LqLTsrM0MUqDKAdYFXCHIJ9OvNhe53QJ6R2rQInPstiFD D+NFpYx03gxjDC5jx1nP/ufLX46OHMO4p8uLfuQWhACWsFFgj6elbX3bXg9HemQVknw= X-Gm-Gg: Acq92OEMBY9vgt5ddOhSKZUfggoDuvMq6csQPvWQntcw42pIxOfXhxVruWBry7esLl/ VrZdzrqAhgKhJvCb23ibKor9+aASPrHSeRZv9yB6JzZCERmPCPF8EMNGSmk4pFgbugNL8bPZs5Z gE8POVpp5btEDGUj2+6IjmfO11/OqumFvTlnnzknIDxHOuvvqrX3cl1+btgyFDEx0jhbIOfC2iu uH7pn59aS2XN6b/yp1LwUd2TAXGbGNHYAkRwRDpjr03B8jzpUTfVl+cR3uIywxdyYvSVVzUK3uC lCc70m3XhC6c/VDn2gJyy8aaKPlzyRyYMfBzedSLfkPk9K1IkGA3Q/r2BvzFrHnk3WUHPF8J3cy PBkpcR2+NIsy7YQ551I02ofDVgUDInnP+T4+Ai6m4UV9Iy2sl3QD4+1yOiEi/WGtjYCKa34GQ/g 3JPyBylGg9XtNwGhuUJbuHoMayZA841M7q0aB+y1m9sdBNhs3QTlqbuSBdCkTS X-Received: by 2002:a17:90b:38cb:b0:368:ed92:6f6 with SMTP id 98e67ed59e1d1-368f77c8a81mr2774547a91.1.1778678583622; Wed, 13 May 2026 06:23:03 -0700 (PDT) Received: from PXLDJ45XCM.bytedance.net ([61.213.176.10]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-368edf7cbc2sm3098406a91.14.2026.05.13.06.22.57 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 13 May 2026 06:23:03 -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 67/69] mm/cma: Move init_cma_pageblock() into cma.c Date: Wed, 13 May 2026 21:20:32 +0800 Message-ID: <20260513132044.41690-21-songmuchun@bytedance.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260513132044.41690-1-songmuchun@bytedance.com> References: <20260513130542.35604-1-songmuchun@bytedance.com> <20260513132044.41690-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 Move init_cma_pageblock() from mm_init.c into cma.c so it lives alongside the CMA code that uses it. No functional change intended. --- mm/cma.c | 8 ++++++++ mm/internal.h | 4 ---- mm/mm_init.c | 9 --------- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/mm/cma.c b/mm/cma.c index c1896c0db63d..2843c4f59c4e 100644 --- a/mm/cma.c +++ b/mm/cma.c @@ -30,6 +30,7 @@ #include #include #include +#include #include "internal.h" #include "cma.h" @@ -137,6 +138,13 @@ bool cma_validate_zones(struct cma *cma) return true; } +static void __init init_cma_pageblock(struct page *page) +{ + init_pageblock_migratetype(page, MIGRATE_CMA, false); + adjust_managed_page_count(page, pageblock_nr_pages); + page_zone(page)->cma_pages += pageblock_nr_pages; +} + static void __init cma_activate_area(struct cma *cma) { unsigned long pfn, end_pfn, early_pfn[CMA_MAX_RANGES]; diff --git a/mm/internal.h b/mm/internal.h index 80b9ab594dc5..25b6e767cea0 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -1126,7 +1126,6 @@ struct cma; #ifdef CONFIG_CMA bool cma_validate_zones(struct cma *cma); void *cma_reserve_early(struct cma *cma, unsigned long size); -void init_cma_pageblock(struct page *page); #else static inline bool cma_validate_zones(struct cma *cma) { @@ -1136,9 +1135,6 @@ static inline void *cma_reserve_early(struct cma *cma, unsigned long size) { return NULL; } -static inline void init_cma_pageblock(struct page *page) -{ -} #endif diff --git a/mm/mm_init.c b/mm/mm_init.c index 1e11fd683292..ff6e9fb468bd 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -2200,15 +2200,6 @@ void __init init_cma_reserved_pageblock(struct page *page) adjust_managed_page_count(page, pageblock_nr_pages); page_zone(page)->cma_pages += pageblock_nr_pages; } -/* - * Similar to above, but only set the migrate type and stats. - */ -void __init init_cma_pageblock(struct page *page) -{ - init_pageblock_migratetype(page, MIGRATE_CMA, false); - adjust_managed_page_count(page, pageblock_nr_pages); - page_zone(page)->cma_pages += pageblock_nr_pages; -} #endif void set_zone_contiguous(struct zone *zone) -- 2.54.0