cpumask: cpu_all_mask and cpu_none_mask. Instead of CPU_MASK_ALL_PTR and the SMP-only cpu_mask_all, this makes cpu_all_mask and cpu_none_mask which are const cpumask pointers which always exist. From: Rusty Russell Signed-off-by: Rusty Russell Signed-off-by: Mike Travis --- include/linux/cpumask.h | 16 ++++++++++------ init/main.c | 7 +------ kernel/cpu.c | 2 ++ kernel/kmod.c | 2 +- kernel/kthread.c | 4 ++-- kernel/sched.c | 2 +- 6 files changed, 17 insertions(+), 16 deletions(-) diff -r 7a8789add773 include/linux/cpumask.h --- a/include/linux/cpumask.h Wed Oct 22 11:09:31 2008 +1100 +++ b/include/linux/cpumask.h Wed Oct 22 11:09:37 2008 +1100 @@ -120,6 +120,7 @@ typedef struct cpumask cpumask_t; typedef struct cpumask cpumask_t; extern cpumask_t _unused_cpumask_arg_; +#define CPU_MASK_ALL_PTR (cpu_all_mask) #define CPU_MASK_ALL ((cpumask_t){ CPU_BITS_ALL }) #define CPU_MASK_NONE ((cpumask_t){ CPU_BITS_NONE }) #define CPU_MASK_CPU0 ((cpumask_t){ CPU_BITS_CPU0 }) @@ -178,6 +179,7 @@ extern cpumask_t _unused_cpumask_arg_; #define cpu_online_map (*(cpumask_t *)cpu_online_mask) #define cpu_present_map (*(cpumask_t *)cpu_present_mask) #define cpu_active_map (*(cpumask_t *)cpu_active_mask) +#define cpu_mask_all (*(cpumask_t *)cpu_all_mask) /* End deprecated region. */ #if NR_CPUS > 1 @@ -418,8 +420,6 @@ static inline const struct cpumask *cpum [BITS_TO_LONGS(CONFIG_NR_CPUS)-1] = CPU_MASK_LAST_WORD \ } -#define CPU_MASK_ALL_PTR (&CPU_MASK_ALL) - #else #define CPU_BITS_ALL \ @@ -427,10 +427,6 @@ static inline const struct cpumask *cpum [0 ... BITS_TO_LONGS(CONFIG_NR_CPUS)-2] = ~0UL, \ [BITS_TO_LONGS(CONFIG_NR_CPUS)-1] = CPU_MASK_LAST_WORD \ } - -/* cpu_mask_all is in init/main.c */ -extern cpumask_t cpu_mask_all; -#define CPU_MASK_ALL_PTR (&cpu_mask_all) #endif @@ -556,6 +552,14 @@ extern const struct cpumask *const cpu_p extern const struct cpumask *const cpu_present_mask; extern const struct cpumask *const cpu_active_mask; +/* It's common to want to use cpu_all_mask in struct member initializers, + * so it has to refer to an address rather than a pointer. */ +extern const DECLARE_BITMAP(cpu_all_bits, CONFIG_NR_CPUS); +#define cpu_all_mask to_cpumask(cpu_all_bits) + +/* First bits of cpu_bit_bitmap are in fact unset. */ +#define cpu_none_mask to_cpumask(cpu_bit_bitmap[0]) + #if NR_CPUS > 1 #define num_online_cpus() cpus_weight(cpu_online_map) #define num_possible_cpus() cpus_weight(cpu_possible_map) diff -r 7a8789add773 init/main.c --- a/init/main.c Wed Oct 22 11:09:31 2008 +1100 +++ b/init/main.c Wed Oct 22 11:09:37 2008 +1100 @@ -365,11 +365,6 @@ static inline void smp_prepare_cpus(unsi static inline void smp_prepare_cpus(unsigned int maxcpus) { } #else - -#if NR_CPUS > BITS_PER_LONG -cpumask_t cpu_mask_all __read_mostly = CPU_MASK_ALL; -EXPORT_SYMBOL(cpu_mask_all); -#endif /* Setup number of possible processor ids */ /* nr_cpu_ids is a real variable for SMP. */ @@ -844,7 +839,7 @@ static int __init kernel_init(void * unu /* * init can run on any cpu. */ - set_cpus_allowed_ptr(current, CPU_MASK_ALL_PTR); + set_cpus_allowed_ptr(current, cpu_all_mask); /* * Tell the world that we're going to be the grim * reaper of innocent orphaned children. diff -r 7a8789add773 kernel/cpu.c --- a/kernel/cpu.c Wed Oct 22 11:09:31 2008 +1100 +++ b/kernel/cpu.c Wed Oct 22 11:09:37 2008 +1100 @@ -491,6 +491,8 @@ static DECLARE_BITMAP(cpu_active_bits, C static DECLARE_BITMAP(cpu_active_bits, CONFIG_NR_CPUS) __read_mostly; const struct cpumask *const cpu_active_mask = to_cpumask(cpu_active_bits); EXPORT_SYMBOL(cpu_active_mask); +const DECLARE_BITMAP(cpu_all_bits, CONFIG_NR_CPUS) = CPU_BITS_ALL; +EXPORT_SYMBOL(cpu_all_bits); void set_cpu_possible(unsigned int cpu, bool possible) { diff -r 7a8789add773 kernel/kmod.c --- a/kernel/kmod.c Wed Oct 22 11:09:31 2008 +1100 +++ b/kernel/kmod.c Wed Oct 22 11:09:37 2008 +1100 @@ -166,7 +166,7 @@ static int ____call_usermodehelper(void } /* We can run anywhere, unlike our parent keventd(). */ - set_cpus_allowed_ptr(current, CPU_MASK_ALL_PTR); + set_cpus_allowed_ptr(current, cpu_all_mask); /* * Our parent is keventd, which runs with elevated scheduling priority. diff -r 7a8789add773 kernel/kthread.c --- a/kernel/kthread.c Wed Oct 22 11:09:31 2008 +1100 +++ b/kernel/kthread.c Wed Oct 22 11:09:37 2008 +1100 @@ -107,7 +107,7 @@ static void create_kthread(struct kthrea */ sched_setscheduler(create->result, SCHED_NORMAL, ¶m); set_user_nice(create->result, KTHREAD_NICE_LEVEL); - set_cpus_allowed_ptr(create->result, CPU_MASK_ALL_PTR); + set_cpus_allowed_ptr(create->result, cpu_all_mask); } complete(&create->done); } @@ -237,7 +237,7 @@ int kthreadd(void *unused) set_task_comm(tsk, "kthreadd"); ignore_signals(tsk); set_user_nice(tsk, KTHREAD_NICE_LEVEL); - set_cpus_allowed_ptr(tsk, CPU_MASK_ALL_PTR); + set_cpus_allowed_ptr(tsk, cpu_all_mask); current->flags |= PF_NOFREEZE | PF_FREEZER_NOSIG; diff -r 7a8789add773 kernel/sched.c --- a/kernel/sched.c Wed Oct 22 11:09:31 2008 +1100 +++ b/kernel/sched.c Wed Oct 22 11:09:37 2008 +1100 @@ -6172,7 +6172,7 @@ static void move_task_off_dead_cpu(int d */ static void migrate_nr_uninterruptible(struct rq *rq_src) { - struct rq *rq_dest = cpu_rq(any_online_cpu(*CPU_MASK_ALL_PTR)); + struct rq *rq_dest = cpu_rq(cpumask_any(cpu_online_mask)); unsigned long flags; local_irq_save(flags);