[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH v6 3/6] xen/x86: Use ASSERT instead of VIRTUAL_BUG_ON for phys_to_nid


  • To: <xen-devel@xxxxxxxxxxxxxxxxxxxx>
  • From: Wei Chen <wei.chen@xxxxxxx>
  • Date: Tue, 11 Oct 2022 19:17:05 +0800
  • Arc-authentication-results: i=2; mx.microsoft.com 1; spf=pass (sender ip is 63.35.35.123) smtp.rcpttodomain=lists.xenproject.org smtp.mailfrom=arm.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com; arc=pass (0 oda=1 ltdi=1 spf=[1,1,smtp.mailfrom=arm.com] dmarc=[1,1,header.from=arm.com])
  • Arc-authentication-results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 40.67.248.234) smtp.rcpttodomain=lists.xenproject.org smtp.mailfrom=arm.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=arm.com; dkim=none (message not signed); arc=none
  • Arc-message-signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=2Yk9pOwOqX2MUuUQPvSNQCJe5TGtYxGC6yPWBHHiZQQ=; b=oEb6nNLMC05WVXGSxwPAKk8gfuG1+TTxI5mgrdFMdfrJx1PjszU9R+tE0dmjw4DvdzOhC0JpFfPVr8P4AeXhxITeewUNiMd6VW4BsUp8/ByYkzwtZTeeCPI2yPX2ajeZj3FRZTRVmSTzw8YO6NzLVlR2oTdRc3GbM4pmoWhxMeLbfpuB0LssdBqYRlIiI2l6x9tduKjfnhASKIPRRosv0rs5HcDAU82LRYOeajfIRfFSGy775QqT/lUZO1qr/0F9wkCSUDNMo7YCQGJKvtaARU/ur8QYKxOQL9ZpVTEROlviKweEMIsirYLiv2mdPejbGMcJvSl29rn3IYPM+p6Cfw==
  • Arc-message-signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=2Yk9pOwOqX2MUuUQPvSNQCJe5TGtYxGC6yPWBHHiZQQ=; b=HABZqJHTowppUIVZzxktdqnV1OJwgXW5J8emMRdMEhYylA4i/6QLlJhd0b7j45DnCEwqh/Ze/kpqAP2XL+S4l3gdInlnCuSTftqldzCtjMY+7N778xOwKnf6DPJvSgBY2V2kgE0BXmF7r16dGTODhjm6+v/BEOHP53MtIMZN6JdNFrK4CA2LBZUAWIUkUQZkFDNcR0lE+ENKt+PI3abjX5V+cg9/+4zf+Fq2kL+JKtZmRqeymTosEmQHV+VRhjVAt5E09xDndzTEg6EEpO89exQKU40FHPSboW1tQoWCY3qFLHjO15eKumgFvmP/qXeRew7dYpaA11FEPCMtzI4IHg==
  • Arc-seal: i=2; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=pass; b=kriEdOG+ocz57Bm3EsrWwvRu6Nt01latUYW5rC1oMkgB3kGRxP9WOhb/mE7fw8QPdQ/a0b9sjUY1fhyPXtRRB2VwYGt/cGEqDipzAScS6C9KM/5f74MxBgTC080AnQ21rs6dDF8SQtYo3J9ipEU9fsoBNkP8Nqh82ShODTOU06dYHJ15iZ3EPBB1Dp4FnUtcYrZvpjz2Cim37KP3YZq2sYo1+RNpC5MSAcwZVP7wQXD0oi09Bd1ekO5yHYRVxaWkDJc65/IenJBocEuXKahgipxRN510TNL1qj2dccsQsnsq14GikArc3sFFtE/kJLmoDZ4hjaXi0hOJdPuSUTxSoA==
  • Arc-seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MZXTZXRv5BrCFJd5SQ3RwkIyBkjH7yQuK3V3bbdtsFOXQe7PYZDKV5/nwQ6abrhDF7UKjVkIJwZF9wXdap7oUXnFJawZOM8Z5vqOPZLLSLW6vB6WmyNouuEumJNeYQsWbVneTMvZqLNLqclui1qfJ4oUvy3eTIWjXGqsGV4rCFOI30TBN8yM65iL0SzNnBt7xsGLaYJxVSKcRuRtC+Sd5MhYpxodlrVfnGk5gpuXdnDtxPa0Bp2NgFH7ANJS9jcz+Y3dA7OGnVloRAuLvfjub5MPdA0macfT7ur1NKRmwENJYh+PB1avtp35RtTmcnhhE/CgGdbftC9bc419D/AwFw==
  • Cc: <nd@xxxxxxx>, Wei Chen <wei.chen@xxxxxxx>, Andrew Cooper <andrew.cooper3@xxxxxxxxxx>, George Dunlap <george.dunlap@xxxxxxxxxx>, "Jan Beulich" <jbeulich@xxxxxxxx>, Julien Grall <julien@xxxxxxx>, "Stefano Stabellini" <sstabellini@xxxxxxxxxx>, Wei Liu <wl@xxxxxxx>, Jiamei Xie <jiamei.xie@xxxxxxx>
  • Delivery-date: Tue, 11 Oct 2022 11:17:54 +0000
  • List-id: Xen developer discussion <xen-devel.lists.xenproject.org>
  • Nodisclaimer: true

VIRTUAL_BUG_ON is an empty macro used in phys_to_nid. This
results in two lines of error-checking code in phys_to_nid
that is not actually working and causing two compilation
errors:
1. error: "MAX_NUMNODES" undeclared (first use in this function).
   This is because in the common header file, "MAX_NUMNODES" is
   defined after the common header file includes the ARCH header
   file, where phys_to_nid has attempted to use "MAX_NUMNODES".
   This error was resolved after we moved the phys_to_nid from
   x86 ARCH header file to common header file.
2. error: wrong type argument to unary exclamation mark.
   This is because, the error-checking code contains !node_data[nid].
   But node_data is a data structure variable, it's not a pointer.

So, in this patch, we use ASSERT instead of VIRTUAL_BUG_ON to
enable the two lines of error-checking code. And fix the left
compilation errors by replacing !node_data[nid] to
!node_data[nid].node_spanned_pages. Although NUMA allows one node
can only have CPUs but without any memory. And node with 0 bytes
of memory might have an entry in memnodemap[] theoretically. But
that doesn't mean phys_to_nid can find any valid address from a
node with 0 bytes memory.

Signed-off-by: Wei Chen <wei.chen@xxxxxxx>
Tested-by: Jiamei Xie <jiamei.xie@xxxxxxx>
Acked-by: Jan Beulich <jbeulich@xxxxxxxx>
---
v5 -> v6:
1. No Change.
v4 -> v5:
1. No change.
v3 -> v4:
1. No change.
v2 -> v3:
1. Remove unnecessary change items in history.
2. Add Acked-by.
v1 -> v2:
1. Use ASSERT to replace VIRTUAL_BUG_ON in phys_to_nid.
2. Adjust the conditional express for ASSERT.
3. Refine the justification of using !node_data[nid].node_spanned_pages.
---
 xen/include/xen/numa.h | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/xen/include/xen/numa.h b/xen/include/xen/numa.h
index 5b3877344b..04556f3a6f 100644
--- a/xen/include/xen/numa.h
+++ b/xen/include/xen/numa.h
@@ -35,8 +35,6 @@ struct node {
 extern int compute_hash_shift(const struct node *nodes,
                               unsigned int numnodes, const nodeid_t *nodeids);
 
-#define VIRTUAL_BUG_ON(x)
-
 extern bool numa_off;
 
 extern void numa_add_cpu(unsigned int cpu);
@@ -69,9 +67,9 @@ extern struct node_data node_data[];
 static inline nodeid_t __attribute_pure__ phys_to_nid(paddr_t addr)
 {
     nodeid_t nid;
-    VIRTUAL_BUG_ON((paddr_to_pdx(addr) >> memnode_shift) >= memnodemapsize);
+    ASSERT((paddr_to_pdx(addr) >> memnode_shift) < memnodemapsize);
     nid = memnodemap[paddr_to_pdx(addr) >> memnode_shift];
-    VIRTUAL_BUG_ON(nid >= MAX_NUMNODES || !node_data[nid]);
+    ASSERT(nid < MAX_NUMNODES && node_data[nid].node_spanned_pages);
     return nid;
 }
 
-- 
2.25.1




 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.