Received-SPF: pass (google.com: domain of linux-kernel+bounces-157232-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
Date: Wed, 24 Apr 2024 17:41:19 +0200
From: Robert Richter <rrichter@amd.com>
To: Dan Williams <dan.j.williams@intel.com>
Cc: "Rafael J. Wysocki" <rafael@kernel.org>,
	Thomas Gleixner <tglx@linutronix.de>,
	Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
	Dave Hansen <dave.hansen@linux.intel.com>, x86@kernel.org,
	Andy Lutomirski <luto@kernel.org>,
	Peter Zijlstra <peterz@infradead.org>,
	Alison Schofield <alison.schofield@intel.com>,
	linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org,
	linux-cxl@vger.kernel.org, Derick Marks <derick.w.marks@intel.com>,
	"H. Peter Anvin" <hpa@zytor.com>
Subject: Re: [PATCH v3 1/5] x86/numa: Fix SRAT lookup of CFMWS ranges with
 numa_fill_memblks()
Message-ID: <ZikoH0zIOEGtw2Mc@rric.localdomain>
References: <20240419140203.1996635-1-rrichter@amd.com>
 <20240419140203.1996635-2-rrichter@amd.com>
 <66271b0072317_69102944c@dwillia2-xfh.jf.intel.com.notmuch>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <66271b0072317_69102944c@dwillia2-xfh.jf.intel.com.notmuch>
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?us-ascii?Q?gG0/TDn9Xo//dRuFh7n71+qKqAV19Rh+AFFHXfCOFJexd7lU5UP5keQ53gZS?=
 =?us-ascii?Q?9D47ODwjDo+wJWi9Wo59xrQDbMJwOrmVtcBgjck+XrkVt1w0WZvsq6rO3flZ?=
 =?us-ascii?Q?W+ojNRruLeQjuHJeYPFsPK5rdeNVqglpkNnWUB8Yc2mHTocrbYCTJ7f3kMGp?=
 =?us-ascii?Q?Nj0jTnasMnqRx1FpZHrxCFpo4Ur1SYjGwju/0T6ZUpcrvyX9GaK7VjxKiiuJ?=
 =?us-ascii?Q?SdJkYMJoAA6K0WtSD7ZhFoiOLYQZxzOinr77KGSd1mKPM35WH7plYiw/lfgK?=
 =?us-ascii?Q?rdOKpbXYUpDhqE5WhG8o60H7NBGbAs+FRlNuwJCCEYW9ApyKxfx3DAwOsnOW?=
 =?us-ascii?Q?u0CVZk/bGuSBQL0X00PHEegDWgEwH0GONyT8q044j/kN2iEO1883noGIJWcR?=
 =?us-ascii?Q?6VCZlioJnq2uWmWAT//6zndCjw2YRgO18qvNLNdzd+et4vAOGMNm7wNbkquW?=
 =?us-ascii?Q?JRTKcAXJ5TLFrwXnEbBgMqz1z1lJxRGV27zj+GCXpMvuP7RXEz3M4XdVGvzc?=
 =?us-ascii?Q?4UI1IbL7C1nTdLzszpx+izXi2dmn5zK43vTreOQv47hYYlpKDRHlDm/JCjJt?=
 =?us-ascii?Q?eGx3Fs4A0tkQDA63HwjI2OI837cgHOpt6nya6lAW7YBceSG/qxb3hkG7QQox?=
 =?us-ascii?Q?q7mR+km1vbO08NGJRDFog48VtlXNh+9Vj4hh6MRJh3U5tihpcu46Vn0VxaeS?=
 =?us-ascii?Q?jq5JLBLLYtL33SnJE7v96U8VEtE1CS+oNYkKoq8vXJ6p4uC2OH135a0stQQx?=
 =?us-ascii?Q?ItFLBaEqapmAV5vrT8jrWRJg8GhSc7mLvc93MUoUrrKeYsYgUK2WTJCjvQjA?=
 =?us-ascii?Q?BR6FHulklqbHNzM7lrJzW5eq7kXI8OlQZ8llPN4LtDdcgtMSlMEe5iS42pE7?=
 =?us-ascii?Q?QO4KwN9XOGjM/DiUqtJZcb8V3WhJrPzxuMWW2yPQwVg4tLn7pTKnH/z97Ahm?=
 =?us-ascii?Q?DO+aW147yCvDx7lkfn7NvFDXNu4FWG5F7GdQaGXpORl2F3yOEgqLFtBFqiLM?=
 =?us-ascii?Q?yA9ymFIrTxmjirSpMevNCH/A+xzA0P5U5j0qzE26YY8kNzmS1ZTxyqyaPr2m?=
 =?us-ascii?Q?/YC8zFHqrOLWW9aE78Aa+e/HWIypLOT6DiHTgZcloKuN6l0WdeM9Rx7O2NHs?=
 =?us-ascii?Q?+0ydSs8LdUHwPxFof4PjDeEGSwx662QIbdOIB4lpbm6HiEf2fS59LcIAxg3Y?=
 =?us-ascii?Q?BpxJ0oPQzO6x8SFCEYw5z9KUE5CAN398ffvd52FSdSwvLOpSP9aXubvTey0M?=
 =?us-ascii?Q?27gsPdbxO9VR7Z/tTVpmNlsaEtZjhxOyL23e+zt2EUbs/ze5dsBvKfQ9u53O?=
 =?us-ascii?Q?AQ+AgOD13L3qNsK8gI+mvBWrbmnXlmtniL27pdfhO51D8mKXxmw4wx3HlUiT?=
 =?us-ascii?Q?2w6ycRFLhQrgrfnRsVoWGKRlCOp8I9m/PF7rBk8Oq8sWBtA3+2iNlPBZ0v+3?=
 =?us-ascii?Q?ck/egCKcIc720ciM6q5CKgiUzJ1uVNZJq/eeJDgm/EYrV6qBjSqcYFzwNJdy?=
 =?us-ascii?Q?BxqNx6yxDW02OAoEXsXKfz+Xp1guP6uHAV3fMyide08st3cHMC/bo3Aiouv2?=
 =?us-ascii?Q?94HgyknUtlBx58sT7DDNgYn45D+DeDOlpm9Ok2Ok?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 37468764-21ed-4f20-b0a4-08dc647500df
X-MS-Exchange-CrossTenant-AuthSource: CYYPR12MB8750.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Apr 2024 15:41:26.9982
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: XTfAfGzHzry7qisnLMKQi5lC4oS1l6SrKR4IR0V8pgt6HEBuKB9/MplHQRlusfXDs5ODrWJhmSinDp0NL2WgPQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ1PR12MB6265

On 22.04.24 19:20:48, Dan Williams wrote:
> Robert Richter wrote:
> > For configurations that have the kconfig option NUMA_KEEP_MEMINFO
> > disabled, the SRAT lookup done with numa_fill_memblks() fails
> > returning NUMA_NO_MEMBLK (-1). An existing SRAT memory range cannot be
> > found for a CFMWS address range. This causes the addition of a
> > duplicate numa_memblk with a different node id and a subsequent page
> > fault and kernel crash during boot.
> > 
> > numa_fill_memblks() is implemented and used in the init section only.
> > The option NUMA_KEEP_MEMINFO is only for the case when NUMA data will
> > be used outside of init. So fix the SRAT lookup by moving
> > numa_fill_memblks() out of the NUMA_KEEP_MEMINFO block to make it
> > always available in the init section.
> > 
> > Note that the issue was initially introduced with [1]. But since
> > phys_to_target_node() was originally used that returned the valid node
> > 0, an additional numa_memblk was not added. Though, the node id was
> > wrong too.
> 
> Wrong node seems worth notifying and we can figure out on the backend
> where the backport makes sense.

Updating the description here.

> 
> > 
> > [1] commit fd49f99c1809 ("ACPI: NUMA: Add a node and memblk for each
> >     CFMWS not in SRAT")
> > 
> > Fixes: 8f1004679987 ("ACPI/NUMA: Apply SRAT proximity domain to entire CFMWS window")
> > Cc: Derick Marks <derick.w.marks@intel.com>
> > Cc: Dan Williams <dan.j.williams@intel.com>
> > Cc: Alison Schofield <alison.schofield@intel.com>
> > Signed-off-by: Robert Richter <rrichter@amd.com>
> > ---
> >  arch/x86/include/asm/sparsemem.h | 2 +-
> >  arch/x86/mm/numa.c               | 4 ++--
> >  2 files changed, 3 insertions(+), 3 deletions(-)
> > 
> > diff --git a/arch/x86/include/asm/sparsemem.h b/arch/x86/include/asm/sparsemem.h
> > index 1be13b2dfe8b..1aaa447ef24b 100644
> > --- a/arch/x86/include/asm/sparsemem.h
> > +++ b/arch/x86/include/asm/sparsemem.h
> > @@ -37,9 +37,9 @@ extern int phys_to_target_node(phys_addr_t start);
> >  #define phys_to_target_node phys_to_target_node
> >  extern int memory_add_physaddr_to_nid(u64 start);
> >  #define memory_add_physaddr_to_nid memory_add_physaddr_to_nid
> > +#endif
> >  extern int numa_fill_memblks(u64 start, u64 end);
> >  #define numa_fill_memblks numa_fill_memblks
> 
> It just feels like numa_fill_memblks() has absolutely no business being
> defined in arch/x86/include/asm/sparsemem.h.
> 
> The only use for numa_fill_memblks() is to arrange for NUMA nodes to be
> applied to memory ranges hot-onlined by the CXL driver.
> 
> It belongs right next to numa_add_memblk(), and I suspect
> arch/x86/include/asm/sparsemem.h was only chosen to avoid figuring out
> what to do about the fact that linux/numa.h does not include asm/numa.h
> and that all implementations either provide numa_add_memblk() or select
> the generic implementation.
> 
> So I would prefer that this do the proper fix and get
> numa_fill_memblks() completely out of the sparsemem.h path.
> 
> Something like the following which boots for me:

I have kept this patch as a stable change but took your patch on top.

Thanks,

-Robert