提交 6d1c9cd3 编写于 作者: H Hui Tang 提交者: Zhong Jinghua

sched: programmable: Fix build error for nr_cpus_ids

hulk inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I645C7
CVE: NA

--------------------------------

When !CONFIG_SMP && CONFIG_BPF_SCHED, it will build error, as follows:

./include/linux/cpumask.h:37:33: error: expected identifier or ‘(’ before numeric constant
   37 | #define nr_cpu_ids              1U
      |                                 ^~
./include/linux/bpf_topology.h:39:22: note: in expansion of macro ‘nr_cpu_ids’
   39 |         unsigned int nr_cpu_ids;
      |                      ^~~~~~~~~~
kernel/sched/bpf_topology.c: In function ‘____bpf_get_cpumask_info’:
./include/linux/cpumask.h:37:33: error: expected identifier before numeric constant
   37 | #define nr_cpu_ids              1U
      |                                 ^~
kernel/sched/bpf_topology.c:75:15: note: in expansion of macro ‘nr_cpu_ids’
   75 |         cpus->nr_cpu_ids = nr_cpu_ids;

Fixes: f333bd68 ("sched: programmable: Add helper function for...")
Signed-off-by: NHui Tang <tanghui20@huawei.com>
上级 b55886e8
...@@ -36,7 +36,7 @@ struct bpf_cpumask_info { ...@@ -36,7 +36,7 @@ struct bpf_cpumask_info {
unsigned int nums_possible_cpus; unsigned int nums_possible_cpus;
unsigned int nums_active_cpus; unsigned int nums_active_cpus;
unsigned int nums_isolate_cpus; unsigned int nums_isolate_cpus;
unsigned int nr_cpu_ids; unsigned int bpf_nr_cpu_ids;
unsigned int bpf_nr_cpumask_bits; unsigned int bpf_nr_cpumask_bits;
struct cpumask cpu_possible_cpumask; struct cpumask cpu_possible_cpumask;
struct cpumask cpu_active_cpumask; struct cpumask cpu_active_cpumask;
......
...@@ -72,7 +72,7 @@ BPF_CALL_2(bpf_get_cpumask_info, struct bpf_map *, map, struct bpf_cpumask_info ...@@ -72,7 +72,7 @@ BPF_CALL_2(bpf_get_cpumask_info, struct bpf_map *, map, struct bpf_cpumask_info
cpus->nums_possible_cpus = num_possible_cpus(); cpus->nums_possible_cpus = num_possible_cpus();
cpus->nums_active_cpus = num_active_cpus(); cpus->nums_active_cpus = num_active_cpus();
cpus->nums_isolate_cpus = cpumask_weight(&cpus->cpu_isolate_cpumask); cpus->nums_isolate_cpus = cpumask_weight(&cpus->cpu_isolate_cpumask);
cpus->nr_cpu_ids = nr_cpu_ids; cpus->bpf_nr_cpu_ids = nr_cpu_ids;
cpus->bpf_nr_cpumask_bits = nr_cpumask_bits; cpus->bpf_nr_cpumask_bits = nr_cpumask_bits;
return 0; return 0;
......
...@@ -310,7 +310,7 @@ static __always_inline int libbpf_nr_cpus_ids(void) ...@@ -310,7 +310,7 @@ static __always_inline int libbpf_nr_cpus_ids(void)
return -1; return -1;
bpf_get_cpumask_info(&map_cpumask_info, cpus); bpf_get_cpumask_info(&map_cpumask_info, cpus);
return getVal(cpus->nr_cpu_ids); return getVal(cpus->bpf_nr_cpu_ids);
} }
static __always_inline int libbpf_nr_cpumask_bits(void) static __always_inline int libbpf_nr_cpumask_bits(void)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册