From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 74178CDB482 for ; Tue, 17 Oct 2023 06:22:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B93518002C; Tue, 17 Oct 2023 02:22:38 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B18EB80007; Tue, 17 Oct 2023 02:22:38 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9B9E38002C; Tue, 17 Oct 2023 02:22:38 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 897C780007 for ; Tue, 17 Oct 2023 02:22:38 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 507F240E98 for ; Tue, 17 Oct 2023 06:22:38 +0000 (UTC) X-FDA: 81353959596.03.4E7FA32 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by imf01.hostedemail.com (Postfix) with ESMTP id 1332C40005 for ; Tue, 17 Oct 2023 06:22:34 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=tbROSQ8M; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf01.hostedemail.com: domain of rppt@kernel.org designates 145.40.73.55 as permitted sender) smtp.mailfrom=rppt@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1697523755; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:references:dkim-signature; bh=I/Ia7Iy79O6x1xJcJz+bzkC2pST1qtfKo8QAZidj3qw=; b=jKTTwFq8soohZQFRcB+pGGq0oFmuR+vHH2X4ldj2GvCj8tsnK3DnlZXKayEn0RlJqSWpbS 5gB2sXzEOEBEgdMP67ln34BDTuY3oJcI0dpxlpD9i/qAsMrJNqf8+AeXUcA9dtRwowcnl0 bzdOB5f/On8jmMGTbIdAnoOPuiBTda0= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=tbROSQ8M; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf01.hostedemail.com: domain of rppt@kernel.org designates 145.40.73.55 as permitted sender) smtp.mailfrom=rppt@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1697523755; a=rsa-sha256; cv=none; b=NHLdte10gHOMGSXFFPw+pwOrMMX33InOBe+YNI7kRyFDgn9lO6fsxo0LxxkjzeDOLaRWnB L8Bzc5EEPM14IlX+9MxLHdt50PMeLck0lAKIbbW1v+eIYm2DF4ivXjkwQkA5IvtuHT588q wu2q1INEHTHIb3uHPG1NPE5+z1I6Jgw= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 765DDCE1C93; Tue, 17 Oct 2023 06:22:30 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 45F6FC433C8; Tue, 17 Oct 2023 06:22:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1697523749; bh=PjgXcsl4PXsm9VaDRSYsui/J+fCpjosNZ6QzsEtjF5s=; h=From:To:Cc:Subject:Date:From; b=tbROSQ8Mb5+Da2QkZxiCTzzbNxulSkjJ/GkAQ/4HEjtDWeuXFrSaJBvb2CA7LIbLC mrvXK0bD9l2kXPGxlVrtqGy4XfUhaALZlZfRuVyl6/YSdsitWH2z9jeGt1w1pxZx+O T89d0+n16F8e4q4lHW4YU0dwkrb9X0VWhIQe/X2X+P37xAob5BHsEidzZLZo+dQqG0 RJip3Fckh32Wm5mti8XWbTDG6g23ehhePVf+ghU5Zk08lcCdrcXRG+QHmZ1UpSlwC0 cC2O+NOPgiLM5XzLL7t/YngCJKH8jzsdUUIH2+abQCwSVlLoAvQo+rM5sR+vd5eqM9 I17Ssw+IWgxow== From: Mike Rapoport To: x86@kernel.org Cc: Andrew Morton , Andy Lutomirski , Borislav Petkov , Dave Hansen , David Hildenbrand , "H. Peter Anvin" , Ingo Molnar , Michal Hocko , Mike Rapoport , Peter Zijlstra , Qi Zheng , Thomas Gleixner , linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH] x86/mm: drop 4MB restriction on minimal NUMA node size Date: Tue, 17 Oct 2023 09:22:15 +0300 Message-Id: <20231017062215.171670-1-rppt@kernel.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 1332C40005 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: 8ka9rmrzjhqpeqwnpetjkryfntx8mfa6 X-HE-Tag: 1697523754-144315 X-HE-Meta: U2FsdGVkX18W85Ugx/fTVapb7fFBNOaBdx0qmRcYVhoUahGRlbmipOAixQt9L3evrtKoHHM4eVWgE9rKLWt3+dMoI65ZZVHLwlRSljUDnMpbWKwpaw2MKGOkjhZIeGkuiAKp15FDakfKd4ASGH1XDxriocnGtKs1WrL8BulK/UapuyQ+o+o9mifDYpzt1oJ4fqdfZKekB/zWG7XT25D4wvBKdNsOmynWcXP4tMI1GCdg8Jjeq4+ir074qvwIEsd47gQIsieUwW3Dollp5k0S4VeRublhxpGNrrtdNMvem6BaqUSsoRp86VtA3s5/MsRRa1IVGvuWvJ2qD3Xr84xNLAq1b7n2vv7y8zT4fvUP8yEp4A8i5JmW+I3UFR3RcRbiSbAl5GP25vEb31MKUOhSWZPVZkXcFS5V1aPgNwNpqm2FlbHaNpbMpnOAhSSosR+r/S6Giriqe8ozwEWxEAsvFdRkpcHN3x8naQim+9PHqRqqwqaLtyTYtwVWTIt5mr5p+t1+nkW1tOHi6Acc2w4d1T/iwLchOGmvyLLpoNae0cy8hc8YPzttTPJDEbu69gTYJ1eCXNPeybUA88H/xQr5c4kqaTouUCgiP7S8kjQh7QJTJ3iKCNsWvLcjy0QjmU+tW6rqfXG+PBdNfuLoZrDfM5fBR/BULPqEOQiY0tCwFR6VHSq52yZEU+aiRkLKZzzqoEm8/+EoobS1tzwYvSumsMF/qzgPUahTWCkhkRoJZgndizN510g9sITEwBXxAnOdQy9KenAqZ2N26PolL2vPD4wt2/xKOkg5dljWTLPTrP2T1RioOES1ewVk5NsL9ucPooYqPUDH7PK5tekZpAcVT46eGu8CaDbY3yQW6vE7nh7FU5qvVxGj4jw++BhVK8HmlDresUcPYNjX2MHL8KOXD/DGIgJT/UHT8UGGLb7UjxWDJVVPvzkSwKMeR/PWYqU3hlMnwPjdPFFpsmoFnT6 nZQ27Riv MbijF5kq4YvZ4LIwOrNkfZsJ6lzg+pp4WHIFi0ycxo0k4qKvCmyMjCgDT8VdL51wyzgjmhprB4zkGyyx51WBk2qsSXCyf/WkZxDn/5M+Mdy39iiN2Yi5aAxUeDVnwg5e0vQCzkAwzKhWyNEiW4e2eIo1uypNvSLK2uR3yLBI2Z5paPTj/tzJ7kLosCJnX7/qAithv+2gC4WvVKiSTi6G2j8bOFeCNpvDG+mqibSfqv5Z897MbxSHsp/lvDBCpcMpNQ1cACysPfNwbrbDMJd6nRSyULS0Qo2bE+zwRo08NAzJbdA1IH7EkZ7a2edsQjMVR2Ode/rsH1myRYAcXFcvtkI+lBHohyciLbpwPS2QgA7GWFGc9ybYn6tdZuSS8L8I5wEq6 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: "Mike Rapoport (IBM)" Qi Zheng reports crashes in a production environment and provides a simplified example as a reproducer: For example, if we use qemu to start a two NUMA node kernel, one of the nodes has 2M memory (less than NODE_MIN_SIZE), and the other node has 2G, then we will encounter the following panic: [ 0.149844] BUG: kernel NULL pointer dereference, address: 0000000000000000 [ 0.150783] #PF: supervisor write access in kernel mode [ 0.151488] #PF: error_code(0x0002) - not-present page <...> [ 0.156056] RIP: 0010:_raw_spin_lock_irqsave+0x22/0x40 <...> [ 0.169781] Call Trace: [ 0.170159] [ 0.170448] deactivate_slab+0x187/0x3c0 [ 0.171031] ? bootstrap+0x1b/0x10e [ 0.171559] ? preempt_count_sub+0x9/0xa0 [ 0.172145] ? kmem_cache_alloc+0x12c/0x440 [ 0.172735] ? bootstrap+0x1b/0x10e [ 0.173236] bootstrap+0x6b/0x10e [ 0.173720] kmem_cache_init+0x10a/0x188 [ 0.174240] start_kernel+0x415/0x6ac [ 0.174738] secondary_startup_64_no_verify+0xe0/0xeb [ 0.175417] [ 0.175713] Modules linked in: [ 0.176117] CR2: 0000000000000000 The crashes happen because of inconsistency between nodemask that has nodes with less than 4MB as memoryless and the actual memory fed into core mm. The commit 9391a3f9c7f1 ("[PATCH] x86_64: Clear more state when ignoring empty node in SRAT parsing") that introduced minimal size of a NUMA node does not explain why a node size cannot be less than 4MB and what boot failures this restriction might fix. Since then a lot has changed and core mm won't confuse badly about small node sizes. Drop the limitation for the minimal node size. Reported-by: Qi Zheng Signed-off-by: Mike Rapoport (IBM) Acked-by: David Hildenbrand Acked-by: Michal Hocko Link: https://lore.kernel.org/all/20230212110305.93670-1-zhengqi.arch@bytedance.com/ --- arch/x86/include/asm/numa.h | 7 ------- arch/x86/mm/numa.c | 7 ------- 2 files changed, 14 deletions(-) diff --git a/arch/x86/include/asm/numa.h b/arch/x86/include/asm/numa.h index e3bae2b60a0d..ef2844d69173 100644 --- a/arch/x86/include/asm/numa.h +++ b/arch/x86/include/asm/numa.h @@ -12,13 +12,6 @@ #define NR_NODE_MEMBLKS (MAX_NUMNODES*2) -/* - * Too small node sizes may confuse the VM badly. Usually they - * result from BIOS bugs. So dont recognize nodes as standalone - * NUMA entities that have less than this amount of RAM listed: - */ -#define NODE_MIN_SIZE (4*1024*1024) - extern int numa_off; /* diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c index 2aadb2019b4f..55e3d895f15c 100644 --- a/arch/x86/mm/numa.c +++ b/arch/x86/mm/numa.c @@ -601,13 +601,6 @@ static int __init numa_register_memblks(struct numa_meminfo *mi) if (start >= end) continue; - /* - * Don't confuse VM with a node that doesn't have the - * minimum amount of memory: - */ - if (end && (end - start) < NODE_MIN_SIZE) - continue; - alloc_node_data(nid); } base-commit: 94f6f0550c625fab1f373bb86a6669b45e9748b3 -- 2.39.2