diff options
authorZhen Lei <>2017-10-13 15:57:50 -0700
committerLinus Torvalds <>2017-10-13 16:18:32 -0700
commit064f0e9302af4f4ab5e9dca03a5a77d6bebfd35e (patch)
parentaf0db981f35ea99b00a0b249bf0bedef8cf972e8 (diff)
mm: only display online cpus of the numa node
When I execute numactl -H (which reads /sys/devices/system/node/nodeX/cpumap and displays cpumask_of_node for each node), I get different result on X86 and arm64. For each numa node, the former only displayed online CPUs, and the latter displayed all possible CPUs. Unfortunately, both Linux documentation and numactl manual have not described it clear. I sent a mail to ask for help, and Michal Hocko replied that he preferred to print online cpus because it doesn't really make much sense to bind anything on offline nodes. Will said: "I suspect the vast majority (if not all) code that reads this file was developed for x86, so having the same behaviour for arm64 sounds like something we should do ASAP before people try to special case with things like #ifdef __aarch64__. I'd rather have this in 4.14 if possible." Link: Signed-off-by: Zhen Lei <> Acked-by: Michal Hocko <> Cc: Catalin Marinas <> Cc: Will Deacon <> Cc: Greg Kroah-Hartman <> Cc: Tianhong Ding <> Cc: Hanjun Guo <> Cc: Libin <> Cc: Kefeng Wang <> Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/base/node.c b/drivers/base/node.c
index 3855902f2c5b..aae2402f3791 100644
--- a/drivers/base/node.c
+++ b/drivers/base/node.c
@@ -27,13 +27,21 @@ static struct bus_type node_subsys = {
static ssize_t node_read_cpumap(struct device *dev, bool list, char *buf)
+ ssize_t n;
+ cpumask_var_t mask;
struct node *node_dev = to_node(dev);
- const struct cpumask *mask = cpumask_of_node(node_dev->;
/* 2008/04/07: buf currently PAGE_SIZE, need 9 chars per 32 bits. */
- return cpumap_print_to_pagebuf(list, buf, mask);
+ if (!alloc_cpumask_var(&mask, GFP_KERNEL))
+ return 0;
+ cpumask_and(mask, cpumask_of_node(node_dev->, cpu_online_mask);
+ n = cpumap_print_to_pagebuf(list, buf, mask);
+ free_cpumask_var(mask);
+ return n;
static inline ssize_t node_read_cpumask(struct device *dev,