cpumask: for_each_cpu(): for_each_cpu_mask which takes a pointer We want to wean people off handing around cpumask_t's, and have them pass by pointer instead. This does for_each_cpu_mask(). We immediately convert core files who were doing "for_each_cpu_mask(... *mask)" since this is clearer. From: Rusty Russell Signed-off-by: Rusty Russell Signed-off-by: Mike Travis --- include/linux/cpumask.h | 25 ++++++++++++++----------- kernel/sched.c | 40 ++++++++++++++++++++-------------------- kernel/workqueue.c | 6 +++--- lib/cpumask.c | 2 +- mm/allocpercpu.c | 4 ++-- mm/vmstat.c | 2 +- 6 files changed, 41 insertions(+), 38 deletions(-) diff -r ba652cfcd997 include/linux/cpumask.h --- a/include/linux/cpumask.h Tue Oct 28 22:38:02 2008 +1100 +++ b/include/linux/cpumask.h Tue Oct 28 22:38:35 2008 +1100 @@ -97,8 +97,8 @@ * void cpumask_onto(dst, orig, relmap) *dst = orig relative to relmap * void cpumask_fold(dst, orig, sz) dst bits = orig bits mod sz * - * for_each_cpu_mask(cpu, mask) for-loop cpu over mask using nr_cpu_ids - * for_each_cpu_mask_and(cpu, mask, and) for-loop cpu over (mask & and). + * for_each_cpu(cpu, mask) for-loop cpu over mask, <= nr_cpu_ids + * for_each_cpu_and(cpu, mask, and) for-loop cpu over (mask & and). * * int num_online_cpus() Number of online CPUs * int num_possible_cpus() Number of all possible CPUs @@ -175,6 +175,9 @@ extern cpumask_t _unused_cpumask_arg_; #define cpus_weight_nr(cpumask) cpus_weight(cpumask) #define for_each_cpu_mask_nr(cpu, mask) for_each_cpu_mask(cpu, mask) #define cpumask_of_cpu(cpu) (*cpumask_of(cpu)) +#define for_each_cpu_mask(cpu, mask) for_each_cpu(cpu, &(mask)) +#define for_each_cpu_mask_and(cpu, mask, and) \ + for_each_cpu_and(cpu, &(mask), &(and)) /* End deprecated region. */ #if NR_CPUS > 1 @@ -443,9 +446,9 @@ extern cpumask_t cpu_mask_all; #define cpumask_next_and(n, srcp, andp) ({ (void)(srcp), (void)(andp); 1; }) #define any_online_cpu(mask) 0 -#define for_each_cpu_mask(cpu, mask) \ +#define for_each_cpu(cpu, mask) \ for ((cpu) = 0; (cpu) < 1; (cpu)++, (void)mask) -#define for_each_cpu_mask_and(cpu, mask, and) \ +#define for_each_cpu_and(cpu, mask, and) \ for ((cpu) = 0; (cpu) < 1; (cpu)++, (void)mask, (void)and) #else /* NR_CPUS > 1 */ @@ -459,13 +462,13 @@ int __any_online_cpu(const cpumask_t *ma #define next_cpu(n, src) __next_cpu((n), &(src)) #define any_online_cpu(mask) __any_online_cpu(&(mask)) -#define for_each_cpu_mask(cpu, mask) \ +#define for_each_cpu(cpu, mask) \ for ((cpu) = -1; \ - (cpu) = next_cpu((cpu), (mask)), \ + (cpu) = __next_cpu((cpu), (mask)), \ (cpu) < nr_cpu_ids;) -#define for_each_cpu_mask_and(cpu, mask, and) \ +#define for_each_cpu_and(cpu, mask, and) \ for ((cpu) = -1; \ - (cpu) = cpumask_next_and((cpu), &(mask), &(and)), \ + (cpu) = cpumask_next_and((cpu), (mask), (and)), \ (cpu) < nr_cpu_ids;) #define num_online_cpus() cpus_weight(cpu_online_map) @@ -597,8 +600,8 @@ extern cpumask_t cpu_active_map; #define cpu_is_offline(cpu) unlikely(!cpu_online(cpu)) -#define for_each_possible_cpu(cpu) for_each_cpu_mask((cpu), cpu_possible_map) -#define for_each_online_cpu(cpu) for_each_cpu_mask((cpu), cpu_online_map) -#define for_each_present_cpu(cpu) for_each_cpu_mask((cpu), cpu_present_map) +#define for_each_possible_cpu(cpu) for_each_cpu((cpu), &cpu_possible_map) +#define for_each_online_cpu(cpu) for_each_cpu((cpu), &cpu_online_map) +#define for_each_present_cpu(cpu) for_each_cpu((cpu), &cpu_present_map) #endif /* __LINUX_CPUMASK_H */ diff -r ba652cfcd997 kernel/sched.c --- a/kernel/sched.c Tue Oct 28 22:38:02 2008 +1100 +++ b/kernel/sched.c Tue Oct 28 22:38:35 2008 +1100 @@ -1524,7 +1524,7 @@ static int tg_shares_up(struct task_grou struct sched_domain *sd = data; int i; - for_each_cpu_mask(i, sd->span) { + for_each_cpu(i, &sd->span) { rq_weight += tg->cfs_rq[i]->load.weight; shares += tg->cfs_rq[i]->shares; } @@ -1538,7 +1538,7 @@ static int tg_shares_up(struct task_grou if (!rq_weight) rq_weight = cpus_weight(sd->span) * NICE_0_LOAD; - for_each_cpu_mask(i, sd->span) + for_each_cpu(i, &sd->span) update_group_shares_cpu(tg, i, shares, rq_weight); return 0; @@ -2075,7 +2075,7 @@ find_idlest_group(struct sched_domain *s /* Tally up the load of all CPUs in the group */ avg_load = 0; - for_each_cpu_mask_nr(i, group->cpumask) { + for_each_cpu(i, &group->cpumask) { /* Bias balancing toward cpus of our domain */ if (local_group) load = source_load(i, load_idx); @@ -2117,7 +2117,7 @@ find_idlest_cpu(struct sched_group *grou /* Traverse only the allowed CPUs */ cpus_and(*tmp, group->cpumask, p->cpus_allowed); - for_each_cpu_mask_nr(i, *tmp) { + for_each_cpu(i, tmp) { load = weighted_cpuload(i); if (load < min_load || (load == min_load && i == this_cpu)) { @@ -3135,7 +3135,7 @@ find_busiest_group(struct sched_domain * max_cpu_load = 0; min_cpu_load = ~0UL; - for_each_cpu_mask_nr(i, group->cpumask) { + for_each_cpu(i, &group->cpumask) { struct rq *rq; if (!cpu_isset(i, *cpus)) @@ -3414,7 +3414,7 @@ find_busiest_queue(struct sched_group *g unsigned long max_load = 0; int i; - for_each_cpu_mask_nr(i, group->cpumask) { + for_each_cpu(i, &group->cpumask) { unsigned long wl; if (!cpu_isset(i, *cpus)) @@ -3956,7 +3956,7 @@ static void run_rebalance_domains(struct int balance_cpu; cpu_clear(this_cpu, cpus); - for_each_cpu_mask_nr(balance_cpu, cpus) { + for_each_cpu(balance_cpu, &cpus) { /* * If this cpu gets work to do, stop the load balancing * work being done for other cpus. Next load @@ -6941,7 +6941,7 @@ init_sched_build_groups(const cpumask_t cpus_clear(*covered); - for_each_cpu_mask_nr(i, *span) { + for_each_cpu(i, span) { struct sched_group *sg; int group = group_fn(i, cpu_map, &sg, tmpmask); int j; @@ -6952,7 +6952,7 @@ init_sched_build_groups(const cpumask_t cpus_clear(sg->cpumask); sg->__cpu_power = 0; - for_each_cpu_mask_nr(j, *span) { + for_each_cpu(j, span) { if (group_fn(j, cpu_map, NULL, tmpmask) != group) continue; @@ -7152,7 +7152,7 @@ static void init_numa_sched_groups_power if (!sg) return; do { - for_each_cpu_mask_nr(j, sg->cpumask) { + for_each_cpu(j, &sg->cpumask) { struct sched_domain *sd; sd = &per_cpu(phys_domains, j); @@ -7177,7 +7177,7 @@ static void free_sched_groups(const cpum { int cpu, i; - for_each_cpu_mask_nr(cpu, *cpu_map) { + for_each_cpu(cpu, cpu_map) { struct sched_group **sched_group_nodes = sched_group_nodes_bycpu[cpu]; @@ -7424,7 +7424,7 @@ static int __build_sched_domains(const c /* * Set up domains for cpus specified by the cpu_map. */ - for_each_cpu_mask_nr(i, *cpu_map) { + for_each_cpu(i, cpu_map) { struct sched_domain *sd = NULL, *p; SCHED_CPUMASK_VAR(nodemask, allmasks); @@ -7491,7 +7491,7 @@ static int __build_sched_domains(const c #ifdef CONFIG_SCHED_SMT /* Set up CPU (sibling) groups */ - for_each_cpu_mask_nr(i, *cpu_map) { + for_each_cpu(i, cpu_map) { SCHED_CPUMASK_VAR(this_sibling_map, allmasks); SCHED_CPUMASK_VAR(send_covered, allmasks); @@ -7508,7 +7508,7 @@ static int __build_sched_domains(const c #ifdef CONFIG_SCHED_MC /* Set up multi-core groups */ - for_each_cpu_mask_nr(i, *cpu_map) { + for_each_cpu(i, cpu_map) { SCHED_CPUMASK_VAR(this_core_map, allmasks); SCHED_CPUMASK_VAR(send_covered, allmasks); @@ -7575,7 +7575,7 @@ static int __build_sched_domains(const c goto error; } sched_group_nodes[i] = sg; - for_each_cpu_mask_nr(j, *nodemask) { + for_each_cpu(j, nodemask) { struct sched_domain *sd; sd = &per_cpu(node_domains, j); @@ -7621,21 +7621,21 @@ static int __build_sched_domains(const c /* Calculate CPU power for physical packages and nodes */ #ifdef CONFIG_SCHED_SMT - for_each_cpu_mask_nr(i, *cpu_map) { + for_each_cpu(i, cpu_map) { struct sched_domain *sd = &per_cpu(cpu_domains, i); init_sched_groups_power(i, sd); } #endif #ifdef CONFIG_SCHED_MC - for_each_cpu_mask_nr(i, *cpu_map) { + for_each_cpu(i, cpu_map) { struct sched_domain *sd = &per_cpu(core_domains, i); init_sched_groups_power(i, sd); } #endif - for_each_cpu_mask_nr(i, *cpu_map) { + for_each_cpu(i, cpu_map) { struct sched_domain *sd = &per_cpu(phys_domains, i); init_sched_groups_power(i, sd); @@ -7655,7 +7655,7 @@ static int __build_sched_domains(const c #endif /* Attach the domains */ - for_each_cpu_mask_nr(i, *cpu_map) { + for_each_cpu(i, cpu_map) { struct sched_domain *sd; #ifdef CONFIG_SCHED_SMT sd = &per_cpu(cpu_domains, i); @@ -7738,7 +7738,7 @@ static void detach_destroy_domains(const unregister_sched_domain_sysctl(); - for_each_cpu_mask_nr(i, *cpu_map) + for_each_cpu(i, cpu_map) cpu_attach_domain(NULL, &def_root_domain, i); synchronize_sched(); arch_destroy_sched_domains(cpu_map, &tmpmask); diff -r ba652cfcd997 kernel/workqueue.c --- a/kernel/workqueue.c Tue Oct 28 22:38:02 2008 +1100 +++ b/kernel/workqueue.c Tue Oct 28 22:38:35 2008 +1100 @@ -416,7 +416,7 @@ void flush_workqueue(struct workqueue_st might_sleep(); lock_map_acquire(&wq->lockdep_map); lock_map_release(&wq->lockdep_map); - for_each_cpu_mask_nr(cpu, *cpu_map) + for_each_cpu(cpu, cpu_map) flush_cpu_workqueue(per_cpu_ptr(wq->cpu_wq, cpu)); } EXPORT_SYMBOL_GPL(flush_workqueue); @@ -547,7 +547,7 @@ static void wait_on_work(struct work_str wq = cwq->wq; cpu_map = wq_cpu_map(wq); - for_each_cpu_mask_nr(cpu, *cpu_map) + for_each_cpu(cpu, cpu_map) wait_on_cpu_work(per_cpu_ptr(wq->cpu_wq, cpu), work); } @@ -911,7 +911,7 @@ void destroy_workqueue(struct workqueue_ list_del(&wq->list); spin_unlock(&workqueue_lock); - for_each_cpu_mask_nr(cpu, *cpu_map) + for_each_cpu(cpu, cpu_map) cleanup_workqueue_thread(per_cpu_ptr(wq->cpu_wq, cpu)); cpu_maps_update_done(); diff -r ba652cfcd997 lib/cpumask.c --- a/lib/cpumask.c Tue Oct 28 22:38:02 2008 +1100 +++ b/lib/cpumask.c Tue Oct 28 22:38:35 2008 +1100 @@ -28,7 +28,7 @@ int __any_online_cpu(const cpumask_t *ma { int cpu; - for_each_cpu_mask(cpu, *mask) { + for_each_cpu(cpu, mask) { if (cpu_online(cpu)) break; } diff -r ba652cfcd997 mm/allocpercpu.c --- a/mm/allocpercpu.c Tue Oct 28 22:38:02 2008 +1100 +++ b/mm/allocpercpu.c Tue Oct 28 22:38:35 2008 +1100 @@ -34,7 +34,7 @@ static void __percpu_depopulate_mask(voi static void __percpu_depopulate_mask(void *__pdata, cpumask_t *mask) { int cpu; - for_each_cpu_mask_nr(cpu, *mask) + for_each_cpu(cpu, mask) percpu_depopulate(__pdata, cpu); } @@ -86,7 +86,7 @@ static int __percpu_populate_mask(void * int cpu; cpus_clear(populated); - for_each_cpu_mask_nr(cpu, *mask) + for_each_cpu(cpu, mask) if (unlikely(!percpu_populate(__pdata, size, gfp, cpu))) { __percpu_depopulate_mask(__pdata, &populated); return -ENOMEM; diff -r ba652cfcd997 mm/vmstat.c --- a/mm/vmstat.c Tue Oct 28 22:38:02 2008 +1100 +++ b/mm/vmstat.c Tue Oct 28 22:38:35 2008 +1100 @@ -27,7 +27,7 @@ static void sum_vm_events(unsigned long memset(ret, 0, NR_VM_EVENT_ITEMS * sizeof(unsigned long)); - for_each_cpu_mask_nr(cpu, *cpumask) { + for_each_cpu(cpu, cpumask) { struct vm_event_state *this = &per_cpu(vm_event_states, cpu); for (i = 0; i < NR_VM_EVENT_ITEMS; i++)