From nobody Wed Feb 11 01:28:44 2026 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) (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 311E41AA1C4 for ; Fri, 3 Jan 2025 11:01:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735902120; cv=none; b=uQRpHbM8Uh3IlVZ1YW0cPTPJf/mrgij6jwXBneFwP2Xhny63ZeeD3Q+KRuEJaDCvaf/uWpovCO2gVeD6qIvLLIKMX6Oo0AFh0V4oIsKtKhGGM67dZSMvKstqsxW+dUBTOzq6apVuYB9lm+g1wibSJ1CtuOrvi/iUfwjg3yj1vqs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735902120; c=relaxed/simple; bh=viMaR0L5Eunw3TreLfJYE/lqhTk8te3W0Rrnc/NBswk=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=DjG6jjAkRtep04sbEUCP8f5KOnKLYglTpYUZvb1LZHfQ3RrXw6qp+zd8mUmLnOby1pLVCjZyrPRsdUmzaDATmh13raGk8Ru+6r4emc6ARuqYVqRMxAYPCgk11QfeqEPGZ/nvmkdRAAy/UuhWQXai3leOoWgBTuHetcVlYnZESyE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=TfuTwVy6; arc=none smtp.client-ip=209.85.214.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="TfuTwVy6" Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-2167141dfa1so164898445ad.1 for ; Fri, 03 Jan 2025 03:01:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735902118; x=1736506918; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=oHM0PXsr7aSXBTLwpKbXE1u0I3u/fX1OBGk0fCX+rE4=; b=TfuTwVy6ao5cdVQ4NRwh0mVPIORorNWbPK/d9V9jSusqWJ0QS2BPifLulOvQxFomFO /WPBdw4HOmKebWzZL4b+6rq6Wah0qj5Rr0mpM8Fywry6JHf0NVJ/k44ugGHlf0epB3ih FCvuM+5EnRQI24OF60aloBhiDLkwUr91Xwm3Wi2kifVgiPgQrs/XemZT1vQRMJ5swU6m fID//xTKqIdGAZInJTygzMJq/IAQffTBsXnk0y/2ekgn1pTvWeGAi2cmhbNAqMmf+p0m jiLq0GKeNuzWrtpROpCHjd7gqXaU8qG7ubBatvRwE77q8q+QLgdpGaeDlNuTDSej9F/A l/pA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735902118; x=1736506918; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=oHM0PXsr7aSXBTLwpKbXE1u0I3u/fX1OBGk0fCX+rE4=; b=W1xIjSBSWwSHXUXOlO8ejkuSD06TAU+o0+MR5GU9OUBEZoMw49n/QByLwwScqtfxOn j5VwydHXS/kaCEc9SnG2m+D/gaE8zBImbn6TEEO1pCTAaRLCXFLwVKZtl3K6sgUg4yWo /HgEMqccDBpFCggN8hlDODMVgN9YjORuXFC0pu2QyZTIyR44G3K+Yz584zrBkwDBeYw0 X0vnctDps+3rsiTVzpuaWvnQ40r27g9aFHVy0OJSPT4/JWl7bo7FSuVDz/yit1+bkWRS J40jADdNVTNhiypGrRnMBHp6pOBoZu5pYFIZZhBB5wqbm6hvyV9E5102yAJTQ/eNPMB9 tPSA== X-Forwarded-Encrypted: i=1; AJvYcCVgkoeAXb43mea8TBmJbNcivp7JweDYS4V5JtqoX3wqKnq1/8dmaxe3VMUvJSYG0VoNFpHaDcL06Rji7Kg=@vger.kernel.org X-Gm-Message-State: AOJu0Yx3UaZX+p65bnAGxJs354ncxjgTtpTJaaA/nDJPsrec/LGmOT8i B6H/mkSXKPO4IEofsw1r1pSMAqDII8g9qBDc0gCqVED1pTV39Edrjr4j147J X-Gm-Gg: ASbGncujF+jARu+LwLLpxw64TdTYKUxfCcnIi5x7hcFaVwszxgm/CS7gavjE64difCt Y+37wAFjhRD/8sHgvTwnHAHHMFhkoXnU4PbFBR8XkvATw6BmyloTz/OZXait3tbnJ8SO2hbh96z yYPBOETiOSBqRj6Nrx3o5aeQkRpG/UccFdtX81QiHubGkVC6GhNIuowAgJCnACOHJq0XLbXG6eN wWSzVT7ab7otVB2hXw3x35daXbxr6c2nCY80nVBi2qqlKATzEGlXttm1rWNc1/nP89QsS1AfgIQ ZA52 X-Google-Smtp-Source: AGHT+IGqoWUXHzIoQUPmvt712Je7EdKpTNDNscgW7lFRcAVslooqJ1ILT6Iyvlp/OUKkMTPJjwT1Cw== X-Received: by 2002:a17:902:da8e:b0:216:6a4a:9a47 with SMTP id d9443c01a7336-219da7effd4mr821552405ad.21.1735902118412; Fri, 03 Jan 2025 03:01:58 -0800 (PST) Received: from localhost.localdomain ([36.110.106.149]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-219dc9f731dsm237025485ad.200.2025.01.03.03.01.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Jan 2025 03:01:58 -0800 (PST) From: Guo Weikang To: Mike Rapoport , Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Guo Weikang Subject: [PATCH v2] mm/memmap: Prevent double scanning of memmap by kmemleak Date: Fri, 3 Jan 2025 19:01:50 +0800 Message-Id: <20250103110150.1352226-1-guoweikang.kernel@gmail.com> X-Mailer: git-send-email 2.25.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 Content-Type: text/plain; charset="utf-8" kmemleak explicitly scans the mem_map through the valid struct page objects. However, memmap_alloc() was also adding this memory to the gray object list, causing it to be scanned twice. Removes memmap_alloc() from the scan list and adds a comment to clarify the behavior. Link: https://lore.kernel.org/lkml/CAOm6qn=3DFVeTpH54wGDFMHuCOeYtvoTx30ktnv= 9-w3Nh8RMofEA@mail.gmail.com/ Signed-off-by: Guo Weikang Reviewed-by: Catalin Marinas --- v1 -> v2: Fix CI: Recover __earlyonly_bootmem_alloc that is marked with __ref to prevent init section mismatch WARNING. Links: https://lore.kernel.org/oe-kbuild-all/202501021601.jub4p3EM-lkp@int= el.com/ --- include/linux/memblock.h | 4 ++++ mm/mm_init.c | 8 ++++++-- mm/sparse-vmemmap.c | 5 ++--- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/include/linux/memblock.h b/include/linux/memblock.h index dee628350cd1..e79eb6ac516f 100644 --- a/include/linux/memblock.h +++ b/include/linux/memblock.h @@ -378,6 +378,10 @@ static inline int memblock_get_region_node(const struc= t memblock_region *r) /* Flags for memblock allocation APIs */ #define MEMBLOCK_ALLOC_ANYWHERE (~(phys_addr_t)0) #define MEMBLOCK_ALLOC_ACCESSIBLE 0 +/* + * MEMBLOCK_ALLOC_NOLEAKTRACE avoids kmemleak tracing. It implies + * MEMBLOCK_ALLOC_ACCESSIBLE + */ #define MEMBLOCK_ALLOC_NOLEAKTRACE 1 =20 /* We are using top down, so it is safe to use 0 here */ diff --git a/mm/mm_init.c b/mm/mm_init.c index 24b68b425afb..71b58f5f2492 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -1580,6 +1580,10 @@ static void __init free_area_init_core(struct pglist= _data *pgdat) } } =20 +/* + * Kmemleak will explicitly scan mem_map by traversing all valid `struct *= page`, + * so memblock does not need to be added to the scan list. + */ void __init *memmap_alloc(phys_addr_t size, phys_addr_t align, phys_addr_t min_addr, int nid, bool exact_nid) { @@ -1587,11 +1591,11 @@ void __init *memmap_alloc(phys_addr_t size, phys_ad= dr_t align, =20 if (exact_nid) ptr =3D memblock_alloc_exact_nid_raw(size, align, min_addr, - MEMBLOCK_ALLOC_ACCESSIBLE, + MEMBLOCK_ALLOC_NOLEAKTRACE, nid); else ptr =3D memblock_alloc_try_nid_raw(size, align, min_addr, - MEMBLOCK_ALLOC_ACCESSIBLE, + MEMBLOCK_ALLOC_NOLEAKTRACE, nid); =20 if (ptr && size > 0) diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c index cec67c5f37d8..903a5422907b 100644 --- a/mm/sparse-vmemmap.c +++ b/mm/sparse-vmemmap.c @@ -27,7 +27,7 @@ #include #include #include - +#include "internal.h" #include #include =20 @@ -42,8 +42,7 @@ static void * __ref __earlyonly_bootmem_alloc(int node, unsigned long align, unsigned long goal) { - return memblock_alloc_try_nid_raw(size, align, goal, - MEMBLOCK_ALLOC_ACCESSIBLE, node); + return memmap_alloc(size, align, goal, node, false); } =20 void * __meminit vmemmap_alloc_block(unsigned long size, int node) --=20 2.25.1