From nobody Tue Feb 10 21:38:50 2026 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) (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 C055AC8DF for ; Mon, 6 Jan 2025 02:12:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736129522; cv=none; b=NTREnF1Z5a2lkd2uW6PNi/1Mls0Qj3lBNYrqYQmSejeEhwAJI2RaAANIkQ9lIcWg+E26DwKitryTfA+JE+2rQC+Kjb9d0MPM+n4T80fsSgotTZPrLkbj6o/0L/nDDLxfJsso0usdEIVVVrOATSBhiWueApngdoEBI7nMW4pWlLU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736129522; c=relaxed/simple; bh=CTP1sWp6no5NLCMz/EHLapxbpVNp5QkUJAerG7dIuQQ=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=LXyDiinzgz8HA6KWpiT+SReBW4tYcjwlmLcexg6yAgVnbxvLHAM0sMxj/K0sfvaLFSyEpOTki8r4ZKhByx4MHUl2GYC3N+S0pVlNbKqMT20Aj9y0UbDbdGQOLvHa1Ggyh2DX4UhUyKDYYiGvhNgCM0oUYUKYm4vTEovJDAZFgnw= 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=acNZpm2G; arc=none smtp.client-ip=209.85.214.176 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="acNZpm2G" Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-2166360285dso198127115ad.1 for ; Sun, 05 Jan 2025 18:12:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1736129520; x=1736734320; 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=wNQ3+OhGA/okuRaWCqvdwEXXhxzwpukELt61tmiGCsE=; b=acNZpm2GN9NzHdLFYh9WpphCD4XCXNkNuo74sePNC8RZJv8jglpFnAiqRpBlTK+5QN qG6FqeUf+HHQb/z7C742QqgMFrSs+cEtumsQiLU7k6NX6eesD1eQInKurqDqdmxe1Orr bETOPeGNM0NMB91bruKsnbm2hoc9lK9QAZWEDUKq6JdM4PKkTuDTe4m+liXPjVt+g2o7 ASogTAzKwRIEN8eE+uhlopZAGuEygQQOsSDUISta7m0kOId1uyFJX3mbRUXwja+wsqfx 0uY1KoFmiddHBfdGmfJihWe9SK2MPtsqWxymbxkvGkbeNjgxLaW52+f3etDYCZHULFsk iRKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736129520; x=1736734320; 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=wNQ3+OhGA/okuRaWCqvdwEXXhxzwpukELt61tmiGCsE=; b=CAOXBQPdVZInv6YwlcL3L0mEqkrU5osZWZH1beOVdc2TZeRFVzRE0jk4ljFdjaYhOS Ov41VueDU6gn64q9X2XgiZhBX6DlqXpHd2/CMr1fGY4G2XdFDyBaViPFMTr2o72MO+v0 a0q33eeb683zpDmDUIjhdq4u1d+0sbh2XNbeXx85J160d+Ddc6ZIMjQ6SyzAsZvZH8+6 QzrvZPy6OSTiXg/N0Aa0sMlrBi/soB4upM5BXFz47QHsreJ4PBFOqUgCtX4fNUwx+jNa oo1JgSnV13Hp/Uwt3hy8rllRpByMRnSS+0fVw2OK113cF6oz7RRXnQYwdZbNHxXKXzbZ YOug== X-Forwarded-Encrypted: i=1; AJvYcCUsYUFcDGrSRpl6A6fRcl3icaFH8LrYAHXmzjJb4pAD9ihD6lHtwI9xKkRBQKxy9MgJNYz7sb2Zx9jEeIs=@vger.kernel.org X-Gm-Message-State: AOJu0YwTh6v74WZG7KyF1VPIZGiJU3zjVX1uZc2h6bYyWIjdtUazotB1 gY9+3LTIBGAHo6uC85s1oUJWo2Txvh3Z8zmftSMo6NWk6lBamEWVV6tSWvNK/TA= X-Gm-Gg: ASbGncsJsSBVtDchs3Msxsww/0CdQDhL8ggG6ZBhY0hqzkQ2BzR7lsfpyM62vwoqhXi taW/bNbjXrYfZqz8LEiue12ktBiEbrrqShekwbljfFgEvEh6oWUJH20uaSSQQlD/2XeJhFcJa0G bpfMLR+6fNYaGxl/mCFAaGNBPeFNfeAjmwkcDAiRy7dLeI75d17j7NEZco0n6m39G5OCPMbQr5p rrOAu3ZA2PZjCex3QHYcrNmn/O8aETkOypmH5TspUhoX3It9VekMqICbQRd3d9y6D06mW77cFHe Clze X-Google-Smtp-Source: AGHT+IEum2NYKYJvlaXzzJeKplrYOuspfxlytqzExwVSEwDvU8NodICTE3AW+84TVD7JBcwX2dbHeQ== X-Received: by 2002:a05:6a21:8cc2:b0:1e1:adfe:c43 with SMTP id adf61e73a8af0-1e5e045874amr89051901637.9.1736129519936; Sun, 05 Jan 2025 18:11:59 -0800 (PST) Received: from localhost.localdomain ([36.110.106.149]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-72aad8dbbebsm30215336b3a.114.2025.01.05.18.11.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Jan 2025 18:11:59 -0800 (PST) From: Guo Weikang To: Catalin Marinas , Mike Rapoport , Andrew Morton Cc: Guo Weikang , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v3] mm/memmap: Prevent double scanning of memmap by kmemleak Date: Mon, 6 Jan 2025 10:11:25 +0800 Message-Id: <20250106021126.1678334-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/ v2 -> v3: Rebase on latest mm-everything and modified some minor comments. Reviewed-by: Catalin Marinas Links: https://lore.kernel.org/lkml/20250103110150.1352226-1-guoweikang.ker= nel@gmail.com/ --- include/linux/memblock.h | 4 ++++ mm/mm_init.c | 8 ++++++-- mm/sparse-vmemmap.c | 5 +++-- 3 files changed, 13 insertions(+), 4 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..2630cc30147e 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -1585,13 +1585,17 @@ void __init *memmap_alloc(phys_addr_t size, phys_ad= dr_t align, { void *ptr; =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. + */ 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..3287ebadd167 100644 --- a/mm/sparse-vmemmap.c +++ b/mm/sparse-vmemmap.c @@ -31,6 +31,8 @@ #include #include =20 +#include "internal.h" + /* * Allocate a block of memory to be used to back the virtual memory map * or to back the page tables that are used to create the mapping. @@ -42,8 +44,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