From: William Lee Irwin III Handling of prof_cpu_mask is grossly inconsistent. Some arches have it as a cpumask_t, others unsigned long, and even within arches it's treated inconsistently. This makes it cpumask_t across the board, and consolidates the handling in kernel/profile.c Signed-off-by: Andrew Morton --- 25-akpm/arch/alpha/kernel/irq.c | 34 ----------------------- 25-akpm/arch/alpha/kernel/irq_impl.h | 4 -- 25-akpm/arch/i386/kernel/irq.c | 42 ---------------------------- 25-akpm/arch/ia64/kernel/irq.c | 38 -------------------------- 25-akpm/arch/ia64/kernel/time.c | 1 25-akpm/arch/mips/kernel/irq.c | 37 ------------------------- 25-akpm/arch/parisc/kernel/time.c | 5 --- 25-akpm/arch/ppc/kernel/irq.c | 37 ------------------------- 25-akpm/arch/ppc/kernel/time.c | 3 -- 25-akpm/arch/ppc64/kernel/irq.c | 51 ----------------------------------- 25-akpm/arch/ppc64/kernel/time.c | 3 -- 25-akpm/arch/s390/kernel/profile.c | 40 --------------------------- 25-akpm/arch/s390/kernel/time.c | 1 25-akpm/arch/sh/kernel/time.c | 1 25-akpm/arch/um/kernel/irq.c | 35 ------------------------ 25-akpm/arch/x86_64/kernel/irq.c | 39 -------------------------- 25-akpm/include/asm-i386/hw_irq.h | 4 -- 25-akpm/include/asm-x86_64/hw_irq.h | 3 -- 25-akpm/include/linux/profile.h | 5 +++ 25-akpm/kernel/profile.c | 45 ++++++++++++++++++++++++++++++ 20 files changed, 65 insertions(+), 363 deletions(-) diff -puN arch/alpha/kernel/irq.c~profile-consolidate-prof_cpu_mask arch/alpha/kernel/irq.c --- 25/arch/alpha/kernel/irq.c~profile-consolidate-prof_cpu_mask 2004-08-20 00:01:16.199214576 -0700 +++ 25-akpm/arch/alpha/kernel/irq.c 2004-08-20 00:01:16.228210168 -0700 @@ -288,31 +288,6 @@ irq_affinity_write_proc(struct file *fil return full_count; } -static int -prof_cpu_mask_read_proc(char *page, char **start, off_t off, - int count, int *eof, void *data) -{ - int len = cpumask_scnprintf(page, count, *(cpumask_t *)data); - if (count - len < 2) - return -EINVAL; - len += sprintf(page + len, "\n"); - return len; -} - -static int -prof_cpu_mask_write_proc(struct file *file, const char __user *buffer, - unsigned long count, void *data) -{ - unsigned long full_count = count, err; - cpumask_t new_value, *mask = (cpumask_t *)data; - - err = cpumask_parse(buffer, count, new_value); - if (err) - return err; - - *mask = new_value; - return full_count; -} #endif /* CONFIG_SMP */ #define MAX_NAMELEN 10 @@ -350,8 +325,6 @@ register_irq_proc (unsigned int irq) #endif } -unsigned long prof_cpu_mask = ~0UL; - void init_irq_proc (void) { @@ -365,12 +338,7 @@ init_irq_proc (void) #ifdef CONFIG_SMP /* create /proc/irq/prof_cpu_mask */ - entry = create_proc_entry("prof_cpu_mask", 0600, root_irq_dir); - - entry->nlink = 1; - entry->data = (void *)&prof_cpu_mask; - entry->read_proc = prof_cpu_mask_read_proc; - entry->write_proc = prof_cpu_mask_write_proc; + create_prof_cpu_mask(root_irq_dir); #endif /* diff -puN arch/alpha/kernel/irq_impl.h~profile-consolidate-prof_cpu_mask arch/alpha/kernel/irq_impl.h --- 25/arch/alpha/kernel/irq_impl.h~profile-consolidate-prof_cpu_mask 2004-08-20 00:01:16.200214424 -0700 +++ 25-akpm/arch/alpha/kernel/irq_impl.h 2004-08-20 00:01:16.229210016 -0700 @@ -41,8 +41,6 @@ extern void init_i8259a_irqs(void); extern void handle_irq(int irq, struct pt_regs * regs); -extern unsigned long prof_cpu_mask; - static inline void alpha_do_profile(unsigned long pc) { @@ -55,7 +53,7 @@ alpha_do_profile(unsigned long pc) * Only measure the CPUs specified by /proc/irq/prof_cpu_mask. * (default is all CPUs.) */ - if (!((1<nlink = 1; - entry->data = (void *)&prof_cpu_mask; - entry->read_proc = prof_cpu_mask_read_proc; - entry->write_proc = prof_cpu_mask_write_proc; - + create_prof_cpu_mask(root_irq_dir); /* * Create entries for all existing IRQs. */ diff -puN arch/ia64/kernel/irq.c~profile-consolidate-prof_cpu_mask arch/ia64/kernel/irq.c --- 25/arch/ia64/kernel/irq.c~profile-consolidate-prof_cpu_mask 2004-08-20 00:01:16.203213968 -0700 +++ 25-akpm/arch/ia64/kernel/irq.c 2004-08-20 00:01:16.231209712 -0700 @@ -1142,31 +1142,6 @@ void fixup_irqs(void) } #endif -static int prof_cpu_mask_read_proc (char *page, char **start, off_t off, - int count, int *eof, void *data) -{ - int len = cpumask_scnprintf(page, count, *(cpumask_t *)data); - if (count - len < 2) - return -EINVAL; - len += sprintf(page + len, "\n"); - return len; -} - -static int prof_cpu_mask_write_proc (struct file *file, const char *buffer, - unsigned long count, void *data) -{ - cpumask_t *mask = (cpumask_t *)data; - unsigned long full_count = count, err; - cpumask_t new_value; - - err = cpumask_parse(buffer, count, new_value); - if (err) - return err; - - *mask = new_value; - return full_count; -} - #define MAX_NAMELEN 10 static void register_irq_proc (unsigned int irq) @@ -1201,26 +1176,15 @@ static void register_irq_proc (unsigned #endif } -cpumask_t prof_cpu_mask = CPU_MASK_ALL; - void init_irq_proc (void) { - struct proc_dir_entry *entry; int i; /* create /proc/irq */ root_irq_dir = proc_mkdir("irq", 0); /* create /proc/irq/prof_cpu_mask */ - entry = create_proc_entry("prof_cpu_mask", 0600, root_irq_dir); - - if (!entry) - return; - - entry->nlink = 1; - entry->data = (void *)&prof_cpu_mask; - entry->read_proc = prof_cpu_mask_read_proc; - entry->write_proc = prof_cpu_mask_write_proc; + create_prof_cpu_mask(root_irq_dir); /* * Create entries for all existing IRQs. diff -puN arch/ia64/kernel/time.c~profile-consolidate-prof_cpu_mask arch/ia64/kernel/time.c --- 25/arch/ia64/kernel/time.c~profile-consolidate-prof_cpu_mask 2004-08-20 00:01:16.205213664 -0700 +++ 25-akpm/arch/ia64/kernel/time.c 2004-08-20 00:01:16.232209560 -0700 @@ -196,7 +196,6 @@ static inline void ia64_do_profile (struct pt_regs * regs) { unsigned long ip, slot; - extern cpumask_t prof_cpu_mask; profile_hook(regs); diff -puN arch/mips/kernel/irq.c~profile-consolidate-prof_cpu_mask arch/mips/kernel/irq.c --- 25/arch/mips/kernel/irq.c~profile-consolidate-prof_cpu_mask 2004-08-20 00:01:16.206213512 -0700 +++ 25-akpm/arch/mips/kernel/irq.c 2004-08-20 00:01:16.232209560 -0700 @@ -872,30 +872,6 @@ static int irq_affinity_write_proc (stru #endif -static int prof_cpu_mask_read_proc (char *page, char **start, off_t off, - int count, int *eof, void *data) -{ - int len = cpumask_scnprintf(page, count, *(cpumask_t *)data); - if (count - len < 2) - return -EINVAL; - len += sprintf(page + len, "\n"); - return len; -} - -static int prof_cpu_mask_write_proc (struct file *file, const char *buffer, - unsigned long count, void *data) -{ - cpumask_t *mask = (cpumask_t *)data, new_value; - unsigned long full_count = count, err; - - err = cpumask_parse(buffer, count, new_value); - if (err) - return err; - - *mask = new_value; - return full_count; -} - #define MAX_NAMELEN 10 static void register_irq_proc (unsigned int irq) @@ -931,26 +907,15 @@ static void register_irq_proc (unsigned #endif } -unsigned long prof_cpu_mask = -1; - void init_irq_proc (void) { - struct proc_dir_entry *entry; int i; /* create /proc/irq */ root_irq_dir = proc_mkdir("irq", 0); /* create /proc/irq/prof_cpu_mask */ - entry = create_proc_entry("prof_cpu_mask", 0600, root_irq_dir); - - if (!entry) - return; - - entry->nlink = 1; - entry->data = (void *)&prof_cpu_mask; - entry->read_proc = prof_cpu_mask_read_proc; - entry->write_proc = prof_cpu_mask_write_proc; + create_prof_cpu_mask(root_irq_dir); /* * Create entries for all existing IRQs. diff -puN arch/parisc/kernel/time.c~profile-consolidate-prof_cpu_mask arch/parisc/kernel/time.c --- 25/arch/parisc/kernel/time.c~profile-consolidate-prof_cpu_mask 2004-08-20 00:01:16.207213360 -0700 +++ 25-akpm/arch/parisc/kernel/time.c 2004-08-20 00:01:16.233209408 -0700 @@ -51,9 +51,6 @@ static inline void parisc_do_profile(struct pt_regs *regs) { unsigned long pc = regs->iaoq[0]; -#if 0 - extern unsigned long prof_cpu_mask; -#endif extern char _stext; profile_hook(regs); @@ -69,7 +66,7 @@ parisc_do_profile(struct pt_regs *regs) * only look at the cpus specified in this mask */ - if (!((1 << smp_processor_id()) & prof_cpu_mask)) + if (!cpu_isset(smp_processor_id(), prof_cpu_mask)) return; #endif diff -puN arch/ppc64/kernel/irq.c~profile-consolidate-prof_cpu_mask arch/ppc64/kernel/irq.c --- 25/arch/ppc64/kernel/irq.c~profile-consolidate-prof_cpu_mask 2004-08-20 00:01:16.209213056 -0700 +++ 25-akpm/arch/ppc64/kernel/irq.c 2004-08-20 00:01:16.234209256 -0700 @@ -758,44 +758,6 @@ out: return ret; } -static int prof_cpu_mask_read_proc (char *page, char **start, off_t off, - int count, int *eof, void *data) -{ - int len = cpumask_scnprintf(page, count, *(cpumask_t *)data); - if (count - len < 2) - return -EINVAL; - len += sprintf(page + len, "\n"); - return len; -} - -static int prof_cpu_mask_write_proc (struct file *file, const char __user *buffer, - unsigned long count, void *data) -{ - cpumask_t *mask = (cpumask_t *)data; - unsigned long full_count = count, err; - cpumask_t new_value; - - err = cpumask_parse(buffer, count, new_value); - if (err) - return err; - - *mask = new_value; - -#ifdef CONFIG_PPC_ISERIES - { - unsigned i; - for (i=0; inlink = 1; - entry->data = (void *)&prof_cpu_mask; - entry->read_proc = prof_cpu_mask_read_proc; - entry->write_proc = prof_cpu_mask_write_proc; + create_prof_cpu_mask(root_irq_dir); /* * Create entries for all existing IRQs. diff -puN arch/ppc64/kernel/time.c~profile-consolidate-prof_cpu_mask arch/ppc64/kernel/time.c --- 25/arch/ppc64/kernel/time.c~profile-consolidate-prof_cpu_mask 2004-08-20 00:01:16.210212904 -0700 +++ 25-akpm/arch/ppc64/kernel/time.c 2004-08-20 00:01:16.235209104 -0700 @@ -117,7 +117,6 @@ static unsigned adjusting_time = 0; static inline void ppc64_do_profile(struct pt_regs *regs) { unsigned long nip; - extern unsigned long prof_cpu_mask; profile_hook(regs); @@ -133,7 +132,7 @@ static inline void ppc64_do_profile(stru * Only measure the CPUs specified by /proc/irq/prof_cpu_mask. * (default is all CPUs.) */ - if (!((1<nlink = 1; - entry->data = (void *)&prof_cpu_mask; - entry->read_proc = prof_cpu_mask_read_proc; - entry->write_proc = prof_cpu_mask_write_proc; + create_prof_cpu_mask(root_irq_dir); /* * Create entries for all existing IRQs. diff -puN arch/ppc/kernel/time.c~profile-consolidate-prof_cpu_mask arch/ppc/kernel/time.c --- 25/arch/ppc/kernel/time.c~profile-consolidate-prof_cpu_mask 2004-08-20 00:01:16.213212448 -0700 +++ 25-akpm/arch/ppc/kernel/time.c 2004-08-20 00:01:16.236208952 -0700 @@ -113,7 +113,6 @@ extern char _stext; static inline void ppc_do_profile (struct pt_regs *regs) { unsigned long nip; - extern unsigned long prof_cpu_mask; profile_hook(regs); @@ -129,7 +128,7 @@ static inline void ppc_do_profile (struc * Only measure the CPUs specified by /proc/irq/prof_cpu_mask. * (default is all CPUs.) */ - if (!((1<nlink = 1; - entry->data = (void *)&prof_cpu_mask; - entry->read_proc = prof_cpu_mask_read_proc; - entry->write_proc = prof_cpu_mask_write_proc; + create_prof_cpu_mask(root_irq_dir); } diff -puN arch/s390/kernel/time.c~profile-consolidate-prof_cpu_mask arch/s390/kernel/time.c --- 25/arch/s390/kernel/time.c~profile-consolidate-prof_cpu_mask 2004-08-20 00:01:16.215212144 -0700 +++ 25-akpm/arch/s390/kernel/time.c 2004-08-20 00:01:16.237208800 -0700 @@ -185,7 +185,6 @@ extern char _stext, _etext; static inline void s390_do_profile(struct pt_regs * regs) { unsigned long eip; - extern cpumask_t prof_cpu_mask; profile_hook(regs); diff -puN arch/sh/kernel/time.c~profile-consolidate-prof_cpu_mask arch/sh/kernel/time.c --- 25/arch/sh/kernel/time.c~profile-consolidate-prof_cpu_mask 2004-08-20 00:01:16.217211840 -0700 +++ 25-akpm/arch/sh/kernel/time.c 2004-08-20 00:01:16.238208648 -0700 @@ -251,7 +251,6 @@ EXPORT_SYMBOL(do_settimeofday); static long last_rtc_update; /* Profiling definitions */ -extern unsigned long prof_cpu_mask; extern unsigned int * prof_buffer; extern unsigned long prof_len; extern unsigned long prof_shift; diff -puN arch/um/kernel/irq.c~profile-consolidate-prof_cpu_mask arch/um/kernel/irq.c --- 25/arch/um/kernel/irq.c~profile-consolidate-prof_cpu_mask 2004-08-20 00:01:16.218211688 -0700 +++ 25-akpm/arch/um/kernel/irq.c 2004-08-20 00:01:16.239208496 -0700 @@ -610,30 +610,6 @@ static int irq_affinity_write_proc (stru return full_count; } -static int prof_cpu_mask_read_proc (char *page, char **start, off_t off, - int count, int *eof, void *data) -{ - int len = cpumask_scnprintf(page, count, *(cpumask_t *)data); - if (count - len < 2) - return -EINVAL; - len += sprintf(page + len, "\n"); - return len; -} - -static int prof_cpu_mask_write_proc (struct file *file, const char *buffer, - unsigned long count, void *data) -{ - cpumask_t *mask = (cpumask_t *)data, new_value; - unsigned long full_count = count, err; - - err = cpumask_parse(buffer, count, new_value); - if (err) - return err; - - *mask = new_value; - return full_count; -} - #define MAX_NAMELEN 10 static void register_irq_proc (unsigned int irq) @@ -662,24 +638,15 @@ static void register_irq_proc (unsigned smp_affinity_entry[irq] = entry; } -/* Read and written as a long */ -cpumask_t prof_cpu_mask = CPU_MASK_ALL; - void __init init_irq_proc (void) { - struct proc_dir_entry *entry; int i; /* create /proc/irq */ root_irq_dir = proc_mkdir("irq", 0); /* create /proc/irq/prof_cpu_mask */ - entry = create_proc_entry("prof_cpu_mask", 0600, root_irq_dir); - - entry->nlink = 1; - entry->data = (void *)&prof_cpu_mask; - entry->read_proc = prof_cpu_mask_read_proc; - entry->write_proc = prof_cpu_mask_write_proc; + create_prof_cpu_mask(root_irq_dir); /* * Create entries for all existing IRQs. diff -puN arch/x86_64/kernel/irq.c~profile-consolidate-prof_cpu_mask arch/x86_64/kernel/irq.c --- 25/arch/x86_64/kernel/irq.c~profile-consolidate-prof_cpu_mask 2004-08-20 00:01:16.219211536 -0700 +++ 25-akpm/arch/x86_64/kernel/irq.c 2004-08-20 00:01:16.240208344 -0700 @@ -865,31 +865,6 @@ static int irq_affinity_write_proc (stru #endif -static int prof_cpu_mask_read_proc (char *page, char **start, off_t off, - int count, int *eof, void *data) -{ - int len = cpumask_scnprintf(page, count, *(cpumask_t *)data); - if (count - len < 2) - return -EINVAL; - len += sprintf(page + len, "\n"); - return len; -} - -static int prof_cpu_mask_write_proc (struct file *file, - const char __user *buffer, - unsigned long count, void *data) -{ - unsigned long full_count = count, err; - cpumask_t new_value, *mask = (cpumask_t *)data; - - err = cpumask_parse(buffer, count, new_value); - if (err) - return err; - - *mask = new_value; - return full_count; -} - #define MAX_NAMELEN 10 static void register_irq_proc (unsigned int irq) @@ -925,26 +900,15 @@ static void register_irq_proc (unsigned #endif } -unsigned long prof_cpu_mask = -1; - void init_irq_proc (void) { - struct proc_dir_entry *entry; int i; /* create /proc/irq */ root_irq_dir = proc_mkdir("irq", NULL); /* create /proc/irq/prof_cpu_mask */ - entry = create_proc_entry("prof_cpu_mask", 0600, root_irq_dir); - - if (!entry) - return; - - entry->nlink = 1; - entry->data = (void *)&prof_cpu_mask; - entry->read_proc = prof_cpu_mask_read_proc; - entry->write_proc = prof_cpu_mask_write_proc; + create_prof_cpu_mask(root_irq_dir); /* * Create entries for all existing IRQs. @@ -952,4 +916,3 @@ void init_irq_proc (void) for (i = 0; i < NR_IRQS; i++) register_irq_proc(i); } - diff -puN include/asm-i386/hw_irq.h~profile-consolidate-prof_cpu_mask include/asm-i386/hw_irq.h --- 25/include/asm-i386/hw_irq.h~profile-consolidate-prof_cpu_mask 2004-08-20 00:01:16.221211232 -0700 +++ 25-akpm/include/asm-i386/hw_irq.h 2004-08-20 00:01:16.240208344 -0700 @@ -70,8 +70,6 @@ extern atomic_t irq_mis_count; static inline void __do_profile(unsigned long eip) { - extern unsigned long prof_cpu_mask; - if (!prof_buffer) return; @@ -79,7 +77,7 @@ static inline void __do_profile(unsigned * Only measure the CPUs specified by /proc/irq/prof_cpu_mask. * (default is all CPUs.) */ - if (!((1< #include #include +#include #include +struct proc_dir_entry; + /* parse command line */ int __init profile_setup(char * str); /* init basic kernel profiler */ void __init profile_init(void); +void create_prof_cpu_mask(struct proc_dir_entry *); extern unsigned int * prof_buffer; extern unsigned long prof_len; extern unsigned long prof_shift; extern int prof_on; +extern cpumask_t prof_cpu_mask; enum profile_type { diff -puN kernel/profile.c~profile-consolidate-prof_cpu_mask kernel/profile.c --- 25/kernel/profile.c~profile-consolidate-prof_cpu_mask 2004-08-20 00:01:16.225210624 -0700 +++ 25-akpm/kernel/profile.c 2004-08-20 00:01:16.242208040 -0700 @@ -8,12 +8,14 @@ #include #include #include +#include #include unsigned int * prof_buffer; unsigned long prof_len; unsigned long prof_shift; int prof_on; +cpumask_t prof_cpu_mask = CPU_MASK_ALL; int __init profile_setup(char * str) { @@ -163,3 +165,46 @@ EXPORT_SYMBOL_GPL(unregister_profile_not EXPORT_SYMBOL_GPL(profile_event_register); EXPORT_SYMBOL_GPL(profile_event_unregister); + +#ifdef CONFIG_PROC_FS +#include +#include + +static int prof_cpu_mask_read_proc (char *page, char **start, off_t off, + int count, int *eof, void *data) +{ + int len = cpumask_scnprintf(page, count, *(cpumask_t *)data); + if (count - len < 2) + return -EINVAL; + len += sprintf(page + len, "\n"); + return len; +} + +static int prof_cpu_mask_write_proc (struct file *file, const char __user *buffer, + unsigned long count, void *data) +{ + cpumask_t *mask = (cpumask_t *)data; + unsigned long full_count = count, err; + cpumask_t new_value; + + err = cpumask_parse(buffer, count, new_value); + if (err) + return err; + + *mask = new_value; + return full_count; +} + +void create_prof_cpu_mask(struct proc_dir_entry *root_irq_dir) +{ + struct proc_dir_entry *entry; + + /* create /proc/irq/prof_cpu_mask */ + if (!(entry = create_proc_entry("prof_cpu_mask", 0600, root_irq_dir))) + return; + entry->nlink = 1; + entry->data = (void *)&prof_cpu_mask; + entry->read_proc = prof_cpu_mask_read_proc; + entry->write_proc = prof_cpu_mask_write_proc; +} +#endif /* CONFIG_PROC_FS */ _