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 80D1227B50F for ; Wed, 13 May 2026 13:11:40 +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=1778677901; cv=none; b=lHTcztAlWyOV8B8QoeyjS7nkjux7Cz/ybkUJQOpYTNrdcX6ZfFQJrb8cCiJG27uQC2jLxOCz3P5hAT+f5MJiseKamXgSJxUvfiT/m6oFHLHuWtHfhr6yCc0lfTMbwI1n7UEblxziIB/Y7kOOi3hYGGUe2zqBZnMGb44W7lZ8VKU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778677901; c=relaxed/simple; bh=sgmY5mp7gHJAvKJqZ7taI3EAcSG1A0BL+sU5f2WCgfI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jzMCL5vCOjyvrjWgfCC1WTaUy1iH+ULCw0j95CjbTHaZtrvP9K/5QzEicnwQEugQVjNofrREXc6O6yqU35jURwgxJjKojji/uOwKq3G30sVtl4W6n1quu2ZYgRi+nEFNadBESgFroKHQjLcasrqpVHgs1SeavA/MK1MBNlHLLrI= 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=c6mkGmiT; 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="c6mkGmiT" Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-2b9ea536877so39485995ad.1 for ; Wed, 13 May 2026 06:11:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1778677900; x=1779282700; 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=cQTyOkGmfxy6eUFBRtUP+rZk74jFDbmzM0hnLmumWs8=; b=c6mkGmiTCiJb6sa5EW5OP8e7KXDDUzzRy1H3DBHEexGZIxnyoMNo188WylNWeDrqw8 yvTMEWm2Z4awy5c6f/V1Q5bbcAifSEJIFl1w/VTC++Zwg21nyGShnnTHpAveaHfZU2TS 1yGmm50PkgDJjiTBHol8lUXdzXPHg0smkDptPT8821v6vY+Y/wkQUd087tKJXfzADTMi ijewJ6qe4BU9tSSYGBZuBCWuzcn4xaqRwTIMGWCg9C4fjeSowRzN8Nk4xovnJf9xRhNZ mty8AmsWcRkDqHN8vw9DHwTBws9654bzuk+97PvSVbMhY3VClR1JiJiyR+mXkPtXSHFw dCdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778677900; x=1779282700; 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=cQTyOkGmfxy6eUFBRtUP+rZk74jFDbmzM0hnLmumWs8=; b=qT8k2j2P7fuQd6mcWCTTruv+uuAJvH9QurUO4tJv2S/t8MpOcT2ydI1XDzf7IEs/p9 We6XQ3rqBwlUOSMUMvw9LYgoGR/4BeyKpG6ZJMwkODKdshp9XiJZNkvLVZYphd7uxwwN WxtUUWDAWV3e+HuTfEjU9P5cXpDoABxXirKMGS6MCoh34JKXFnLdGEg4w3Fd7oZdInkj SZcA1VRErN6ikENt3RZFD8gZ9wpY6DNXvYJTVp4KlQoNWmXG2WeXRGzvjb6XNBywmmjN 6doekystOwi9JczA2CmWVzVEx+FXeTzQ0Fs/634CDS98lOH2zzB/cL5tjRJopX3OFEgW pSng== X-Forwarded-Encrypted: i=1; AFNElJ+WpJ+i1yUc2jccz7LXe9J6QESrYAAImMFzprCt6/8WMfU4UkvIAXJXzoBVm8gefs/KI1nQNB71Y0gHlEw=@vger.kernel.org X-Gm-Message-State: AOJu0YxYVIrCCL193cBRaS/Cfw3Wofo4gF00oXtTU7AtHVBevR4hrmtr E3SfcF1jd9j1puBhQYwhf0qSCvY0EpvEDwI26xiWfXr1spult7K9u7kzM3QfQ0Z9CDg= X-Gm-Gg: Acq92OG//IDkWfUjvfZyed81eLHRsVSFea5i0yTp6CHxUH+KV1rSnoN+pL6kvb5P6Gl ifjKWdbcDc24BsfIJxzyhBaJVOSyMKxd/h4lNhDQOlK14zJgtpxMZSbpQhrdNYblZCauyHH7NX7 pRDxnzuWQtDryjcRTPFKNyCLsYCyDJofVO205uYzoMiUmwDLdYuRi4VfxNZkWOT5JoVCczho//l pFflKp8/atIIPUXvH5gCPvH448uipomxyC2KB4evWutjtRB2iboYKLlHmpRXYdRnIFmqZC5yf39 Lf8JCbS5xqkdcYUiThEdbXIAZqXSGc42FD/HWYDTF7CQlOrJbyEA5vcu6SX9laq63MAK4t2z9Oy KQfViUfdhFovLhCs3Y2zHG96I0o8W20D6lYPabeky2rN50iHIgFGHkYiuAB4bS5cPpZPNfkdJNb qbDR1kzZgeu8tgHmJmxbUowdGYNwOcpBZnQCkxojyv7j8Wx8zsr2lXPvbD8XU= X-Received: by 2002:a17:902:da2d:b0:2bc:e299:4b3f with SMTP id d9443c01a7336-2bd272a16c6mr34476025ad.10.1778677899685; Wed, 13 May 2026 06:11:39 -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.11.34 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 13 May 2026 06:11:39 -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 45/69] powerpc/mm: Make vmemmap_populate_compound_pages() static Date: Wed, 13 May 2026 21:05:13 +0800 Message-ID: <20260513130542.35604-46-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_populate_compound_pages() is no longer used outside radix_pgtable.c. Make it static and drop the unused dev_pagemap and start_pfn argument from its only remaining caller. Signed-off-by: Muchun Song --- arch/powerpc/include/asm/book3s/64/radix.h | 6 ------ arch/powerpc/mm/book3s64/radix_pgtable.c | 14 +++++++------- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/arch/powerpc/include/asm/book3s/64/radix.h b/arch/powerpc/include/asm/book3s/64/radix.h index da954e779744..8452a2714cb1 100644 --- a/arch/powerpc/include/asm/book3s/64/radix.h +++ b/arch/powerpc/include/asm/book3s/64/radix.h @@ -356,11 +356,5 @@ int radix__remove_section_mapping(unsigned long start, unsigned long end); #define vmemmap_can_optimize vmemmap_can_optimize bool vmemmap_can_optimize(struct vmem_altmap *altmap, struct dev_pagemap *pgmap); #endif - -#define vmemmap_populate_compound_pages vmemmap_populate_compound_pages -int __meminit vmemmap_populate_compound_pages(unsigned long start_pfn, - unsigned long start, - unsigned long end, int node, - struct dev_pagemap *pgmap); #endif /* __ASSEMBLER__ */ #endif diff --git a/arch/powerpc/mm/book3s64/radix_pgtable.c b/arch/powerpc/mm/book3s64/radix_pgtable.c index c7f2327681cc..18b24bb891b7 100644 --- a/arch/powerpc/mm/book3s64/radix_pgtable.c +++ b/arch/powerpc/mm/book3s64/radix_pgtable.c @@ -1109,7 +1109,8 @@ static inline pte_t *vmemmap_pte_alloc(pmd_t *pmdp, int node, return pte_offset_kernel(pmdp, address); } - +static int __meminit vmemmap_populate_compound_pages(unsigned long start, + unsigned long end, int node); int __meminit radix__vmemmap_populate(unsigned long start, unsigned long end, int node, struct vmem_altmap *altmap) @@ -1124,7 +1125,7 @@ int __meminit radix__vmemmap_populate(unsigned long start, unsigned long end, in unsigned long pfn = page_to_pfn((struct page *)start); if (section_vmemmap_optimizable(__pfn_to_section(pfn))) - return vmemmap_populate_compound_pages(pfn, start, end, node, NULL); + return vmemmap_populate_compound_pages(start, end, node); /* * If altmap is present, Make sure we align the start vmemmap addr * to PAGE_SIZE so that we calculate the correct start_pfn in @@ -1220,10 +1221,8 @@ int __meminit radix__vmemmap_populate(unsigned long start, unsigned long end, in return 0; } -int __meminit vmemmap_populate_compound_pages(unsigned long start_pfn, - unsigned long start, - unsigned long end, int node, - struct dev_pagemap *pgmap) +static int __meminit vmemmap_populate_compound_pages(unsigned long start, + unsigned long end, int node) { /* * we want to map things as base page size mapping so that @@ -1238,8 +1237,9 @@ int __meminit vmemmap_populate_compound_pages(unsigned long start_pfn, pmd_t *pmd; pte_t *pte; struct page *tail_page; - const struct mem_section *ms = __pfn_to_section(start_pfn); + const struct mem_section *ms; + ms = __pfn_to_section(page_to_pfn((struct page *)start)); tail_page = vmemmap_shared_tail_page(section_order(ms), device_zone(node)); if (!tail_page) return -ENOMEM; -- 2.54.0