[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH for-4.22 v2 3/5] xen/numa: prepare NUMA setup code for unit testing
- To: xen-devel@xxxxxxxxxxxxxxxxxxxx
- From: Roger Pau Monne <roger.pau@xxxxxxxxxx>
- Date: Wed, 3 Jun 2026 21:18:34 +0200
- Arc-authentication-results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=citrix.com; dmarc=pass action=none header.from=citrix.com; dkim=pass header.d=citrix.com; arc=none
- Arc-message-signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=PAog/pzcyLlB711VQLeJLXsjxkMQopNDsvcdKsXahBg=; b=sWaj9vhFJwpS8iCicbu4t2OJ2G49JFCdDmO0gljajEQUdGZzJA5w0cu/lABXo+wu3Pk1meGm+lOala/Ap1vZr8XC3PGNUbqgt/ert9VaACdTwrS9w+80I4fRuWXkkqa3QTVvzHhmQOXTFGGm8Be0DtrhpzHMSPF+t+13PsEiJTQyUKJFA7646O/S+HiE6cONBHBBQngNKMan4eKoEDvjz1gsoSufkEKYK4f7skm3aXT1+ESFs20hP6iKiNVthaLckIjS6oxhmb8/oUBZuBaRT+IQEjhn99MXlaeOLUYdfTHn04oNkeWjGKc09OZtjvtiquzSEXrNG/BZKbnwj8sW9w==
- Arc-seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=wIpoNdjtSYPqpDU6OFisPUvCUqXuB9Uc0t47MwIqKigkVC71v7RmY9N1sQ+MtrTqWM6p6oTmIpPSAtXb7WSPFDNhAqrjCOJ1Qdg2yU7nAGOs/A5Rh8DK4bg6QNiM0UI1DL+Tsbo48yc4jFpEIwVA6OmwX8SJoyIW+4CaafogUda0+w22vqN0PTxwh/8X2Gzk/MvFl7eY5rPQOibcCdTTMt7KLOqDZcGbxWIi3rvktGxBk3A9HF7IdRtPHM8efYJU2yf4C8UoB03Vkj4rpLGllB5YyNiEYP4mGOKDI0l1EgZoumJIDA4ryrD/ruc/DgGj23UkE976agxy9Ri3xTMlqQ==
- Authentication-results: eu.smtp.expurgate.cloud; dkim=pass header.s=selector1 header.d=citrix.com header.i="@citrix.com" header.h="From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck"
- Authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=citrix.com;
- Cc: Roger Pau Monne <roger.pau@xxxxxxxxxx>, Andrew Cooper <andrew.cooper3@xxxxxxxxxx>, Anthony PERARD <anthony.perard@xxxxxxxxxx>, Michal Orzel <michal.orzel@xxxxxxx>, Jan Beulich <jbeulich@xxxxxxxx>, Julien Grall <julien@xxxxxxx>, Stefano Stabellini <sstabellini@xxxxxxxxxx>
- Delivery-date: Wed, 03 Jun 2026 19:19:11 +0000
- List-id: Xen developer discussion <xen-devel.lists.xenproject.org>
Introduce __XEN__ guards to differentiate between hypervisor vs unit test
builds. Also move numa_set_node() so it's outside the __XEN__ guards. No
functional change intended.
Signed-off-by: Roger Pau Monné <roger.pau@xxxxxxxxxx>
Acked-by: Jan Beulich <jbeulich@xxxxxxxx>
---
xen/common/numa.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/xen/common/numa.c b/xen/common/numa.c
index ad75955a1622..8544a1598218 100644
--- a/xen/common/numa.c
+++ b/xen/common/numa.c
@@ -4,6 +4,7 @@
* Adapted for Xen: Ryan Harper <ryanh@xxxxxxxxxx>
*/
+#ifdef __XEN__
#include <xen/init.h>
#include <xen/keyhandler.h>
#include <xen/mm.h>
@@ -13,6 +14,7 @@
#include <xen/pfn.h>
#include <xen/sched.h>
#include <xen/softirq.h>
+#endif /* __XEN__ */
static nodemask_t __initdata processor_nodes_parsed;
static nodemask_t __initdata memory_nodes_parsed;
@@ -561,6 +563,12 @@ void __init numa_init_array(void)
}
}
+void numa_set_node(unsigned int cpu, nodeid_t node)
+{
+ cpu_to_node[cpu] = node;
+}
+
+#ifdef __XEN__
#ifdef CONFIG_NUMA_EMU
static unsigned int __initdata numa_fake;
@@ -661,11 +669,6 @@ void numa_add_cpu(unsigned int cpu)
cpumask_set_cpu(cpu, &node_to_cpumask[cpu_to_node(cpu)]);
}
-void numa_set_node(unsigned int cpu, nodeid_t node)
-{
- cpu_to_node[cpu] = node;
-}
-
/* [numa=off] */
static int __init cf_check numa_setup(const char *opt)
{
@@ -830,3 +833,4 @@ static int __init cf_check register_numa_trigger(void)
return 0;
}
__initcall(register_numa_trigger);
+#endif /* __XEN__ */
--
2.53.0
|
