From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) (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 10EC53290BD for ; Fri, 12 Jun 2026 03:59:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.177 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781236768; cv=none; b=gjV/eOdlI8Y241zUHhar6VSIC+EgsZKBCcevaNA8xYZmHqQjvEpt7U4L4WcF3xlwStihyB8rIpF2QOwCChJ+L6IB1D8Jre+l4vJN95JZEHjf3B3kkozvcs+ceokdU2ZcskRZFT1Bncji060HUo84QgNOT6o6gBV1PXaiCy9qFgM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781236768; c=relaxed/simple; bh=it3esgE937uFjKRnmVX2qECQgX5Lg/OcvcB1PIsf0q0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tqg8S9r1udI1KxkmTE+e6UqNZlnLWdq78bk1cx144ozVcufK17eTdO0w2RFn0DNmka0qZVZXz1taINiu8BOtsmViqFpL6eoPp1D1Mr2v1arCMhF3EmDmLiwUtckS0OI3EiwjGo/KRugDzTSn0AtwHQPH2nXv38E5sP5ToYzoLys= 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=KZF3MpPD; arc=none smtp.client-ip=209.85.210.177 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="KZF3MpPD" Received: by mail-pf1-f177.google.com with SMTP id d2e1a72fcca58-842307473b5so454808b3a.2 for ; Thu, 11 Jun 2026 20:59:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1781236766; x=1781841566; 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=A38edv4qBFIhST2C0H/v4DfDnWwAK1V2ZV54LtDXngc=; b=KZF3MpPDUOP61IlwzBlYHkDDlUC3aJgzIzEOTTk1BrbKrCGD/6RnXmiy/pWqbxlano 11gnYXiMYJ9aNcWizy37Zi8SEwOVK5srQKbBRfUEr4mbt7EoGYyVjnZ9I2PFWetVTOwW UCuIxX2pkSHXMY0CvkcwPIeQSFOJqPUcxshxGY76baW2ikiATHUnIWxgeVaeG4C22I63 vlCoyeFd7HOs8VqRrOx4JDbtzp5fgLo5RqXWPH0O0PIDsu+KjeCWi0soVmdiZsbPlNmo Ssx96Wanvu0z6kpNPJ857WCYu8ipv7YMEJrGv331Dg/i3E5W1vc8GZkM35IOsLfIgd63 /5BQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781236766; x=1781841566; 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=A38edv4qBFIhST2C0H/v4DfDnWwAK1V2ZV54LtDXngc=; b=NGNZHMlFOtrKq3uDucNlbjA1P763/9RXazP15v22LOXZ5zwvpJmiWfdtbzjagZl2BJ Fm3CpSDrO8ZOZ+JpLB8PKqe7GqQsfhDlr6gkIj1UaaW1RdmCfmvaFVFE0Z17fKUvzwm7 pQ0aKsqIW4xjup0+bNVSf5RUIIfU+rsBJmYnY6ZY4CQO60T7X95cpATqizy/UK7GH1KR Gnz7bKT047AzpITy7BAcykiZ1ov2bVBD2Ylu1FSiYZfQ6IWAmR8KtSU7d+lc5a7+sYdb cpKXg2t38r3WpR3tqa74MfDGCJJ5WH+j3yd8J5+UaR7SMR/2WEUwTUCabpcINaDUOf8h Ieyw== X-Forwarded-Encrypted: i=1; AFNElJ/bcfXUmV7jxF8nQsEjwi0hO/Rjz+dNPZXrUHTkPoPhtBoqPRDeexdA/qExgWPyDPZToybr6BG6ykbVnkE=@vger.kernel.org X-Gm-Message-State: AOJu0YynnjT/q9Zx4hRPBoSvOcSqdCaWB9DcxhMR43fyWmjFb/2BUS9O wll4FFNqr9eiaXMGbPNljrgNBFYELY8W8cbLF+tw/OfT12jG1vvESCAUphjWYNJKrfM= X-Gm-Gg: Acq92OEk157Q02b9sRMFLzG27LQLrTDCuPvtyVOsvIgOw1ogH29flYFozAGjrRCwbaT LjPg+grEAOQ+nErb8w2/XjlMhBSqGnETQ/FaVTf5hAS+PLLDgqVqxyKgNmxyHvM850m3vpOIT+N wuHEZW8vUWPoqYiPdHTB11nWw+t7AgOr0Di7WgZaLFJ616vE55wpNDiyGGybG+pAhiF6U/tE3DQ DHYIQANa+FF1lmyEmzUMajqlm+eZPwvypVh4KTMw2elig5/OScQcmgDjo1MetqMRtfmK3nQhSY9 mygrWWMYvY/32/jwTJUl56ETFy3PUUxBnOk/eGxfH6PtB5/Qh4o1gTh4+iYbfNPt7lFHZ6nQoCo XcZ2gD8y78hPulkWoqtNctE9SaKaP26yiAgouYma/rHi27y1LkGL1e98njNE51mxajBmpElz8Mi 7fkQniVhYYH6RihlDzTf2hV3lTewxSf79VVyRnWixSCEE= X-Received: by 2002:a05:6a00:2288:b0:842:5988:470b with SMTP id d2e1a72fcca58-8434cc161cfmr1136338b3a.1.1781236766275; Thu, 11 Jun 2026 20:59:26 -0700 (PDT) Received: from n232-176-004.byted.org ([36.110.163.99]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-8434ad03fdcsm643352b3a.24.2026.06.11.20.59.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Jun 2026 20:59:25 -0700 (PDT) From: Muchun Song To: Oscar Salvador , David Hildenbrand , Andrew Morton , Madhavan Srinivasan , Michael Ellerman Cc: Muchun Song , Mike Rapoport , Lorenzo Stoakes , "Liam R . Howlett" , Vlastimil Babka , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Nicholas Piggin , Christophe Leroy , Ritesh Harjani , "Aneesh Kumar K . V" , linuxppc-dev@lists.ozlabs.org, Mike Kravetz , Muchun Song , stable@vger.kernel.org Subject: [PATCH v4 03/19] powerpc/mm: Fix wrong addr_pfn tracking in compound vmemmap population Date: Fri, 12 Jun 2026 11:58:47 +0800 Message-ID: <20260612035903.2468601-4-songmuchun@bytedance.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260612035903.2468601-1-songmuchun@bytedance.com> References: <20260612035903.2468601-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() uses addr_pfn to determine the PFN offset within a compound page and to decide whether the current vmemmap slot should be populated as a head page mapping or should reuse a tail page mapping. However, addr_pfn is advanced manually in parallel with addr. The loop itself progresses in vmemmap address space, so each PAGE_SIZE step in addr covers PAGE_SIZE / sizeof(struct page) struct page slots. Since addr_pfn is compared against nr_pages in data-PFN units, it should advance by the same number of PFNs. The existing manual increments do not match that and therefore do not reliably track the PFN corresponding to the current addr. As a result, pfn_offset can be computed from the wrong PFN and the code can make the head/tail decision for the wrong compound-page position. Fix this by deriving addr_pfn directly from the current vmemmap address instead of carrying it as loop state. Fixes: f2b79c0d7968 ("powerpc/book3s64/radix: add support for vmemmap optimization for radix") Cc: stable@vger.kernel.org Signed-off-by: Muchun Song Acked-by: Oscar Salvador Reviewed-by: Ritesh Harjani (IBM) --- v3->v4: - Add Cc: stable@vger.kernel.org (suggested by Ritesh Harjani) - Collect Reviewed-by from Ritesh Harjani --- arch/powerpc/mm/book3s64/radix_pgtable.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/arch/powerpc/mm/book3s64/radix_pgtable.c b/arch/powerpc/mm/book3s64/radix_pgtable.c index 10aced261cff..cf692b2b5f7b 100644 --- a/arch/powerpc/mm/book3s64/radix_pgtable.c +++ b/arch/powerpc/mm/book3s64/radix_pgtable.c @@ -1314,7 +1314,6 @@ int __meminit vmemmap_populate_compound_pages(unsigned long start_pfn, * covering out both edges. */ unsigned long addr; - unsigned long addr_pfn = start_pfn; unsigned long next; pgd_t *pgd; p4d_t *p4d; @@ -1335,7 +1334,6 @@ int __meminit vmemmap_populate_compound_pages(unsigned long start_pfn, if (pmd_leaf(READ_ONCE(*pmd))) { /* existing huge mapping. Skip the range */ - addr_pfn += (PMD_SIZE >> PAGE_SHIFT); next = pmd_addr_end(addr, end); continue; } @@ -1348,11 +1346,11 @@ int __meminit vmemmap_populate_compound_pages(unsigned long start_pfn, * page whose VMEMMAP_RESERVE_NR pages were mapped and * this request fall in those pages. */ - addr_pfn += 1; next = addr + PAGE_SIZE; continue; } else { unsigned long nr_pages = pgmap_vmemmap_nr(pgmap); + unsigned long addr_pfn = page_to_pfn((struct page *)addr); unsigned long pfn_offset = addr_pfn - ALIGN_DOWN(addr_pfn, nr_pages); pte_t *tail_page_pte; @@ -1376,7 +1374,6 @@ int __meminit vmemmap_populate_compound_pages(unsigned long start_pfn, if (!pte) return -ENOMEM; - addr_pfn += 2; next = addr + 2 * PAGE_SIZE; continue; } @@ -1392,7 +1389,6 @@ int __meminit vmemmap_populate_compound_pages(unsigned long start_pfn, return -ENOMEM; vmemmap_verify(pte, node, addr, addr + PAGE_SIZE); - addr_pfn += 1; next = addr + PAGE_SIZE; continue; } @@ -1402,7 +1398,6 @@ int __meminit vmemmap_populate_compound_pages(unsigned long start_pfn, return -ENOMEM; vmemmap_verify(pte, node, addr, addr + PAGE_SIZE); - addr_pfn += 1; next = addr + PAGE_SIZE; continue; } -- 2.54.0