diff --git a/include/linux/bpf_topology.h b/include/linux/bpf_topology.h index 0c7ee492edde392c39d280ca8f8ff3cb4949e461..b2c6d621821d033b25bfce66b7250994682519e1 100644 --- a/include/linux/bpf_topology.h +++ b/include/linux/bpf_topology.h @@ -36,7 +36,7 @@ struct bpf_cpumask_info { unsigned int nums_possible_cpus; unsigned int nums_active_cpus; unsigned int nums_isolate_cpus; - unsigned int nr_cpu_ids; + unsigned int bpf_nr_cpu_ids; unsigned int bpf_nr_cpumask_bits; struct cpumask cpu_possible_cpumask; struct cpumask cpu_active_cpumask; diff --git a/kernel/sched/bpf_topology.c b/kernel/sched/bpf_topology.c index 69541dc6a98338d08d9db881d55ad2f3fb7bab08..ce6cb8277246a7dc0bc7db3397e3b2d1d29e89c8 100644 --- a/kernel/sched/bpf_topology.c +++ b/kernel/sched/bpf_topology.c @@ -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_active_cpus = num_active_cpus(); 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; return 0; diff --git a/tools/lib/bpf/libbpf_sched.h b/tools/lib/bpf/libbpf_sched.h index b2008ff6bb253305627c64c2db007ca2625e6d9d..04b43c145fcd4d720260104294465a9634b49c82 100644 --- a/tools/lib/bpf/libbpf_sched.h +++ b/tools/lib/bpf/libbpf_sched.h @@ -310,7 +310,7 @@ static __always_inline int libbpf_nr_cpus_ids(void) return -1; 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)