Received-SPF: pass (google.com: domain of linux-kernel+bounces-108102-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
Date: Tue, 19 Mar 2024 13:15:48 -0700
From: Dan Williams <dan.j.williams@intel.com>
To: Robert Richter <rrichter@amd.com>, "Rafael J. Wysocki"
	<rafael@kernel.org>, Dave Hansen <dave.hansen@linux.intel.com>, "Andy
 Lutomirski" <luto@kernel.org>, Peter Zijlstra <peterz@infradead.org>, "Thomas
 Gleixner" <tglx@linutronix.de>, Ingo Molnar <mingo@redhat.com>, "Borislav
 Petkov" <bp@alien8.de>, <x86@kernel.org>, Dan Williams
	<dan.j.williams@intel.com>, Alison Schofield <alison.schofield@intel.com>
CC: <linux-acpi@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
	<linux-cxl@vger.kernel.org>, Robert Richter <rrichter@amd.com>, Derick Marks
	<derick.w.marks@intel.com>, "H. Peter Anvin" <hpa@zytor.com>
Subject: RE: [PATCH v2 1/3] x86/numa: Fix SRAT lookup of CFMWS ranges with
 numa_fill_memblks()
Message-ID: <65f9f2741e607_7702a294f7@dwillia2-xfh.jf.intel.com.notmuch>
References: <20240319120026.2246389-1-rrichter@amd.com>
 <20240319120026.2246389-2-rrichter@amd.com>
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
In-Reply-To: <20240319120026.2246389-2-rrichter@amd.com>
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?X1YNcYlFn93d8Gg4B8B2pubNClrV9zO5ONBSPCYrFRR6Db0pKpaddhOq+0cw?=
 =?us-ascii?Q?B5b1xPLYASPzI0JJUASomJjvOr7NC3SV5qxhB/vOQJUqAvbF/mdnh/GR2Ma0?=
 =?us-ascii?Q?U+0bSJcDprCjhGHg5J6LeLlyJOYYQ6GqbZvoN4HhmTSvmDMXFjq1aKZoADFK?=
 =?us-ascii?Q?lZ/Xue9Dlgyg6t/v/fbJb3B7gG56mD+F24tOWSmkZ/+aMYX9lbpcladZwvlA?=
 =?us-ascii?Q?vf9UkRE3CXkRvvlquWOyaKl/IZ0cOCv8hROPqn5JP+O1NqUdiabBxMw81eVh?=
 =?us-ascii?Q?jOQ1/44TCneHEEGEYkfru8CerwgdsC6XFn6iUQCiJl5PhmwbRGfp8lF0suYe?=
 =?us-ascii?Q?dBNUmIwAWYr3znKYhuPB7mKZZ0gIYzrvJoEJ0m4ky9p42OybzARA69ElagrY?=
 =?us-ascii?Q?16TF8vYQW5uieVwrPXv0fxWo25L9GSnU/VETtlVo9ou2F3kJz9lTYBCCiteq?=
 =?us-ascii?Q?s0XGYLGMrdXn5AasuaGAavN57/3ZswCxfRZUhC0x06EHL+RaekO/yE6A0wQf?=
 =?us-ascii?Q?85hUyWE2VWXqmNTs1IwCj9I3Nrl0UqEG9wEC0wcdDN5j95LjbVFnB3EM75S/?=
 =?us-ascii?Q?mNMwv2AeR1WeO/4wC+HV2xaXQX84V0VZ9tb1Fvpo7U0JdmwwcNL1wOONC3Kg?=
 =?us-ascii?Q?oiqGcxB1hnJK2EBJDGwz7gfi76Ix8+jiV0oLPVy1ms+NW1sz9/r1HFWRimGe?=
 =?us-ascii?Q?WiAGuxtlem/iG2k1JXxWWcZkgI8z8K7L2AQtwKrboLvhEGLjn4tTUj9rqoLn?=
 =?us-ascii?Q?GqJftUpet68eU9M0nJ+saJ4wWNh1I+XliHVKh7COneFaJFklJn00C95dR6Cn?=
 =?us-ascii?Q?UOs1+gPY9uRUtVn92klGSaJIbQ0KiPcgUY7vocauTxDj8zdsOrvBqY/FSjsI?=
 =?us-ascii?Q?zwjYa1Rx+vgE4Dw8wzC+OZPsuneLqr0RGAx55euAskP+Y4dAF1aK6koRXLPa?=
 =?us-ascii?Q?Urnv7APXXVpXQmmR/Y5pGH6wFvdobllqUbdIalue2uGW7UXqjNvKm7D17fpX?=
 =?us-ascii?Q?0OvU4Aq1hAKshoybrufp6KJN3Rm+5rmF600zFCWYbkEWfCcFxF64kDdTiwZ6?=
 =?us-ascii?Q?SEhi9uSQHry5KKGwnyFldJkWUr0by3lkg1I+Qpz4hu6Ps1uqUpoNtO3QX1bY?=
 =?us-ascii?Q?sby1KnND+HAIgfeqD04B82ZoR3HZmQC229V4O1JOXKStGSITu7U6/X1tI/6p?=
 =?us-ascii?Q?SCtBQ1S4vxIomdpqsO+ocu67KCKmhyuvdZd0CUyfm4VA4nRDcTFVNLUmkuwH?=
 =?us-ascii?Q?sTppauSZntHQpzXZoWt+SNS2bejPA+t7REcElKeRx+x85hcaKj0ogO3JOG3u?=
 =?us-ascii?Q?EJ9WLztQQfuQxX/6sPiTAHEd3Fzx74C4VtzTJG3+iPVuZjow8gQBrvWEt4Ij?=
 =?us-ascii?Q?Lj0xS1Y1PBj8MY3Ac5K2tc1HoZ5uJ5gonJJ7tH8nsvWGYq6eqb9UKIioL7kD?=
 =?us-ascii?Q?0PyrBbTS7ZB9yJZOSv2ta0qc5fFr+MxOojHMoU+jg2pfxl7aR3Nu84bfXCEi?=
 =?us-ascii?Q?OmcKPv3IMlKYKnyyX0O8mIO9ur9LW/VN6dOGl0PXTTzk8q0V5ITs+rcXbkpU?=
 =?us-ascii?Q?XLoP/UyVCUuW79+UNe1cmYEmE0DsGvDsY3RZsL4+vT38sUQreU7T/+uyiWnM?=
 =?us-ascii?Q?7A=3D=3D?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 9af34b62-48e4-4e4d-1012-08dc48515f48
X-MS-Exchange-CrossTenant-AuthSource: PH8PR11MB8107.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Mar 2024 20:15:50.9153
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: a/Z2gaJMznAJCBiJgLFR87Fixh8kbkxUa2Rp8MUrJAG6SI7EfSgaVDa2aC2rH9inqxTzmlZRICNnc2DGvhWMhuIm/GS7jzrOyNZ9rfhfk10=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR11MB6133
X-OriginatorOrg: intel.com

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.
> 
> [1] 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/mm/numa.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
> index 65e9a6e391c0..ce84ba86e69e 100644
> --- a/arch/x86/mm/numa.c
> +++ b/arch/x86/mm/numa.c
> @@ -929,6 +929,8 @@ int memory_add_physaddr_to_nid(u64 start)
>  }
>  EXPORT_SYMBOL_GPL(memory_add_physaddr_to_nid);
>  
> +#endif
> +
>  static int __init cmp_memblk(const void *a, const void *b)
>  {
>  	const struct numa_memblk *ma = *(const struct numa_memblk **)a;
> @@ -1001,5 +1003,3 @@ int __init numa_fill_memblks(u64 start, u64 end)
>  	}
>  	return 0;
>  }
> -
> -#endif

Does this achieve the goal without an additional hunk like this?

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
-#endif
 #endif /* __ASSEMBLY__ */
 
 #endif /* _ASM_X86_SPARSEMEM_H */