Messages in this thread Patch in this message | | | From | Donghai Qiao <> | Subject | [PATCH v3 11/11] smp: up.c to adopt the same format of cross CPU call. | Date | Tue, 17 May 2022 14:03:26 -0400 |
| |
Since smp.c has been changed to use the new interface, up.c should be changed to use the uniprocessor version of cross call as well.
Signed-off-by: Donghai Qiao <dqiao@redhat.com> --- v1 -> v2: Removed 'x' from the function names and change XCALL to SMP_CALL from the new macros v2 -> v3: Fixed the UP build errors (W=1 build) kernel/up.c | 58 +++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 41 insertions(+), 17 deletions(-)
diff --git a/kernel/up.c b/kernel/up.c index a38b8b095251..ebecd8602884 100644 --- a/kernel/up.c +++ b/kernel/up.c @@ -9,8 +9,7 @@ #include <linux/smp.h> #include <linux/hypervisor.h> -int smp_call_function_single(int cpu, void (*func) (void *info), void *info, - int wait) +int smp_call(int cpu, void (*func) (void *info), void *info, unsigned int type) { unsigned long flags; @@ -23,37 +22,62 @@ int smp_call_function_single(int cpu, void (*func) (void *info), void *info, return 0; } -EXPORT_SYMBOL(smp_call_function_single); +EXPORT_SYMBOL(smp_call); -int smp_call_function_single_async(int cpu, struct __call_single_data *csd) +int smp_call_cond(int cpu, smp_call_func_t func, void *info, + smp_cond_func_t cond_func, unsigned int type) { - unsigned long flags; + int ret = 0; + + preempt_disable(); + if (!cond_func || cond_func(cpu, info)) + ret = smp_call(cpu, func, info, type); + + preempt_enable(); + + return ret; +} +EXPORT_SYMBOL(smp_call_cond); + +void smp_call_mask(const struct cpumask *mask, smp_call_func_t func, void *info, unsigned int type) +{ + if (!cpumask_test_cpu(0, mask)) + return; + + preempt_disable(); + smp_call(0, func, info, type); + preempt_enable(); +} +EXPORT_SYMBOL(smp_call_mask); + +int smp_call_csd(int cpu, struct __call_single_data *csd, unsigned int type) +{ + preempt_disable(); + + if (csd->func != NULL) + smp_call(cpu, csd->func, csd->info, type); + + preempt_enable(); - local_irq_save(flags); - csd->func(csd->info); - local_irq_restore(flags); return 0; } -EXPORT_SYMBOL(smp_call_function_single_async); +EXPORT_SYMBOL(smp_call_csd); /* * Preemption is disabled here to make sure the cond_func is called under the * same conditions in UP and SMP. */ -void on_each_cpu_cond_mask(smp_cond_func_t cond_func, smp_call_func_t func, - void *info, bool wait, const struct cpumask *mask) +void smp_call_mask_cond(const struct cpumask *mask, smp_call_func_t func, + void *info, smp_cond_func_t cond_func, + unsigned int type) { - unsigned long flags; - preempt_disable(); if ((!cond_func || cond_func(0, info)) && cpumask_test_cpu(0, mask)) { - local_irq_save(flags); - func(info); - local_irq_restore(flags); + smp_call(0, func, info, type); } preempt_enable(); } -EXPORT_SYMBOL(on_each_cpu_cond_mask); +EXPORT_SYMBOL(smp_call_mask_cond); int smp_call_on_cpu(unsigned int cpu, int (*func)(void *), void *par, bool phys) { -- 2.27.0
| |