Messages in this thread Patch in this message | | | Date | Fri, 14 Feb 2003 04:33:28 -0500 (EST) | From | Zwane Mwaikambo <> | Subject | [PATCH][2.5][2/14] smp_call_function_on_cpu - i386 |
| |
This patch adds smp_call_function_on_cpu for i386 and Voyager-i386/SMP
smp.c | 66 +++++++++++++++++++++++++++++++++++++++++------------------------- 1 files changed, 41 insertions(+), 25 deletions(-)
Index: linux-2.5.60/arch/i386/kernel/smp.c =================================================================== RCS file: /build/cvsroot/linux-2.5.60/arch/i386/kernel/smp.c,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 smp.c --- linux-2.5.60/arch/i386/kernel/smp.c 10 Feb 2003 22:14:16 -0000 1.1.1.1 +++ linux-2.5.60/arch/i386/kernel/smp.c 14 Feb 2003 06:23:48 -0000 @@ -495,31 +495,33 @@ static struct call_data_struct * call_data; /* - * this function sends a 'generic call function' IPI to all other CPUs - * in the system. - */ - -int smp_call_function (void (*func) (void *info), void *info, int nonatomic, - int wait) -/* - * [SUMMARY] Run a function on all other CPUs. - * <func> The function to run. This must be fast and non-blocking. - * <info> An arbitrary pointer to pass to the function. - * <nonatomic> currently unused. - * <wait> If true, wait (atomically) until function has completed on other CPUs. - * [RETURNS] 0 on success, else a negative status code. Does not return until - * remote CPUs are nearly ready to execute <<func>> or are or have executed. + * smp_call_function_on_cpu - Runs func on all processors in the mask + * + * @func: The function to run. This must be fast and non-blocking. + * @info: An arbitrary pointer to pass to the function. + * @wait: If true, wait (atomically) until function has completed on other CPUs. + * @mask: The bitmask of CPUs to call the function + * + * Returns 0 on success, else a negative status code. Does not return until + * remote CPUs are nearly ready to execute func or have executed it. * * You must not call this function with disabled interrupts or from a * hardware interrupt handler or from a bottom half handler. */ + +int smp_call_function_on_cpu (void (*func) (void *info), void *info, + int wait, unsigned long mask) { struct call_data_struct data; - int cpus = num_online_cpus()-1; - - if (!cpus) - return 0; + int num_cpus, cpu; + cpu = get_cpu(); + mask &= ~(1UL << cpu); + num_cpus = hweight32(mask); + if (num_cpus == 0) { + put_cpu_no_resched(); + return -EINVAL; + } data.func = func; data.info = info; atomic_set(&data.started, 0); @@ -530,19 +532,33 @@ spin_lock(&call_lock); call_data = &data; wmb(); - /* Send a message to all other CPUs and wait for them to respond */ - send_IPI_allbutself(CALL_FUNCTION_VECTOR); + + /* Send a message to the CPUs in the mask and wait for them to respond */ + if (mask == (cpu_online_map & ~(1UL << cpu))) + send_IPI_allbutself(CALL_FUNCTION_VECTOR); + else + send_IPI_mask_sequence(mask, CALL_FUNCTION_VECTOR); /* Wait for response */ - while (atomic_read(&data.started) != cpus) - barrier(); + while (atomic_read(&data.started) != num_cpus) + cpu_relax(); if (wait) - while (atomic_read(&data.finished) != cpus) - barrier(); + while (atomic_read(&data.finished) != num_cpus) + cpu_relax(); spin_unlock(&call_lock); - + put_cpu_no_resched(); return 0; +} + +/* + * this function sends a 'generic call function' IPI to all other CPUs + * in the system. + */ + +int smp_call_function (void (*func) (void *info), void *info, int nonatomic, int wait) +{ + return smp_call_function_on_cpu(func, info, wait, cpu_online_map); } static void stop_this_cpu (void * dummy) - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |