better smp interrupt checks
v4 cover better smp interrupt checks
Use per-CPU flags and callbacks for Program and External interrupts instead of global variables.
This allows for more accurate error handling; a CPU waiting for an interrupt will not have it "stolen" by a different CPU that was not supposed to wait for one, and now two CPUs can wait for interrupts at the same time.
Also fix skey.c to be compatible with the new interrupt handling.
Add some utility functions to manipulate bits in the PSW mask, to improve readability.
v3->v4
* re-introduce ext_cleanup_func
* re-introduce psw_mask_set_and_clear_bits
* cleanup functions now take a pointer to the stack frame
v2->v3
* improve commit messages and fix some comments
* remove unused psw_mask_set_clear_bits
* remove ext_cleanup_func from struct cpu
* minor code style changes
Claudio Imbrenda (3):
lib: s390x: add functions to set and clear PSW bits
s390x: skey.c: rework the interrupt handler
lib: s390x: better smp interrupt checks
lib/s390x/asm/arch_def.h | 75 ++++++++++++++++++++++++++++++++++---- lib/s390x/asm/interrupt.h | 3 +- lib/s390x/asm/pgtable.h | 2 - lib/s390x/smp.h | 8 +--- lib/s390x/interrupt.c | 77 +++++++++++++++++++++++++++++++-------- lib/s390x/mmu.c | 14 +------ lib/s390x/sclp.c | 7 +--- lib/s390x/smp.c | 11 ++++++ s390x/diag288.c | 6 +-- s390x/selftest.c | 4 +- s390x/skey.c | 23 ++++-------- s390x/skrf.c | 14 ++----- s390x/smp.c | 18 ++------- 13 files changed, 163 insertions(+), 99 deletions(-)
Signature · 1 line
2.36.1
PATCH v4 1/3 lib: s390x: add functions to set and clear PSW bits
Add some functions to set and/or clear bits in the PSW.
Also introduce PSW_MASK_KEY and re-order the PSW_MASK_* constants so they are descending in value.
This should improve code readability.
--- lib/s390x/asm/arch_def.h | 58 +++++++++++++++++++++++++++++++++++----- lib/s390x/asm/pgtable.h | 2 -- lib/s390x/mmu.c | 14 +--------- lib/s390x/sclp.c | 7 +---- s390x/diag288.c | 6 ++--- s390x/selftest.c | 4 +-- s390x/skrf.c | 12 +++------ s390x/smp.c | 18 +++---------- 8 files changed, 63 insertions(+), 58 deletions(-)
lib/s390x/asm/arch_def.h +51 -7
@@ -46,9 +46,10 @@ struct psw {#define AS_SECN 2#define AS_HOME 3 -#define PSW_MASK_EXT 0x0100000000000000UL -#define PSW_MASK_IO 0x0200000000000000UL#define PSW_MASK_DAT 0x0400000000000000UL +#define PSW_MASK_IO 0x0200000000000000UL +#define PSW_MASK_EXT 0x0100000000000000UL +#define PSW_MASK_KEY 0x00F0000000000000UL#define PSW_MASK_WAIT 0x0002000000000000UL#define PSW_MASK_PSTATE 0x0001000000000000UL#define PSW_MASK_EA 0x0000000100000000UL
@@ -313,6 +314,53 @@ static inline void load_psw_mask(uint64_t mask) : "+r" (tmp) : "a" (&psw) : "memory", "cc" ); } +/** +* psw_mask_clear_bits - clears bits from the current PSW mask +* @clear: bitmask of bits that will be cleared +*/ +static inline void psw_mask_clear_bits (uint64_t clear) +{ +load_psw_mask (extract_psw_mask () & ~clear); +} + +/** +* psw_mask_set_bits - sets bits on the current PSW mask +* @set: bitmask of bits that will be set +*/ +static inline void psw_mask_set_bits (uint64_t set) +{ +load_psw_mask (extract_psw_mask () | set); +} + +/** +* psw_mask_clear_and_set_bits - clears and sets bits on the current PSW mask +* @clear: bitmask of bits that will be cleared +* @set: bitmask of bits that will be set +* +* The bits in the @clear mask will be cleared, then the bits in the @set mask +* will be set. +*/ +static inline void psw_mask_clear_and_set_bits (uint64_t clear,uint64_t set) +{ +load_psw_mask ((extract_psw_mask () & ~clear) | set); +} + +/** +* enable_dat - enable the DAT bit in the current PSW +*/ +static inline void enable_dat (void ) +{ +psw_mask_set_bits (PSW_MASK_DAT ); +} + +/** +* disable_dat - disable the DAT bit in the current PSW +*/ +static inline void disable_dat (void ) +{ +psw_mask_clear_bits (PSW_MASK_DAT ); +} +static inline void wait_for_interrupt (uint64_t irq_mask) {uint64_t psw_mask =extract_psw_mask ();
@@ -327,11 +375,7 @@ static inline void wait_for_interrupt(uint64_t irq_mask)static inline void enter_pstate (void ) { -uint64_t mask; - - mask =extract_psw_mask (); - mask |=PSW_MASK_PSTATE ; -load_psw_mask (mask); +psw_mask_set_bits (PSW_MASK_PSTATE ); }static inline void leave_pstate (void )
lib/s390x/asm/pgtable.h +0 -2
@@ -247,6 +247,4 @@ static inline void idte_pgdp(unsigned long vaddr, pgdval_t *pgdp) idte((unsigned long)(pgdp - pgd_index(vaddr)) | ASCE_DT_REGION1, vaddr); } -void configure_dat (int enable); -#endif /* _ASMS390X_PGTABLE_H_ */
lib/s390x/mmu.c +1 -13
@@ -29,18 +29,6 @@static pgd_t *table_root; -void configure_dat (int enable) -{ -uint64_t mask; - -if (enable) - mask =extract_psw_mask () |PSW_MASK_DAT ; -else - mask =extract_psw_mask () & ~PSW_MASK_DAT ; - -load_psw_mask (mask); -} -static void mmu_enable (pgd_t *pgtable) { const uint64_t asce = __pa(pgtable) | ASCE_DT_REGION1 |
@@ -51,7 +39,7 @@ static void mmu_enable(pgd_t *pgtable)assert (stctg (1 ) == asce);/* enable dat (primary == 0 set as default) */ -configure_dat (1 ); +enable_dat ();/* we can now also use DAT unconditionally in our PGM handler */ lowcore.pgm_new_psw.mask |=PSW_MASK_DAT ;
lib/s390x/sclp.c +1 -6
@@ -48,13 +48,8 @@ static void mem_init(phys_addr_t mem_end)void sclp_setup_int (void ) { -uint64_t mask; -ctl_set_bit (0 ,CTL0_SERVICE_SIGNAL ); - - mask =extract_psw_mask (); - mask |=PSW_MASK_EXT ; -load_psw_mask (mask); +psw_mask_set_bits (PSW_MASK_EXT ); }void sclp_handle_ext (void )
s390x/diag288.c +2 -4
@@ -78,16 +78,14 @@ static void test_priv(void)static void test_bite (void ) { -uint64_t mask, time; +uint64_t time;/* If watchdog doesn't bite, the cpu timer does */ asmvolatile ("stck %0" :"=Q" (time) : :"cc" ); time += (uint64_t )(16000 *1000 ) <<12 ; asmvolatile ("sckc %0" : :"Q" (time));ctl_set_bit (0 ,CTL0_CLOCK_COMPARATOR ); - mask =extract_psw_mask (); - mask |=PSW_MASK_EXT ; -load_psw_mask (mask); +psw_mask_set_bits (PSW_MASK_EXT );/* Arm watchdog */ lowcore.restart_new_psw.mask =extract_psw_mask () & ~PSW_MASK_EXT ;
s390x/selftest.c +2 -2
@@ -64,9 +64,9 @@ static void test_malloc(void)report (tmp != tmp2,"allocated memory addresses differ" );expect_pgm_int (); -configure_dat (0 ); +disable_dat (); *tmp =987654321 ; -configure_dat (1 ); +enable_dat ();check_pgm_int_code (PGM_INT_CODE_ADDRESSING );free (tmp);
s390x/skrf.c +3 -9
@@ -63,11 +63,9 @@ static void test_pfmf(void)static void test_psw_key (void ) { -uint64_t psw_mask =extract_psw_mask () |0xF0000000000000UL ; -report_prefix_push ("psw key" );expect_pgm_int (); -load_psw_mask (psw_mask); +psw_mask_set_bits (PSW_MASK_KEY );check_pgm_int_code (PGM_INT_CODE_SPECIAL_OPERATION );report_prefix_pop (); }
@@ -140,17 +138,13 @@ static void ecall_cleanup(void)/* Set a key into the external new psw mask and open external call masks */ static void ecall_setup (void ) { -uint64_t mask; -register_pgm_cleanup_func (ecall_cleanup);expect_pgm_int ();/* Put a skey into the ext new psw */ - lowcore.ext_new_psw.mask =0x00F0000000000000UL |PSW_MASK_64 ; + lowcore.ext_new_psw.mask =PSW_MASK_KEY |PSW_MASK_64 ;/* Open up ext masks */ ctl_set_bit (0 ,CTL0_EXTERNAL_CALL ); - mask =extract_psw_mask (); - mask |=PSW_MASK_EXT ; -load_psw_mask (mask); +psw_mask_set_bits (PSW_MASK_EXT );/* Tell cpu 0 that we're ready */ set_flag (1 ); }
s390x/smp.c +3 -15
@@ -288,13 +288,9 @@ static void test_set_prefix(void)static void ecall (void ) { -unsigned long mask; -expect_ext_int ();ctl_set_bit (0 ,CTL0_EXTERNAL_CALL ); - mask =extract_psw_mask (); - mask |=PSW_MASK_EXT ; -load_psw_mask (mask); +psw_mask_set_bits (PSW_MASK_EXT );set_flag (1 );while (lowcore.ext_int_code !=0x1202 ) {mb (); }report_pass ("received" );
@@ -321,13 +317,9 @@ static void test_ecall(void)static void emcall (void ) { -unsigned long mask; -expect_ext_int ();ctl_set_bit (0 ,CTL0_EMERGENCY_SIGNAL ); - mask =extract_psw_mask (); - mask |=PSW_MASK_EXT ; -load_psw_mask (mask); +psw_mask_set_bits (PSW_MASK_EXT );set_flag (1 );while (lowcore.ext_int_code !=0x1201 ) {mb (); }report_pass ("received" );
@@ -466,14 +458,10 @@ static void test_reset_initial(void)static void test_local_ints (void ) { -unsigned long mask; -/* Open masks for ecall and emcall */ ctl_set_bit (0 ,CTL0_EXTERNAL_CALL );ctl_set_bit (0 ,CTL0_EMERGENCY_SIGNAL ); - mask =extract_psw_mask (); - mask |=PSW_MASK_EXT ; -load_psw_mask (mask); +psw_mask_set_bits (PSW_MASK_EXT );set_flag (1 ); }
Signature · 1 line
2.36.1
PATCH v4 2/3 s390x: skey.c: rework the interrupt handler
In reply to Claudio ImbrendaThe skey test currently uses a cleanup function to work around the issues that arise when the lowcore is not mapped, since the interrupt handler needs to access it.
Instead of a cleanup function, simply disable DAT for the interrupt handler for the tests that remap page 0. This is needed in preparation of and upcoming patch that will cause the interrupt handler to read from lowcore before calling the cleanup function.
--- s390x/skey.c | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-)
s390x/skey.c +8 -15
@@ -250,19 +250,6 @@ static void set_prefix_key_1(uint32_t *prefix_ptr) ); } -/* -* We remapped page 0, making the lowcore inaccessible, which breaks the normal -* handler and breaks skipping the faulting instruction. -* Just disable dynamic address translation to make things work. -*/ -static void dat_fixup_pgm_int (void ) -{ -uint64_t psw_mask =extract_psw_mask (); - - psw_mask &= ~PSW_MASK_DAT ; -load_psw_mask (psw_mask); -} -#define PREFIX_AREA_SIZE (PAGE_SIZE * 2) static char lowcore_tmp[PREFIX_AREA_SIZE] __attribute__((aligned(PREFIX_AREA_SIZE)));
@@ -318,7 +305,13 @@ static void test_set_prefix(void)report (get_prefix () == old_prefix,"did not set prefix" );report_prefix_pop (); -register_pgm_cleanup_func (dat_fixup_pgm_int); +/* +* Page 0 will be remapped, making the lowcore inaccessible, which +* breaks the normal handler and breaks skipping the faulting +* instruction. Disable dynamic address translation for the +* interrupt handler to make things work. +*/ + lowcore.pgm_new_psw.mask &= ~PSW_MASK_DAT ;report_prefix_push ("remapped page, fetch protection" );set_prefix (old_prefix);
@@ -356,7 +349,7 @@ static void test_set_prefix(void)report_prefix_pop ();ctl_clear_bit (0 ,CTL0_FETCH_PROTECTION_OVERRIDE ); -register_pgm_cleanup_func (NULL ); + lowcore.pgm_new_psw.mask |=PSW_MASK_DAT ;report_prefix_pop ();set_storage_key (pagebuf,0x00 ,0 );report_prefix_pop ();
Signature · 1 line
2.36.1
PATCH v4 3/3 lib: s390x: better smp interrupt checks
In reply to Claudio ImbrendaUse per-CPU flags and callbacks for Program and Extern interrupts, instead of global variables.
This allows for more accurate error handling; a CPU waiting for an interrupt will not have it "stolen" by a different CPU that was not supposed to wait for one, and now two CPUs can wait for interrupts at the same time.
This will significantly improve error reporting and debugging when things go wrong.
Both program interrupts and external interrupts are now CPU-bound, even though some external interrupts are floating (notably, the SCLP interrupt). In those cases, the testcases should mask interrupts and/or expect them appropriately according to need.
--- lib/s390x/asm/arch_def.h | 17 ++++++++- lib/s390x/asm/interrupt.h | 3 +- lib/s390x/smp.h | 8 +--- lib/s390x/interrupt.c | 77 +++++++++++++++++++++++++++++++-------- lib/s390x/smp.c | 11 ++++++ s390x/skrf.c | 2 +- 6 files changed, 92 insertions(+), 26 deletions(-)
lib/s390x/asm/arch_def.h +16 -1
@@ -41,6 +41,18 @@ struct psw {uint64_t addr; }; +struct cpu { +struct lowcore *lowcore; +uint64_t *stack; +void (*pgm_cleanup_func)(struct stack_frame_int *); +void (*ext_cleanup_func)(struct stack_frame_int *); +uint16_t addr; +uint16_t idx; +bool active; +bool pgm_int_expected; +bool ext_int_expected; +}; +#define AS_PRIM 0#define AS_ACCR 1#define AS_SECN 2
@@ -125,7 +137,8 @@ struct lowcore {uint8_t pad_0x0280[0x0308 -0x0280 ];/* 0x0280 */ uint64_t sw_int_crs[16 ];/* 0x0308 */ struct psw sw_int_psw;/* 0x0388 */ -uint8_t pad_0x0310[0x11b0 -0x0398 ];/* 0x0398 */ +struct cpu * this_cpu;/* 0x0398 */ +uint8_t pad_0x03a0[0x11b0 -0x03a0 ];/* 0x03a0 */ uint64_t mcck_ext_sa_addr;/* 0x11b0 */ uint8_t pad_0x11b8[0x1200 -0x11b8 ];/* 0x11b8 */ uint64_t fprs_sa[16 ];/* 0x1200 */
@@ -148,6 +161,8 @@ _Static_assert(sizeof(struct lowcore) == 0x1900, "Lowcore size");extern struct lowcore lowcore; +#define THIS_CPU (lowcore.this_cpu) +#define PGM_INT_CODE_OPERATION 0x01#define PGM_INT_CODE_PRIVILEGED_OPERATION 0x02#define PGM_INT_CODE_EXECUTE 0x03
lib/s390x/asm/interrupt.h +2 -1
@@ -37,7 +37,8 @@ union teid { }; }; -void register_pgm_cleanup_func (void (*f)(void )); +void register_pgm_cleanup_func (void (*f)(struct stack_frame_int *)); +void register_ext_cleanup_func (void (*f)(struct stack_frame_int *));void handle_pgm_int (struct stack_frame_int *stack);void handle_ext_int (struct stack_frame_int *stack);void handle_mcck_int (void );
lib/s390x/smp.h +1 -7
@@ -12,13 +12,6 @@#include <asm/arch_def.h> -struct cpu { -struct lowcore *lowcore; -uint64_t *stack; -uint16_t addr; -bool active; -}; -struct cpu_status {uint64_t fprs[16 ];/* 0x0000 */ uint64_t grs[16 ];/* 0x0080 */
@@ -52,5 +45,6 @@ int smp_cpu_setup(uint16_t idx, struct psw psw);void smp_teardown (void );void smp_setup (void );int smp_sigp (uint16_t idx,uint8_t order,unsigned long parm,uint32_t *status); +struct lowcore *smp_get_lowcore (uint16_t idx);#endif
lib/s390x/interrupt.c +61 -16
140 lines not on this page · raw message
lib/s390x/smp.c +11 -0
@@ -39,6 +39,15 @@ int smp_query_num_cpus(void)return sclp_get_cpu_num (); } +struct lowcore *smp_get_lowcore (uint16_t idx) +{ +if (THIS_CPU ->idx == idx) +return &lowcore; + +check_idx (idx); +return cpus[idx].lowcore; +} +int smp_sigp (uint16_t idx,uint8_t order,unsigned long parm,uint32_t *status) {check_idx (idx);
@@ -253,6 +262,7 @@ static int smp_cpu_setup_nolock(uint16_t idx, struct psw psw)/* Copy all exception psws. */ memcpy (lc, cpus[0 ].lowcore,512 ); + lc->this_cpu = &cpus[idx];/* Setup stack */ cpus[idx].stack = (uint64_t *)alloc_pages (2 );
@@ -325,6 +335,7 @@ void smp_setup(void)for (i =0 ; i < num; i++) { cpus[i].addr = entry[i].address; cpus[i].active = false; + cpus[i].idx = i;/* * Fill in the boot CPU. If the boot CPU is not at index 0, * swap it with the one at index 0. This guarantees that the
s390x/skrf.c +1 -1
@@ -119,7 +119,7 @@ static void set_flag(int val)mb (); } -static void ecall_cleanup (void ) +static void ecall_cleanup (struct stack_frame_int *stack) { lowcore.ext_new_psw.mask =PSW_MASK_64 ; lowcore.sw_int_crs[0 ] =BIT_ULL (CTL0_AFP );
Signature · 1 line
2.36.1
Re: [kvm-unit-tests PATCH v4 3/3] lib: s390x: better smp interrupt checks
Quoted 11 lines · Claudio Imbrenda
Use per-CPU flags and callbacks for Program and Extern interrupts, instead of global variables.
This allows for more accurate error handling; a CPU waiting for an interrupt will not have it "stolen" by a different CPU that was not supposed to wait for one, and now two CPUs can wait for interrupts at the same time.
This will significantly improve error reporting and debugging when things go wrong.
Quoted 6 lines
Both program interrupts and external interrupts are now CPU-bound, even though some external interrupts are floating (notably, the SCLP interrupt). In those cases, the testcases should mask interrupts and/or expect them appropriately according to need.
Signed-off-by Claudio Imbrenda <[email protected]>
Small nit below
Quoted 33 lines
--- lib/s390x/asm/arch_def.h | 17 ++++++++- lib/s390x/asm/interrupt.h | 3 +- lib/s390x/smp.h | 8 +--- lib/s390x/interrupt.c | 77 +++++++++++++++++++++++++++++++-------- lib/s390x/smp.c | 11 ++++++ s390x/skrf.c | 2 +- 6 files changed, 92 insertions(+), 26 deletions(-)lib/s390x/asm/arch_def.h +12
-0@@ -41,6 +41,18 @@ struct psw {uint64_t addr; }; +struct cpu { +struct lowcore *lowcore; +uint64_t *stack; +void (*pgm_cleanup_func)(struct stack_frame_int *); +void (*ext_cleanup_func)(struct stack_frame_int *); +uint16_t addr; +uint16_t idx; +bool active; +bool pgm_int_expected; +bool ext_int_expected; +}; +#define AS_PRIM 0#define AS_ACCR 1#define AS_SECN 2
lib/s390x/asm/arch_def.h struct lowcore { · line 140
Quoted 5 lines
lib/s390x/asm/arch_def.h +1
-1@@ -125,7 +137,8 @@ struct lowcore {uint8_t pad_0x0280[0x0308 -0x0280 ];/* 0x0280 */ uint64_t sw_int_crs[16 ];/* 0x0308 */ struct psw sw_int_psw;/* 0x0388 */ -uint8_t pad_0x0310[0x11b0 -0x0398 ];/* 0x0398 */ +struct cpu * this_cpu;/* 0x0398 */
Move the * to the variable name
Quoted 5 lines
lib/s390x/asm/arch_def.h +1
-0+uint8_t pad_0x03a0[0x11b0 -0x03a0 ];/* 0x03a0 */ uint64_t mcck_ext_sa_addr;/* 0x11b0 */ uint8_t pad_0x11b8[0x1200 -0x11b8 ];/* 0x11b8 */ uint64_t fprs_sa[16 ];/* 0x1200 */ @@ -148,6 +161,8 @@ _Static_assert(sizeof(struct lowcore) == 0x1900, "Lowcore size");