From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) (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 EED7B3B2AA for ; Sun, 26 Apr 2026 09:27:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.173 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777195632; cv=none; b=EK/1Bna7BqJxGYoD7yBv6rLZ9nUdtKjFBlQaUCdSPgrfH0qBfNoMnQXKa+yNheDaVPqKnoWkPRGmswO148Qxj9Ruz93f3wrQ/NQQ/MXdHA6kl9rPLKUVzAnkUh/6jLCQ4QYoYf/6Fombcr6or2tdQ0tC8f0AfWLfXsyLMC8hMH4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777195632; c=relaxed/simple; bh=0PLb5zFObm442FFPCMDt2iC8dud5KQqM0ijr0fGCJws=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ctpXyuhRS1WL2kAKdMGTWmZ4dsg9unKC41ci3Ka6MRuc6BqYwfcLCIZtRDvfpcWraVw3DkkZU+02eD362+o2Tqx6ssvROY8LlPcSQ4fk1XG8iYsnNJ5225vrcB9GEDcYp8goV4BUBxtfSPPzeEGYDTIRdjjrqorsen6TiIcWlS8= 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=Zd6m3n52; arc=none smtp.client-ip=209.85.214.173 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="Zd6m3n52" Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-2b299b3c739so42526905ad.3 for ; Sun, 26 Apr 2026 02:27:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1777195630; x=1777800430; 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=Odp+99JHCbpwHHM6ds3EE8rv22wzvZDnJ+uzSMS+VHA=; b=Zd6m3n52Hy0maXKER73IjA/PFZidCrhgVUoUuwR61TFPmrVI1DzQLeWAQyhexd4hHe jltRbKVLQbLrVkkqTSQhdXqR4cJ1l4BI4DoOVpKja3swYjwP1jS0QD64pidg7jZj9oo0 LOS84UmfaRQOIfrMsF90ZUaKGPI5CTmeCKoXYmIAaFhXXocZEQr1c0tG5xvvlsyulFPc 5SRDid09LbAVTJG9uO36VgB36IOyAXdkEJ4ujw19yCBOrE2HmcKmsdaJe1Vpt1EukAr1 g0EpXh/uLCNnYBsDRrMJN2chcK45esV5j4Jydi6J+WPgHxnwXxXqw2lW9NDLpegHeS/c CXlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777195630; x=1777800430; 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=Odp+99JHCbpwHHM6ds3EE8rv22wzvZDnJ+uzSMS+VHA=; b=ItEn+bLrPGVXpXUHwLL66GnZ2saBEq0QgKjDCcof75Rurs06GF7HTUGRDxf+8qHG6g 2ts5WpFRCbuNhaDS5lsIijVjkPV7TSkN3IkRFNO3klijP0dbA4ug5Cf+krHs9xf7+OVp xBSv9KQSHvdk/SqP1cFbaxPuLEdS2tlPjgq5ECo5j1GS9PvpArVNsiNdYTOAHd+Ip4Vr f1B5Zfp9dhb/7y39sXx2UG8s/vudntkWgJRKUxqFXVA38TkpHIS//5Hwcc+dVKuMxeBT jlaWIGjbgy8mUHmP68J5z1jg0P1mt/HTZ3urOzZYoHJckAVNMadGCsuLIagyJBtN4YFr v4yg== X-Forwarded-Encrypted: i=1; AFNElJ8dUGV1tzJooIMdZOsq+DK8Z3ugqhs55dF9B1sYhh45gNyhVK1rvqtOC1Hjjjgsku9r8hEmKa/WBPc3SP8=@vger.kernel.org X-Gm-Message-State: AOJu0Yyo2SAigQLfijsLehIkdc9MMO4vdL0auRPxL46+S7oNDZcwm9ag 2QeyQhmBQsJ3lN+Wk/WZfvl9ByAZmXa621VJhBPQ2tIFijajWHoRbM8UYyz9zvGltBI= X-Gm-Gg: AeBDieuXjAL9scB1TKeod2rq4+WIuCqyiFwxDxQxBxU31Rw+dmq4Lgq9GDhgW4Et+0m ZcvtSob2F43hTn2HHLv6+8yrENpb8cNsTLlSkaugXC5ghSRlpSgI8fRUEN8KM9+cjMLkhYLJ2h1 8tTbQ0syBF1zwFj005FJSxcpDRZRBtPQum7pfanof0E6welupprYIN+InHBSywwiN9NEguFVF8a cfrfID4zPAC3cWhz9ZZ4cXFRYerP8UfplhFLjsQ4yth4nXUUFDmNLQp1da7oLYYqFFLkckf8BjA vK3nDruL+/1M/WA7RbsEE9Nhqlqd1JniFea3HgyynpSqN1vcFIgssqggNXa1idoTA5zO6Smkq1h lUYzL0zoNNSZaAr5L53gkvEwm44Ui056C7INd/A+72AL3B2CqkCHvLRMQBb/gXCJhhtqtIkU5v0 gq4W3IkW5ECdkZWhER8vfoOtVMIPfN X-Received: by 2002:a17:902:cf0f:b0:2b7:a1ff:b239 with SMTP id d9443c01a7336-2b7a1ffb4b5mr144455245ad.14.1777195630176; Sun, 26 Apr 2026 02:27:10 -0700 (PDT) Received: from n232-176-004.byted.org ([240e:83:200::34a]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b5fab0caa9sm270352885ad.40.2026.04.26.02.27.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Apr 2026 02:27:09 -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 , 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 , stable@vger.kernel.org Subject: [PATCH v7 1/6] mm/sparse-vmemmap: Fix vmemmap accounting underflow Date: Sun, 26 Apr 2026 17:26:35 +0800 Message-Id: <20260426092640.375967-2-songmuchun@bytedance.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20260426092640.375967-1-songmuchun@bytedance.com> References: <20260426092640.375967-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 In section_activate(), if populate_section_memmap() fails, the error handling path calls section_deactivate() to roll back the state. This causes a vmemmap accounting imbalance. Since commit c3576889d87b ("mm: fix accounting of memmap pages"), memmap pages are accounted for only after populate_section_memmap() succeeds. However, the failure path unconditionally calls section_deactivate(), which decreases the vmemmap count. Consequently, a failure in populate_section_memmap() leads to an accounting underflow, incorrectly reducing the system's tracked vmemmap usage. Fix this more thoroughly by moving all accounting calls into the lower level functions that actually perform the vmemmap allocation and freeing: - populate_section_memmap() accounts for newly allocated vmemmap pages - depopulate_section_memmap() unaccounts when vmemmap is freed This ensures proper accounting in all code paths, including error handling and early section cases. Fixes: c3576889d87b ("mm: fix accounting of memmap pages") Cc: stable@vger.kernel.org Signed-off-by: Muchun Song Acked-by: Mike Rapoport (Microsoft) Acked-by: Oscar Salvador Acked-by: David Hildenbrand (Arm) --- mm/sparse-vmemmap.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c index 6eadb9d116e4..a7b11248b989 100644 --- a/mm/sparse-vmemmap.c +++ b/mm/sparse-vmemmap.c @@ -656,7 +656,12 @@ static struct page * __meminit populate_section_memmap(unsigned long pfn, unsigned long nr_pages, int nid, struct vmem_altmap *altmap, struct dev_pagemap *pgmap) { - return __populate_section_memmap(pfn, nr_pages, nid, altmap, pgmap); + struct page *page = __populate_section_memmap(pfn, nr_pages, nid, altmap, + pgmap); + + memmap_pages_add(DIV_ROUND_UP(nr_pages * sizeof(struct page), PAGE_SIZE)); + + return page; } static void depopulate_section_memmap(unsigned long pfn, unsigned long nr_pages, @@ -665,13 +670,17 @@ static void depopulate_section_memmap(unsigned long pfn, unsigned long nr_pages, unsigned long start = (unsigned long) pfn_to_page(pfn); unsigned long end = start + nr_pages * sizeof(struct page); + memmap_pages_add(-1L * (DIV_ROUND_UP(nr_pages * sizeof(struct page), PAGE_SIZE))); vmemmap_free(start, end, altmap); } + static void free_map_bootmem(struct page *memmap) { unsigned long start = (unsigned long)memmap; unsigned long end = (unsigned long)(memmap + PAGES_PER_SECTION); + memmap_boot_pages_add(-1L * (DIV_ROUND_UP(PAGES_PER_SECTION * sizeof(struct page), + PAGE_SIZE))); vmemmap_free(start, end, NULL); } @@ -774,14 +783,10 @@ static void section_deactivate(unsigned long pfn, unsigned long nr_pages, * The memmap of early sections is always fully populated. See * section_activate() and pfn_valid() . */ - if (!section_is_early) { - memmap_pages_add(-1L * (DIV_ROUND_UP(nr_pages * sizeof(struct page), PAGE_SIZE))); + if (!section_is_early) depopulate_section_memmap(pfn, nr_pages, altmap); - } else if (memmap) { - memmap_boot_pages_add(-1L * (DIV_ROUND_UP(nr_pages * sizeof(struct page), - PAGE_SIZE))); + else if (memmap) free_map_bootmem(memmap); - } if (empty) ms->section_mem_map = (unsigned long)NULL; @@ -826,7 +831,6 @@ static struct page * __meminit section_activate(int nid, unsigned long pfn, section_deactivate(pfn, nr_pages, altmap); return ERR_PTR(-ENOMEM); } - memmap_pages_add(DIV_ROUND_UP(nr_pages * sizeof(struct page), PAGE_SIZE)); return memmap; } -- 2.20.1