From nobody Sun Oct 5 12:46:58 2025 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0C2DC25A2AE; Mon, 4 Aug 2025 15:15:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.158.5 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754320519; cv=none; b=pJAAjeCojzVMz3FOgChrPQtsoIqfIRWKM7p1RsUZNEHb5tx2203JnnNaIG6jv+SBCW95JNBzqICFn2SuVPkxKN3QCWzBSs6eiuoyY/W37HCbMcSuYfdxMGUQuzmYUGqOOJo/svhdV2VKCOYJPgk2lTKf2fdoL0IVOqg80wHqawk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754320519; c=relaxed/simple; bh=P5etSnVODHY9mFda1e4aWjASEqQNNmKOkqoxvtsdqAw=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=Y8eEAVItV/kHXFCich52XRog9miE99a+Q8h4sdTSa8hEOvzWOb7dNYcZ9PvZlnFdZPPUiifgt/lQKGHtuoPUTPKAbNY+3dC+Bte8bSQGLmJKKIT1sKMdSSLLs/bRZUvSbgt6nLZBBgAShzoeCaI1vMo/PVqtKThLU+eQTcU8VVY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=FCC2CgzF; arc=none smtp.client-ip=148.163.158.5 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="FCC2CgzF" Received: from pps.filterd (m0360072.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 574CdmVf024001; Mon, 4 Aug 2025 15:15:11 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:message-id:mime-version :subject:to; s=pp1; bh=kVlNkasbhPWtsdP92OI0TGfwW4AsNdYUXsTPRipab pI=; b=FCC2CgzFcFsBVGX77lbxZR54vmSw0M3unkHxYQi5x3hSdF7awO13W38Vh Re0aqanh4rb8OPNM+U9NqIalxA7FweySjmlRdhzdlkAqtFyB1gNTy+ow9GKp+Z+I HqRfYHk/FkXVIhkNZzqVGiIMM7Xv+5TlT91FDfYkLEb8MZJtW+Tl4aQ/E4EjT3ze AwyfcMWbl1ON9OEmEt5Y7eVEiN8MNi9Kajv/xLvpFeT3frYSnT3NRoOu29ddZcAC 8trj0n9icBflmVRiOgEP17HWkO9fc7HfEPgi5hXdvkgR+Yg4VsIJzLwcCzpvTvDJ xSXBm56sjPzqh2yAOv8fZ8qHknVSA== Received: from ppma11.dal12v.mail.ibm.com (db.9e.1632.ip4.static.sl-reverse.com [50.22.158.219]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 489ab3hpct-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 04 Aug 2025 15:15:11 +0000 (GMT) Received: from pps.filterd (ppma11.dal12v.mail.ibm.com [127.0.0.1]) by ppma11.dal12v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 574Erdtc004594; Mon, 4 Aug 2025 15:15:10 GMT Received: from smtprelay06.fra02v.mail.ibm.com ([9.218.2.230]) by ppma11.dal12v.mail.ibm.com (PPS) with ESMTPS id 489yq2e4vq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 04 Aug 2025 15:15:10 +0000 Received: from smtpav03.fra02v.mail.ibm.com (smtpav03.fra02v.mail.ibm.com [10.20.54.102]) by smtprelay06.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 574FF6fh35258886 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 4 Aug 2025 15:15:06 GMT Received: from smtpav03.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id AE48D2004D; Mon, 4 Aug 2025 15:15:06 +0000 (GMT) Received: from smtpav03.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 8974A2004B; Mon, 4 Aug 2025 15:15:06 +0000 (GMT) Received: from tuxmaker.lnxne.boe (unknown [9.152.85.9]) by smtpav03.fra02v.mail.ibm.com (Postfix) with ESMTP; Mon, 4 Aug 2025 15:15:06 +0000 (GMT) From: Sumanth Korikkar To: Andrew Morton , linux-mm , LKML , David Hildenbrand Cc: Gerald Schaefer , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , linux-s390 , sumanthk@linux.ibm.com Subject: [PATCH v2] mm: fix accounting of memmap pages for early sections Date: Mon, 4 Aug 2025 17:13:27 +0200 Message-ID: <20250804151328.2326642-1-sumanthk@linux.ibm.com> X-Mailer: git-send-email 2.48.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Authority-Analysis: v=2.4 cv=Z+jsHGRA c=1 sm=1 tr=0 ts=6890ce7f cx=c_pps a=aDMHemPKRhS1OARIsFnwRA==:117 a=aDMHemPKRhS1OARIsFnwRA==:17 a=2OwXVqhp2XgA:10 a=VwQbUJbxAAAA:8 a=20KFwNOVAAAA:8 a=VnNF1IyMAAAA:8 a=uDGzf9yX4s-_2kI86w8A:9 X-Proofpoint-ORIG-GUID: uZI5NuSuM-9ubMXko91dLJlnURsMaP2E X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwODA0MDA4MSBTYWx0ZWRfX0fQfiCy9/IHv LOHwzbMU0A/cp0keLF/5hC7KrDAqIcUCHra42bywBqwOpBCAAWiGwCsOjW2ifc0AUtRmFnP201u iKFklA9cFNvbjvtL7ueyGpafGyXUq8+TaN8VGp6XOteZ+EZ2967GKs2Mza+w/+czTTcyHjqQjjx nE+VLmyXFeBBEudIj99T3SXOrIPAOYNnr6cleq1C0PS+QH6tC7CO6IPLo2gtyjeLGLRP09rEHvs O4pDldcGwEDZx98kChISofl0coxsLKhWljdLoVI2nwsH9NkQdnldOveqiqTXr2SSDYnH4llP05F HSeopl1bqMUQawIKkuVAspLKcMS98gphb7rVdOg/f58s6z4rgTMhhNhlETao9yemtLlLRkKUr9f Aw1MzPnOs5u00BvRhxGFmgph9K7qD33u0MDyTZQfKFDt2gXb5L+YdL2LvWkF872rPkVmlvXS X-Proofpoint-GUID: uZI5NuSuM-9ubMXko91dLJlnURsMaP2E X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-08-04_06,2025-08-04_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 spamscore=0 malwarescore=0 clxscore=1015 suspectscore=0 priorityscore=1501 mlxlogscore=560 adultscore=0 phishscore=0 mlxscore=0 bulkscore=0 impostorscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2508040081 Content-Type: text/plain; charset="utf-8" memmap pages can be allocated either from the memblock (boot) allocator during early boot or from the buddy allocator. When these memmap pages are removed via arch_remove_memory(), the deallocation path depends on their source: * For pages from the buddy allocator, depopulate_section_memmap() is called, which should decrement the count of nr_memmap_pages. * For pages from the boot allocator, free_map_bootmem() is called, which should decrement the count of the nr_memmap_boot_pages. Ensure correct tracking of memmap pages for both early sections and non early sections by adjusting the accounting in section_deactivate(). Cc: stable@vger.kernel.org Fixes: 15995a352474 ("mm: report per-page metadata information") Suggested-by: David Hildenbrand Signed-off-by: Sumanth Korikkar Acked-by: David Hildenbrand --- v2: consider accounting for !CONFIG_SPARSEMEM_VMEMMAP. mm/sparse.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/mm/sparse.c b/mm/sparse.c index 3c012cf83cc2..b9cc9e548f80 100644 --- a/mm/sparse.c +++ b/mm/sparse.c @@ -680,7 +680,6 @@ static void depopulate_section_memmap(unsigned long pfn= , unsigned long nr_pages, unsigned long start =3D (unsigned long) pfn_to_page(pfn); unsigned long end =3D start + nr_pages * sizeof(struct page); =20 - memmap_pages_add(-1L * (DIV_ROUND_UP(end - start, PAGE_SIZE))); vmemmap_free(start, end, altmap); } static void free_map_bootmem(struct page *memmap) @@ -856,10 +855,14 @@ static void section_deactivate(unsigned long pfn, uns= igned long nr_pages, * The memmap of early sections is always fully populated. See * section_activate() and pfn_valid() . */ - if (!section_is_early) + if (!section_is_early) { + memmap_pages_add(-1L * (DIV_ROUND_UP(nr_pages * sizeof(struct page), PAG= E_SIZE))); depopulate_section_memmap(pfn, nr_pages, altmap); - else if (memmap) + } else if (memmap) { + memmap_boot_pages_add(-1L * (DIV_ROUND_UP(nr_pages * sizeof(struct page), + PAGE_SIZE))); free_map_bootmem(memmap); + } =20 if (empty) ms->section_mem_map =3D (unsigned long)NULL; --=20 2.48.1