* Alexander Gordeev <[email protected]> [2020-08-13 13:32:48]: > It is currently assumed that each node contains at most > nr_cpus/nr_nodes CPUs and nodes' CPU ranges do not overlap. > That assumption is generally incorrect as there are archs > where a CPU number does not depend on to its node number. > > This update removes the described assumption by simply calling > numa_node_to_cpus() interface and using the returned mask for > binding CPUs to nodes. > > Also, variable types and names made consistent in functions > using cpumask. > > Cc: Satheesh Rajendran <[email protected]> > Cc: Srikar Dronamraju <[email protected]> > Cc: Naveen N. Rao <[email protected]> > Cc: Balamuruhan S <[email protected]> > Cc: Peter Zijlstra <[email protected]> > Cc: Ingo Molnar <[email protected]> > Cc: Arnaldo Carvalho de Melo <[email protected]> > Cc: Mark Rutland <[email protected]> > Cc: Alexander Shishkin <[email protected]> > Cc: Jiri Olsa <[email protected]> > Cc: Namhyung Kim <[email protected]> > Signed-off-by: Alexander Gordeev <[email protected]> > --- > @@ -310,13 +306,16 @@ static cpu_set_t bind_to_node(int target_node) > for (cpu = 0; cpu < g->p.nr_cpus; cpu++) > CPU_SET(cpu, &mask); > } else { > - int cpu_start = (target_node + 0) * cpus_per_node; > - int cpu_stop = (target_node + 1) * cpus_per_node; > - > - BUG_ON(cpu_stop > g->p.nr_cpus); > + struct bitmask *cpumask = numa_allocate_cpumask(); > > - for (cpu = cpu_start; cpu < cpu_stop; cpu++) > - CPU_SET(cpu, &mask); > + BUG_ON(!cpumask); > + if (!numa_node_to_cpus(target_node, cpumask)) { > + for (cpu = 0; cpu < (int)cpumask->size; cpu++) { > + if (numa_bitmask_isbitset(cpumask, cpu)) > + CPU_SET(cpu, &mask); > + } > + } > + numa_free_cpumask(cpumask); > } > > ret = sched_setaffinity(0, sizeof(mask), &mask); > -- > 1.8.3.1 >
Looks good to me. Reviewed-by: Srikar Dronamraju <[email protected]> -- Thanks and Regards Srikar Dronamraju
