The patch titled
Subject: tools/: replace open encodings for NUMA_NO_NODE
has been added to the -mm tree. Its filename is
tools-replace-open-encodings-for-numa_no_node.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/tools-replace-open-encodings-for-numa_no_node.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/tools-replace-open-encodings-for-numa_no_node.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Subject: tools/: replace open encodings for NUMA_NO_NODE
This replaces all open encodings in tools with NUMA_NO_NODE. Also
linux/numa.h is now needed for the perf build.
Link: http://lkml.kernel.org/r/1545127933-10711-3-git-send-email-anshuman.khandual@xxxxxxx
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Signed-off-by: Anshuman Khandual <anshuman.khandual@xxxxxxx>
Cc: David Hildenbrand <david@xxxxxxxxxx>
Cc: Doug Ledford <dledford@xxxxxxxxxx> [drivers/infiniband]
Cc: Hans Verkuil <hverkuil@xxxxxxxxx>
Cc: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx> [ixgbe]
Cc: Jens Axboe <axboe@xxxxxxxxx> [mtip32xx]
Cc: Joseph Qi <jiangqi903@xxxxxxxxx>
Cc: Michael Ellerman <mpe@xxxxxxxxxxxxxx> [powerpc]
Cc: Vinod Koul <vkoul@xxxxxxxxxx> [dmaengine.c]
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
--- /dev/null
+++ a/tools/include/linux/numa.h
@@ -0,0 +1,16 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef _LINUX_NUMA_H
+#define _LINUX_NUMA_H
+
+
+#ifdef CONFIG_NODES_SHIFT
+#define NODES_SHIFT CONFIG_NODES_SHIFT
+#else
+#define NODES_SHIFT 0
+#endif
+
+#define MAX_NUMNODES (1 << NODES_SHIFT)
+
+#define NUMA_NO_NODE (-1)
+
+#endif /* _LINUX_NUMA_H */
--- a/tools/perf/bench/numa.c~tools-replace-open-encodings-for-numa_no_node
+++ a/tools/perf/bench/numa.c
@@ -298,7 +298,7 @@ static cpu_set_t bind_to_node(int target
CPU_ZERO(&mask);
- if (target_node == -1) {
+ if (target_node == NUMA_NO_NODE) {
for (cpu = 0; cpu < g->p.nr_cpus; cpu++)
CPU_SET(cpu, &mask);
} else {
@@ -339,7 +339,7 @@ static void bind_to_memnode(int node)
unsigned long nodemask;
int ret;
- if (node == -1)
+ if (node == NUMA_NO_NODE)
return;
BUG_ON(g->p.nr_nodes > (int)sizeof(nodemask)*8);
@@ -1363,7 +1363,7 @@ static void init_thread_data(void)
int cpu;
/* Allow all nodes by default: */
- td->bind_node = -1;
+ td->bind_node = NUMA_NO_NODE;
/* Allow all CPUs by default: */
CPU_ZERO(&td->bind_cpumask);
_
Patches currently in -mm which might be from sfr@xxxxxxxxxxxxxxxx are
tools-replace-open-encodings-for-numa_no_node.patch
