riscv: Improve on-cpu and IPI support
Subsystems (4)
cover riscv: Improve on-cpu and IPI support
The first two patches improve general library support for cpumasks and the on-cpus API. on-cpus can now take cpumasks for input. The last patch improves support for sending IPIs on riscv using the SBI IPI extension by supporting a nicer interface of cpuids and cpumasks.
Andrew Jones (3):
lib/cpumask: Fix and simplify a few functions lib/on-cpus: Introduce on_cpumask and on_cpumask_async
riscv: Introduce SBI IPI convenience functions
lib/cpumask.h | 47 +++++++++++++++++---------------------------- lib/on-cpus.c | 35 +++++++++++++++++++++++++-------- lib/on-cpus.h | 3 +++ lib/riscv/asm/sbi.h | 3 +++ lib/riscv/sbi.c | 43 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 94 insertions(+), 37 deletions(-)
Signature · 1 line
2.45.2
PATCH 1/3 lib/cpumask: Fix and simplify a few functions
Simplify cpumask_setall and cpumask_clear by just using memset. Also simplify cpumask_empty and cpumask_full. This is a fix for cpumask_empty as it would have reported non-empty for cpumasks that had uninitialized junk following nr_cpus when nr_cpus < NR_CPUS. There aren't currently any users of cpumask_empty though so that bug has never appeared. cpumask_full was just convoluted and can now follow cpumask_empty's new pattern. I've already yelled at a mirror to scold the author of the original implementations!
--- lib/cpumask.h | 47 ++++++++++++++++++----------------------------- 1 file changed, 18 insertions(+), 29 deletions(-)
lib/cpumask.h +18 -29
@@ -6,8 +6,9 @@*/ #ifndef _CPUMASK_H_#define _CPUMASK_H_ -#include <asm/setup.h> #include <bitops.h> +#include <limits.h> +#include <asm/setup.h> #define CPUMASK_NR_LONGS ((NR_CPUS + BITS_PER_LONG - 1) / BITS_PER_LONG)
@@ -49,46 +50,34 @@ static inline int cpumask_test_and_clear_cpu(int cpu, cpumask_t *mask)static inline void cpumask_setall (cpumask_t *mask) { -int i; -for (i =0 ; i < nr_cpus; i +=BITS_PER_LONG ) -cpumask_bits (mask)[BIT_WORD (i)] = ~0UL ; - i -=BITS_PER_LONG ; -if ((nr_cpus - i) <BITS_PER_LONG ) -cpumask_bits (mask)[BIT_WORD (i)] =BIT_MASK (nr_cpus - i) -1 ; +memset (mask,0xff ,sizeof (*mask)); }static inline void cpumask_clear (cpumask_t *mask) { -int i; -for (i =0 ; i < nr_cpus; i +=BITS_PER_LONG ) -cpumask_bits (mask)[BIT_WORD (i)] =0UL ; +memset (mask,0 ,sizeof (*mask)); }static inline bool cpumask_empty (const cpumask_t *mask) { -int i; -for (i =0 ; i < nr_cpus; i +=BITS_PER_LONG ) { -if (i <NR_CPUS ) {/* silence crazy compiler warning */ -if (cpumask_bits (mask)[BIT_WORD (i)] !=0UL ) -return false; - } - } -return true; +unsigned long lastmask =BIT_MASK (nr_cpus) -1 ; + +for (int i =0 ; i <BIT_WORD (nr_cpus); ++i) +if (cpumask_bits (mask)[i]) +return false; + +return !lastmask || !(cpumask_bits (mask)[BIT_WORD (nr_cpus)] & lastmask); }static inline bool cpumask_full (const cpumask_t *mask) { -int i; -for (i =0 ; i < nr_cpus; i +=BITS_PER_LONG ) { -if (cpumask_bits (mask)[BIT_WORD (i)] != ~0UL ) { -if ((nr_cpus - i) >=BITS_PER_LONG ) -return false; -if (cpumask_bits (mask)[BIT_WORD (i)] - !=BIT_MASK (nr_cpus - i) -1 ) -return false; - } - } -return true; +unsigned long lastmask =BIT_MASK (nr_cpus) -1 ; + +for (int i =0 ; i <BIT_WORD (nr_cpus); ++i) +if (cpumask_bits (mask)[i] !=ULONG_MAX ) +return false; + +return !lastmask || (cpumask_bits (mask)[BIT_WORD (nr_cpus)] & lastmask) == lastmask; }static inline int cpumask_weight (const cpumask_t *mask)
Signature · 1 line
2.45.2
PATCH 2/3 lib/on-cpus: Introduce on_cpumask and on_cpumask_async
In reply to Andrew JonesProvide functions to launch tasks on a selection of cpus identified by a cpumask.
--- lib/on-cpus.c | 35 +++++++++++++++++++++++++++-------- lib/on-cpus.h | 3 +++ 2 files changed, 30 insertions(+), 8 deletions(-)
lib/on-cpus.c +27 -8
@@ -124,24 +124,32 @@ void on_cpu_async(int cpu, void (*func)(void *data), void *data)smp_send_event (); } -void on_cpu (int cpu,void (*func)(void *data),void *data) +void on_cpumask_async (const cpumask_t *mask,void (*func)(void *data),void *data) { -on_cpu_async (cpu, func, data); -cpu_wait (cpu); +int cpu, me =smp_processor_id (); + +for_each_cpu (cpu, mask) { +if (cpu == me) +continue ; +on_cpu_async (cpu, func, data); + } +if (cpumask_test_cpu (me, mask)) +func (data); } -void on_cpus (void (*func)(void *data),void *data) +void on_cpumask (const cpumask_t *mask,void (*func)(void *data),void *data) {int cpu, me =smp_processor_id (); -for_each_present_cpu (cpu) { +for_each_cpu (cpu, mask) {if (cpu == me)continue ;on_cpu_async (cpu, func, data); } -func (data); +if (cpumask_test_cpu (me, mask)) +func (data); -for_each_present_cpu (cpu) { +for_each_cpu (cpu, mask) {if (cpu == me)continue ;cpumask_set_cpu (me, &on_cpu_info[cpu].waiters);
@@ -149,6 +157,17 @@ void on_cpus(void (*func)(void *data), void *data) }while (cpumask_weight (&cpu_idle_mask) < nr_cpus -1 )smp_wait_for_event (); -for_each_present_cpu (cpu) +for_each_cpu (cpu, mask)cpumask_clear_cpu (me, &on_cpu_info[cpu].waiters); } + +void on_cpu (int cpu,void (*func)(void *data),void *data) +{ +on_cpu_async (cpu, func, data); +cpu_wait (cpu); +} + +void on_cpus (void (*func)(void *data),void *data) +{ +on_cpumask (&cpu_present_mask, func, data); +}
lib/on-cpus.h +3 -0
@@ -2,6 +2,7 @@#ifndef _ON_CPUS_H_#define _ON_CPUS_H_#include <stdbool.h> +#include <cpumask.h> extern bool cpu0_calls_idle;
@@ -10,5 +11,7 @@ void do_idle(void);void on_cpu_async (int cpu,void (*func)(void *data),void *data);void on_cpu (int cpu,void (*func)(void *data),void *data);void on_cpus (void (*func)(void *data),void *data); +void on_cpumask_async (const cpumask_t *mask,void (*func)(void *data),void *data); +void on_cpumask (const cpumask_t *mask,void (*func)(void *data),void *data);#endif /* _ON_CPUS_H_ */
Signature · 1 line
2.45.2
PATCH 3/3 riscv: Introduce SBI IPI convenience functions
In reply to Andrew JonesThe SBI IPI function interface is a bit painful to use since it operates on hartids as opposed to cpuids and requires determining a mask base and a mask. Provide functions allowing IPIs to be sent to single cpus and to all cpus set in a cpumask in order to simplify things for unit tests.
--- lib/riscv/asm/sbi.h | 3 +++ lib/riscv/sbi.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+)
lib/riscv/asm/sbi.h +3 -0
@@ -13,6 +13,7 @@#define SBI_ERR_ALREADY_STOPPED -8#ifndef __ASSEMBLY__ +#include <cpumask.h> enum sbi_ext_id { SBI_EXT_BASE = 0x10,
@@ -67,6 +68,8 @@ struct sbiret sbi_ecall(int ext, int fid, unsigned long arg0,void sbi_shutdown (void );struct sbiret sbi_hart_start (unsigned long hartid,unsigned long entry,unsigned long sp);struct sbiret sbi_send_ipi (unsigned long hart_mask,unsigned long hart_mask_base); +struct sbiret sbi_send_ipi_cpu (int cpu); +struct sbiret sbi_send_ipi_cpumask (const cpumask_t *mask);struct sbiret sbi_set_timer (unsigned long stime_value);long sbi_probe (int ext);
lib/riscv/sbi.c +43 -0
55 lines not on this page · raw message
Signature · 1 line
2.45.2
[kvm-unit-tests PATCH 4/3] riscv: Provide helpers for IPIs
In reply to Andrew JonesProvide a few functions to enable/disable/acknowledge IPIs.
--- lib/riscv/asm/csr.h | 3 ++- lib/riscv/asm/processor.h | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-)
lib/riscv/asm/csr.h +2 -1
@@ -51,7 +51,8 @@#define IRQ_S_GEXT 12#define IRQ_PMU_OVF 13 -#define IE_TIE (_AC(0x1, UL) << IRQ_S_TIMER) +#define IE_SSIE (_AC(1, UL) << IRQ_S_SOFT) +#define IE_TIE (_AC(1, UL) << IRQ_S_TIMER)#define IP_TIP IE_TIE
lib/riscv/asm/processor.h +15 -0
@@ -32,6 +32,21 @@ static inline void local_irq_disable(void)csr_clear (CSR_SSTATUS ,SR_SIE ); } +static inline void local_ipi_enable (void ) +{ +csr_set (CSR_SIE ,IE_SSIE ); +} + +static inline void local_ipi_disable (void ) +{ +csr_clear (CSR_SIE ,IE_SSIE ); +} + +static inline void ipi_ack (void ) +{ +csr_clear (CSR_SIP ,IE_SSIE ); +} +void install_exception_handler (unsigned long cause,void (*handler)(struct pt_regs *));void install_irq_handler (unsigned long cause,void (*handler)(struct pt_regs *));void do_handle_exception (struct pt_regs *regs);
Signature · 1 line
2.45.2
Quoted 10 lines · Andrew Jones
The first two patches improve general library support for cpumasks and the on-cpus API. on-cpus can now take cpumasks for input. The last patch improves support for sending IPIs on riscv using the SBI IPI extension by supporting a nicer interface of cpuids and cpumasks.
Andrew Jones (3):
lib/cpumask: Fix and simplify a few functionslib/on-cpus: Introduceon_cpumaskandon_cpumask_async
riscv: Introduce SBI IPI convenience functions
Quoted 9 lines
lib/cpumask.h | 47 +++++++++++++++++---------------------------- lib/on-cpus.c | 35 +++++++++++++++++++++++++-------- lib/on-cpus.h | 3 +++ lib/riscv/asm/sbi.h | 3 +++ lib/riscv/sbi.c | 43 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 94 insertions(+), 37 deletions(-)Signature · 1 line
2.45.2
Queued on riscv/sbi, https://gitlab.com/jones-drew/kvm-unit-tests/-/commits/riscv%2Fsbi