s390x: Cleanup exception register save/restore and implement backtrace
v3 cover s390x: Cleanup exception register save/restore and implement backtrace
Having two sets of macros for saving and restoring registers on exceptions doesn't seem optimal to me. Therefore this patch set removes the old macros that use the lowcore as storage in favor of the stack using ones. At the same time we move over to generated offsets instead of subtracting from the stack piece by piece. Changes to the stack struct are easier that way.
Additionally let's add backtrace support and print the GRs on exception so we get a bit more information when something goes wrong.
v3:
* Squashed the STACK_FRAME_INT_SIZE definition patch
* Added a backchain store before we branch to the C pgm handler
* Switched to the *int*_t types from kernel style types
* Added comments
v2:
* Added full CR saving to fix diag308 test
* Added rev-bys
Janosch Frank (7):
s390x: Fix fpc store address in RESTORE_REGS_STACK
s390x: Fully commit to stack save area for exceptions
s390x: Introduce and use CALL_INT_HANDLER macro
s390x: Provide preliminary backtrace support
s390x: Print more information on program exceptions
s390x: Move diag308_load_reset to stack saving
s390x: Remove SAVE/RESTORE_STACK and lowcore fpc and fprs save areas
lib/s390x/asm-offsets.c | 17 ++++--- lib/s390x/asm/arch_def.h | 35 ++++++++++---- lib/s390x/asm/interrupt.h | 4 +- lib/s390x/interrupt.c | 43 +++++++++++++++--- lib/s390x/stack.c | 20 +++++--- s390x/Makefile | 1 + s390x/cpu.S | 6 ++- s390x/cstart64.S | 25 ++-------- s390x/macros.S | 96 ++++++++++++++++++++------------------- 9 files changed, 148 insertions(+), 99 deletions(-)
Signature · 1 line
2.25.1
PATCH v3 1/7 s390x: Fix fpc store address in RESTORE_REGS_STACK
The efpc stores in bits 32-63 of a register and we store a full 8 bytes to have the stack 8 byte aligned. This means that the fpc is stored at offset 4 but we load it from offset 0. Lets replace efpc with stfpc and get rid of the stg to store at offset 0.
--- s390x/macros.S | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
s390x/macros.S +1 -2
@@ -54,8 +54,7 @@ .endr /* Save fpc, but keep stack aligned on 64bits */ slgfi %r15, 8 - efpc %r0 - stg %r0, 0(%r15) + stfpc 0(%r15) .endm /* Restore the register in reverse order */
Signature · 1 line
2.25.1
PATCH v3 2/7 s390x: Fully commit to stack save area for exceptions
In reply to Janosch FrankHaving two sets of macros for saving registers on exceptions makes maintaining harder. Also we have limited space in the lowcore to save stuff and by using the stack as a save area, we can stack exceptions.
So let's use the SAVE/RESTORE_REGS_STACK as the default. When we also move the diag308 macro over we can remove the old SAVE/RESTORE_REGS macros.
--- lib/s390x/asm-offsets.c | 15 ++++++++---- lib/s390x/asm/arch_def.h | 31 ++++++++++++++++++++----- lib/s390x/asm/interrupt.h | 4 ++-- lib/s390x/interrupt.c | 14 ++++++------ s390x/cstart64.S | 19 +++++++++------- s390x/macros.S | 48 +++++++++++++++++++++++---------------- 6 files changed, 85 insertions(+), 46 deletions(-)
lib/s390x/asm-offsets.c +11 -4
@@ -70,16 +70,23 @@ int main(void)OFFSET (GEN_LC_ARS_SA , lowcore, ars_sa);OFFSET (GEN_LC_CRS_SA , lowcore, crs_sa);OFFSET (GEN_LC_PGM_INT_TDB , lowcore, pgm_int_tdb); -OFFSET (__SF_SIE_CONTROL, stack_frame, empty1[0 ]); -OFFSET (__SF_SIE_SAVEAREA, stack_frame, empty1[1 ]); -OFFSET (__SF_SIE_REASON, stack_frame, empty1[2 ]); -OFFSET (__SF_SIE_FLAGS, stack_frame, empty1[3 ]); +OFFSET (__SF_SIE_CONTROL, stack_frame, argument_area[0 ]); +OFFSET (__SF_SIE_SAVEAREA, stack_frame, argument_area[1 ]); +OFFSET (__SF_SIE_REASON, stack_frame, argument_area[2 ]); +OFFSET (__SF_SIE_FLAGS, stack_frame, argument_area[3 ]);OFFSET (SIE_SAVEAREA_HOST_GRS , vm_save_area, host.grs[0 ]);OFFSET (SIE_SAVEAREA_HOST_FPRS , vm_save_area, host.fprs[0 ]);OFFSET (SIE_SAVEAREA_HOST_FPC , vm_save_area, host.fpc);OFFSET (SIE_SAVEAREA_GUEST_GRS , vm_save_area, guest.grs[0 ]);OFFSET (SIE_SAVEAREA_GUEST_FPRS , vm_save_area, guest.fprs[0 ]);OFFSET (SIE_SAVEAREA_GUEST_FPC , vm_save_area, guest.fpc); +OFFSET (STACK_FRAME_INT_BACKCHAIN , stack_frame_int, back_chain); +OFFSET (STACK_FRAME_INT_FPC , stack_frame_int, fpc); +OFFSET (STACK_FRAME_INT_FPRS , stack_frame_int, fprs); +OFFSET (STACK_FRAME_INT_CRS , stack_frame_int, crs); +OFFSET (STACK_FRAME_INT_GRS0 , stack_frame_int, grs0); +OFFSET (STACK_FRAME_INT_GRS1 , stack_frame_int, grs1); +DEFINE (STACK_FRAME_INT_SIZE ,sizeof (struct stack_frame_int ));return 0 ; }
lib/s390x/asm/arch_def.h +25 -6
@@ -8,13 +8,32 @@#ifndef _ASM_S390X_ARCH_DEF_H_#define _ASM_S390X_ARCH_DEF_H_ -/* -* We currently only specify the stack frame members needed for the -* SIE library code. -*/ struct stack_frame { -unsigned long back_chain; -unsigned long empty1[5 ]; +struct stack_frame *back_chain; +uint64_t reserved; +/* GRs 2 - 5 */ +uint64_t argument_area[4 ]; +/* GRs 6 - 15 */ +uint64_t grs[10 ]; +/* FPRs 0, 2, 4, 6 */ +int64_t fprs[4 ]; +}; + +struct stack_frame_int { +struct stack_frame *back_chain; +uint64_t reserved; +/* +* The GRs are offset compatible with struct stack_frame so we +* can easily fetch GR14 for backtraces. +*/ +/* GRs 2 - 15 */ +uint64_t grs0[14 ]; +/* GRs 0 and 1 */ +uint64_t grs1[2 ]; +uint32_t reserved1; +uint32_t fpc; +uint64_t fprs[16 ]; +uint64_t crs[16 ]; }; struct psw {
lib/s390x/asm/interrupt.h +2 -2
@@ -14,8 +14,8 @@#define EXT_IRQ_SERVICE_SIG 0x2401void register_pgm_cleanup_func (void (*f)(void )); -void handle_pgm_int (void ); -void handle_ext_int (void ); +void handle_pgm_int (struct stack_frame_int *stack); +void handle_ext_int (struct stack_frame_int *stack);void handle_mcck_int (void );void handle_io_int (void );void handle_svc_int (void );
lib/s390x/interrupt.c +7 -7
@@ -56,7 +56,7 @@ void register_pgm_cleanup_func(void (*f)(void)) pgm_cleanup_func = f; } -static void fixup_pgm_int (void ) +static void fixup_pgm_int (struct stack_frame_int *stack) {/* If we have an error on SIE we directly move to sie_exit */ if (lc->pgm_old_psw.addr >= (uint64_t)&sie_entry &&
@@ -76,7 +76,7 @@ static void fixup_pgm_int(void)/* Handling for iep.c test case. */ if (lc->trans_exc_id &0x80UL && lc->trans_exc_id &0x04UL && !(lc->trans_exc_id &0x08UL )) - lc->pgm_old_psw.addr = lc->sw_int_grs[14 ]; + lc->pgm_old_psw.addr = stack->grs0[12 ];break ;case PGM_INT_CODE_SEGMENT_TRANSLATION :case PGM_INT_CODE_PAGE_TRANSLATION :
@@ -115,7 +115,7 @@ static void fixup_pgm_int(void)/* suppressed/terminated/completed point already at the next address */ } -void handle_pgm_int (void ) +void handle_pgm_int (struct stack_frame_int *stack) {if (!pgm_int_expected) {/* Force sclp_busy to false, otherwise we will loop forever */
@@ -130,10 +130,10 @@ void handle_pgm_int(void)if (pgm_cleanup_func) (*pgm_cleanup_func)();else -fixup_pgm_int (); +fixup_pgm_int (stack); } -void handle_ext_int (void ) +void handle_ext_int (struct stack_frame_int *stack) {if (!ext_int_expected && lc->ext_int_code !=EXT_IRQ_SERVICE_SIG ) {
@@ -143,13 +143,13 @@ void handle_ext_int(void) }if (lc->ext_int_code ==EXT_IRQ_SERVICE_SIG ) { - lc->sw_int_crs[0 ] &= ~(1UL <<9 ); + stack->crs[0 ] &= ~(1UL <<9 );sclp_handle_ext (); }else { ext_int_expected = false; } -if (!(lc->sw_int_crs[0 ] &CR0_EXTM_MASK )) +if (!(stack->crs[0 ] &CR0_EXTM_MASK )) lc->ext_old_psw.mask &= ~PSW_MASK_EXT ; }
s390x/cstart64.S +11 -8
@@ -92,33 +92,36 @@ memsetxc: .section .text pgm_int: - SAVE_REGS + SAVE_REGS_STACK + lgr %r2, %r15 brasl %r14, handle_pgm_int - RESTORE_REGS + RESTORE_REGS_STACK lpswe GEN_LC_PGM_OLD_PSW ext_int: - SAVE_REGS + SAVE_REGS_STACK + lgr %r2, %r15 brasl %r14, handle_ext_int - RESTORE_REGS + RESTORE_REGS_STACK lpswe GEN_LC_EXT_OLD_PSW mcck_int: - SAVE_REGS + SAVE_REGS_STACK brasl %r14, handle_mcck_int - RESTORE_REGS + RESTORE_REGS_STACK lpswe GEN_LC_MCCK_OLD_PSW io_int: SAVE_REGS_STACK + lgr %r2, %r15 brasl %r14, handle_io_int RESTORE_REGS_STACK lpswe GEN_LC_IO_OLD_PSW svc_int: - SAVE_REGS + SAVE_REGS_STACK brasl %r14, handle_svc_int - RESTORE_REGS + RESTORE_REGS_STACK lpswe GEN_LC_SVC_OLD_PSW .align 8
s390x/macros.S +29 -19
74 lines not on this page · raw message
Signature · 1 line
2.25.1
Re: [kvm-unit-tests PATCH v3 2/7] s390x: Fully commit to stack save area for exceptions
Quoted 11 lines · Janosch Frank
Having two sets of macros for saving registers on exceptions makes maintaining harder. Also we have limited space in the lowcore to save stuff and by using the stack as a save area, we can stack exceptions.
So let's use the SAVE/RESTORE_REGS_STACK as the default. When we also move the diag308 macro over we can remove the old SAVE/RESTORE_REGS macros.
Signed-off-by Janosch Frank <[email protected]>Reviewed-by Claudio Imbrenda <[email protected]>---
[...]
Quoted 5 lines
lib/s390x/asm/interrupt.h +0
-0
lib/s390x/asm/interrupt.h line 20
Quoted 9 lines
lib/s390x/asm/interrupt.h +2
-2@@ -14,8 +14,8 @@#define EXT_IRQ_SERVICE_SIG 0x2401void register_pgm_cleanup_func (void (*f)(void )); -void handle_pgm_int (void ); -void handle_ext_int (void ); +void handle_pgm_int (struct stack_frame_int *stack); +void handle_ext_int (struct stack_frame_int *stack);void handle_mcck_int (void );void handle_io_int (void );
So handle_io_int() does not get a *stack parameter here...
Quoted 15 lines
lib/s390x/asm/interrupt.h +0
-0void handle_svc_int (void );lib/s390x/interrupt.c +1
-1@@ -56,7 +56,7 @@ void register_pgm_cleanup_func(void (*f)(void)) pgm_cleanup_func = f; } -static void fixup_pgm_int (void ) +static void fixup_pgm_int (struct stack_frame_int *stack) {/* If we have an error on SIE we directly move to sie_exit */ if (lc->pgm_old_psw.addr >= (uint64_t)&sie_entry &&
lib/s390x/interrupt.c static void fixup_pgm_int(void) · line 79
Quoted 5 lines
lib/s390x/interrupt.c +1
-1@@ -76,7 +76,7 @@ static void fixup_pgm_int(void)/* Handling for iep.c test case. */ if (lc->trans_exc_id &0x80UL && lc->trans_exc_id &0x04UL && !(lc->trans_exc_id &0x08UL )) - lc->pgm_old_psw.addr = lc->sw_int_grs[14 ]; + lc->pgm_old_psw.addr = stack->grs0[12 ];
I'd maybe put a "/* GR14 */" comment at the end of the line, to make it more obvious which register we're aiming here at.
Quoted 67 lines
lib/s390x/interrupt.c +5
-5break ;case PGM_INT_CODE_SEGMENT_TRANSLATION :case PGM_INT_CODE_PAGE_TRANSLATION :@@ -115,7 +115,7 @@ static void fixup_pgm_int(void)/* suppressed/terminated/completed point already at the next address */ } -void handle_pgm_int (void ) +void handle_pgm_int (struct stack_frame_int *stack) {if (!pgm_int_expected) {/* Force sclp_busy to false, otherwise we will loop forever */ @@ -130,10 +130,10 @@ void handle_pgm_int(void)if (pgm_cleanup_func) (*pgm_cleanup_func)();else -fixup_pgm_int (); +fixup_pgm_int (stack); } -void handle_ext_int (void ) +void handle_ext_int (struct stack_frame_int *stack) {if (!ext_int_expected && lc->ext_int_code !=EXT_IRQ_SERVICE_SIG ) {@@ -143,13 +143,13 @@ void handle_ext_int(void) }if (lc->ext_int_code ==EXT_IRQ_SERVICE_SIG ) { - lc->sw_int_crs[0 ] &= ~(1UL <<9 ); + stack->crs[0 ] &= ~(1UL <<9 );sclp_handle_ext (); }else { ext_int_expected = false; } -if (!(lc->sw_int_crs[0 ] &CR0_EXTM_MASK )) +if (!(stack->crs[0 ] &CR0_EXTM_MASK )) lc->ext_old_psw.mask &= ~PSW_MASK_EXT ; }s390x/cstart64.S +6
-4@@ -92,33 +92,36 @@ memsetxc: .section .text pgm_int: - SAVE_REGS + SAVE_REGS_STACK + lgr %r2, %r15 brasl %r14, handle_pgm_int - RESTORE_REGS + RESTORE_REGS_STACK lpswe GEN_LC_PGM_OLD_PSW ext_int: - SAVE_REGS + SAVE_REGS_STACK + lgr %r2, %r15 brasl %r14, handle_ext_int - RESTORE_REGS + RESTORE_REGS_STACK lpswe GEN_LC_EXT_OLD_PSW mcck_int:
s390x/cstart64.S memsetxc: · line 116
Quoted 10 lines
s390x/cstart64.S +3
-2- SAVE_REGS + SAVE_REGS_STACK brasl %r14, handle_mcck_int - RESTORE_REGS + RESTORE_REGS_STACK lpswe GEN_LC_MCCK_OLD_PSW io_int: SAVE_REGS_STACK + lgr %r2, %r15
... and here you're passing the stack pointer as a parameter, though handle_io_int() does not use it... well, ok, it gets reworked again in the next patch, but maybe you could still remove the above line when picking up the patch?
Anyway:
Re: [kvm-unit-tests PATCH v3 2/7] s390x: Fully commit to stack save area for exceptions
Quoted 39 lines · Thomas Huth
Quoted 11 lines · Janosch Frank
Having two sets of macros for saving registers on exceptions makes maintaining harder. Also we have limited space in the lowcore to save stuff and by using the stack as a save area, we can stack exceptions.
So let's use the SAVE/RESTORE_REGS_STACK as the default. When we also move the diag308 macro over we can remove the old SAVE/RESTORE_REGS macros.
Signed-off-by Janosch Frank <[email protected]>Reviewed-by Claudio Imbrenda <[email protected]>---
[...]
Quoted 5 lines
lib/s390x/asm/interrupt.h +0
-0lib/s390x/asm/interrupt.h line 20
Quoted 9 lines
lib/s390x/asm/interrupt.h +2
-2@@ -14,8 +14,8 @@#define EXT_IRQ_SERVICE_SIG 0x2401void register_pgm_cleanup_func (void (*f)(void )); -void handle_pgm_int (void ); -void handle_ext_int (void ); +void handle_pgm_int (struct stack_frame_int *stack); +void handle_ext_int (struct stack_frame_int *stack);void handle_mcck_int (void );void handle_io_int (void );So
handle_io_int()does not get a *stack parameter here...Quoted 9 lines
lib/s390x/asm/interrupt.h +0
-0void handle_svc_int (void );lib/s390x/interrupt.c +0
-0@@ -56,7 +56,7 @@ void register_pgm_cleanup_func(void (*f)(void)) pgm_cleanup_func = f; }
Quoted 14 lines
lib/s390x/interrupt.c static void fixup_pgm_int(void) · line 79
Quoted 11 lines
lib/s390x/interrupt.c +2
-2-static void fixup_pgm_int (void ) +static void fixup_pgm_int (struct stack_frame_int *stack) {/* If we have an error on SIE we directly move to sie_exit */ if (lc->pgm_old_psw.addr >= (uint64_t)&sie_entry &&@@ -76,7 +76,7 @@ static void fixup_pgm_int(void)/* Handling for iep.c test case. */ if (lc->trans_exc_id &0x80UL && lc->trans_exc_id &0x04UL && !(lc->trans_exc_id &0x08UL )) - lc->pgm_old_psw.addr = lc->sw_int_grs[14 ]; + lc->pgm_old_psw.addr = stack->grs0[12 ];I'd maybe put a "/* GR14 */" comment at the end of the line, to make it more obvious which register we're aiming here at.
Will do although I'd like to extend it a bit:
/*
* We branched to the instruction that caused
* the exception so we can use the return
* address in GR14 to jump back and continue
* executing test code.
*/
Quoted 75 lines
Quoted 75 lines
lib/s390x/interrupt.c +5
-5break ;case PGM_INT_CODE_SEGMENT_TRANSLATION :case PGM_INT_CODE_PAGE_TRANSLATION :@@ -115,7 +115,7 @@ static void fixup_pgm_int(void)/* suppressed/terminated/completed point already at the next address */ } -void handle_pgm_int (void ) +void handle_pgm_int (struct stack_frame_int *stack) {if (!pgm_int_expected) {/* Force sclp_busy to false, otherwise we will loop forever */ @@ -130,10 +130,10 @@ void handle_pgm_int(void)if (pgm_cleanup_func) (*pgm_cleanup_func)();else -fixup_pgm_int (); +fixup_pgm_int (stack); } -void handle_ext_int (void ) +void handle_ext_int (struct stack_frame_int *stack) {if (!ext_int_expected && lc->ext_int_code !=EXT_IRQ_SERVICE_SIG ) {@@ -143,13 +143,13 @@ void handle_ext_int(void) }if (lc->ext_int_code ==EXT_IRQ_SERVICE_SIG ) { - lc->sw_int_crs[0 ] &= ~(1UL <<9 ); + stack->crs[0 ] &= ~(1UL <<9 );sclp_handle_ext (); }else { ext_int_expected = false; } -if (!(lc->sw_int_crs[0 ] &CR0_EXTM_MASK )) +if (!(stack->crs[0 ] &CR0_EXTM_MASK )) lc->ext_old_psw.mask &= ~PSW_MASK_EXT ; }s390x/cstart64.S +8
-6@@ -92,33 +92,36 @@ memsetxc: .section .text pgm_int: - SAVE_REGS + SAVE_REGS_STACK + lgr %r2, %r15 brasl %r14, handle_pgm_int - RESTORE_REGS + RESTORE_REGS_STACK lpswe GEN_LC_PGM_OLD_PSW ext_int: - SAVE_REGS + SAVE_REGS_STACK + lgr %r2, %r15 brasl %r14, handle_ext_int - RESTORE_REGS + RESTORE_REGS_STACK lpswe GEN_LC_EXT_OLD_PSW mcck_int: - SAVE_REGS + SAVE_REGS_STACK brasl %r14, handle_mcck_int - RESTORE_REGS + RESTORE_REGS_STACK lpswe GEN_LC_MCCK_OLD_PSW
Quoted 8 lines
s390x/cstart64.S memsetxc: · line 116
Quoted 3 lines
s390x/cstart64.S +1
-0io_int: SAVE_REGS_STACK + lgr %r2, %r15... and here you're passing the stack pointer as a parameter, though
handle_io_int()does not use it... well, ok, it gets reworked again in the next patch, but maybe you could still remove the above line when picking up the patch?
Sure, I just fixed that up
Quoted 4 lines
Anyway:
Acked-by Thomas Huth <[email protected]>
Thanks!
PATCH v3 3/7 s390x: Introduce and use CALL_INT_HANDLER macro
In reply to Janosch FrankThe ELF ABI dictates that we need to allocate 160 bytes of stack space for the C functions we're calling. Since we would need to do that for every interruption handler which, combined with the new stack argument being saved in GR2, makes cstart64.S look a bit messy.
So let's introduce the CALL_INT_HANDLER macro that handles all of that, calls the C interrupt handler and handles cleanup afterwards.
--- s390x/cstart64.S | 28 +++++----------------------- s390x/macros.S | 17 +++++++++++++++++ 2 files changed, 22 insertions(+), 23 deletions(-)
s390x/cstart64.S +5 -23
@@ -92,37 +92,19 @@ memsetxc: .section .text pgm_int: - SAVE_REGS_STACK - lgr %r2, %r15 - brasl %r14, handle_pgm_int - RESTORE_REGS_STACK - lpswe GEN_LC_PGM_OLD_PSW + CALL_INT_HANDLER handle_pgm_int, GEN_LC_PGM_OLD_PSW ext_int: - SAVE_REGS_STACK - lgr %r2, %r15 - brasl %r14, handle_ext_int - RESTORE_REGS_STACK - lpswe GEN_LC_EXT_OLD_PSW + CALL_INT_HANDLER handle_ext_int, GEN_LC_EXT_OLD_PSW mcck_int: - SAVE_REGS_STACK - brasl %r14, handle_mcck_int - RESTORE_REGS_STACK - lpswe GEN_LC_MCCK_OLD_PSW + CALL_INT_HANDLER handle_mcck_int, GEN_LC_MCCK_OLD_PSW io_int: - SAVE_REGS_STACK - lgr %r2, %r15 - brasl %r14, handle_io_int - RESTORE_REGS_STACK - lpswe GEN_LC_IO_OLD_PSW + CALL_INT_HANDLER handle_io_int, GEN_LC_IO_OLD_PSW svc_int: - SAVE_REGS_STACK - brasl %r14, handle_svc_int - RESTORE_REGS_STACK - lpswe GEN_LC_SVC_OLD_PSW + CALL_INT_HANDLER handle_svc_int, GEN_LC_SVC_OLD_PSW .align 8 initial_psw:
s390x/macros.S +17 -0
@@ -11,6 +11,23 @@ * David Hildenbrand <[email protected]> */ #include <asm/asm-offsets.h> +/* + * Exception handler macro that saves registers on the stack, + * allocates stack space and calls the C handler function. Afterwards + * we re-load the registers and load the old PSW. + */ + .macro CALL_INT_HANDLER c_func, old_psw + SAVE_REGS_STACK + /* Save the stack address in GR2 which is the first function argument */ + lgr %r2, %r15 + /* Allocate stack space for called C function, as specified in s390 ELF ABI */ + slgfi %r15, 160 + brasl %r14, \c_func + algfi %r15, 160 + RESTORE_REGS_STACK + lpswe \old_psw + .endm + .macro SAVE_REGS /* save grs 0-15 */ stmg %r0, %r15, GEN_LC_SW_INT_GRS
Signature · 1 line
2.25.1
Re: [kvm-unit-tests PATCH v3 3/7] s390x: Introduce and use CALL_INT_HANDLER macro
Quoted 10 lines · On Mon, 22 Feb 2021 03:57:52 -0500 Janosch Frank <[email protected]> wrote:
The ELF ABI dictates that we need to allocate 160 bytes of stack space for the C functions we're calling. Since we would need to do that for every interruption handler which, combined with the new stack argument being saved in GR2, makes
cstart64.Slook a bit messy.So let's introduce the
CALL_INT_HANDLERmacro that handles all of that, calls the C interrupt handler and handles cleanup afterwards.Signed-off-by Janosch Frank <[email protected]>Reviewed-by Thomas Huth <[email protected]>
Quoted 82 lines
--- s390x/cstart64.S | 28 +++++----------------------- s390x/macros.S | 17 +++++++++++++++++ 2 files changed, 22 insertions(+), 23 deletions(-)s390x/cstart64.S +5
-23@@ -92,37 +92,19 @@ memsetxc: .section .text pgm_int: - SAVE_REGS_STACK - lgr %r2, %r15 - brasl %r14, handle_pgm_int - RESTORE_REGS_STACK - lpswe GEN_LC_PGM_OLD_PSW + CALL_INT_HANDLER handle_pgm_int, GEN_LC_PGM_OLD_PSW ext_int: - SAVE_REGS_STACK - lgr %r2, %r15 - brasl %r14, handle_ext_int - RESTORE_REGS_STACK - lpswe GEN_LC_EXT_OLD_PSW + CALL_INT_HANDLER handle_ext_int, GEN_LC_EXT_OLD_PSW mcck_int: - SAVE_REGS_STACK - brasl %r14, handle_mcck_int - RESTORE_REGS_STACK - lpswe GEN_LC_MCCK_OLD_PSW + CALL_INT_HANDLER handle_mcck_int, GEN_LC_MCCK_OLD_PSW io_int: - SAVE_REGS_STACK - lgr %r2, %r15 - brasl %r14, handle_io_int - RESTORE_REGS_STACK - lpswe GEN_LC_IO_OLD_PSW + CALL_INT_HANDLER handle_io_int, GEN_LC_IO_OLD_PSW svc_int: - SAVE_REGS_STACK - brasl %r14, handle_svc_int - RESTORE_REGS_STACK - lpswe GEN_LC_SVC_OLD_PSW + CALL_INT_HANDLER handle_svc_int, GEN_LC_SVC_OLD_PSW .align 8 initial_psw:s390x/macros.S +8
-0@@ -11,6 +11,23 @@ * David Hildenbrand <[email protected]> */ #include <asm/asm-offsets.h> +/* + * Exception handler macro that saves registers on the stack, + * allocates stack space and calls the C handler function. Afterwards + * we re-load the registers and load the old PSW. + */ + .macro CALL_INT_HANDLER c_func, old_psw + SAVE_REGS_STACK + /* Save the stack address in GR2 which is the first functionargument */
s390x/macros.S +2
-0+ lgr %r2, %r15 + /* Allocate stack space for called C function, as specifiedin s390 ELF ABI */
s390x/macros.S +7
-0+ slgfi %r15, 160 + brasl %r14, \c_func + algfi %r15, 160 + RESTORE_REGS_STACK + lpswe \old_psw + .endm + .macro SAVE_REGS /* save grs 0-15 */ stmg %r0, %r15, GEN_LC_SW_INT_GRS
PATCH v3 4/7 s390x: Provide preliminary backtrace support
In reply to Janosch FrankAfter the stack changes we can finally use -mbackchain and have a working backtrace.
--- lib/s390x/stack.c | 20 ++++++++++++++------ s390x/Makefile | 1 + s390x/macros.S | 5 +++++ 3 files changed, 20 insertions(+), 6 deletions(-)
lib/s390x/stack.c +14 -6
@@ -3,24 +3,32 @@* s390x stack implementation * * Copyright (c) 2017 Red Hat Inc +* Copyright 2021 IBM Corp * * Authors: * Thomas Huth <[email protected]> * David Hildenbrand <[email protected]> +* Janosch Frank <[email protected]> */ #include <libcflat.h> #include <stack.h> +#include <asm/arch_def.h> int backtrace_frame (const void *frame,const void **return_addrs,int max_depth) { -printf ("TODO: Implement backtrace_frame(%p, %p, %d) function!\n" , - frame, return_addrs, max_depth); -return 0 ; +int depth =0 ; +struct stack_frame *stack = (struct stack_frame *)frame; + +for (depth =0 ; stack && depth < max_depth; depth++) { + return_addrs[depth] = (void *)stack->grs[8 ]; + stack = stack->back_chain; + } + +return depth; }int backtrace (const void **return_addrs,int max_depth) { -printf ("TODO: Implement backtrace(%p, %d) function!\n" , - return_addrs, max_depth); -return 0 ; +return backtrace_frame (__builtin_frame_address (0 ), + return_addrs, max_depth); }
s390x/Makefile +1 -0
@@ -39,6 +39,7 @@ CFLAGS += -ffreestanding CFLAGS += -I $(SRCDIR)/lib -I $(SRCDIR)/lib/s390x -I lib CFLAGS += -O2 CFLAGS += -march=zEC12 +CFLAGS += -mbackchain CFLAGS += -fno-delete-null-pointer-checks LDFLAGS += -nostdlib -Wl,--build-id=none
s390x/macros.S +5 -0
@@ -22,6 +22,11 @@ lgr %r2, %r15 /* Allocate stack space for called C function, as specified in s390 ELF ABI */ slgfi %r15, 160 + /* + * Save the address of the interrupt stack into the back chain + * of the called function. + */ + stg %r2, STACK_FRAME_INT_BACKCHAIN(%r15) brasl %r14, \c_func algfi %r15, 160 RESTORE_REGS_STACK
Signature · 1 line
2.25.1
Re: [kvm-unit-tests PATCH v3 4/7] s390x: Provide preliminary backtrace support
Quoted 9 lines · Janosch Frank
After the stack changes we can finally use -mbackchain and have a working backtrace.
Signed-off-by Janosch Frank <[email protected]>--- lib/s390x/stack.c | 20 ++++++++++++++------ s390x/Makefile | 1 + s390x/macros.S | 5 +++++ 3 files changed, 20 insertions(+), 6 deletions(-)
Re: [kvm-unit-tests PATCH v3 4/7] s390x: Provide preliminary backtrace support
In reply to Janosch FrankQuoted 4 lines · On Mon, 22 Feb 2021 03:57:53 -0500 Janosch Frank <[email protected]> wrote:
After the stack changes we can finally use -mbackchain and have a working backtrace.
Signed-off-by Janosch Frank <[email protected]>
Quoted 79 lines
--- lib/s390x/stack.c | 20 ++++++++++++++------ s390x/Makefile | 1 + s390x/macros.S | 5 +++++ 3 files changed, 20 insertions(+), 6 deletions(-)lib/s390x/stack.c +14
-6@@ -3,24 +3,32 @@* s390x stack implementation * * Copyright (c) 2017 Red Hat Inc +* Copyright 2021 IBM Corp * * Authors: * Thomas Huth <[email protected]> * David Hildenbrand <[email protected]> +* Janosch Frank <[email protected]> */ #include <libcflat.h> #include <stack.h> +#include <asm/arch_def.h> int backtrace_frame (const void *frame,const void **return_addrs,int max_depth) { -printf ("TODO: Implement backtrace_frame(%p, %p, %d) function!\n", - frame, return_addrs, max_depth); -return 0 ; + int depth = 0; +struct stack_frame *stack = (struct stack_frame *)frame; + +for (depth =0 ; stack && depth < max_depth; depth++) { + return_addrs[depth] = (void *)stack->grs[8 ]; + stack = stack->back_chain; + } + +return depth; }int backtrace (const void **return_addrs,int max_depth) { -printf ("TODO: Implement backtrace(%p, %d) function!\n" , - return_addrs, max_depth); -return 0 ; +return backtrace_frame (__builtin_frame_address (0 ), + return_addrs, max_depth);}
s390x/Makefile +1
-0@@ -39,6 +39,7 @@ CFLAGS += -ffreestanding CFLAGS += -I $(SRCDIR)/lib -I $(SRCDIR)/lib/s390x -I lib CFLAGS += -O2 CFLAGS += -march=zEC12 +CFLAGS += -mbackchain CFLAGS += -fno-delete-null-pointer-checks LDFLAGS += -nostdlib -Wl,--build-id=nones390x/macros.S +0
-0@@ -22,6 +22,11 @@ lgr %r2, %r15 /* Allocate stack space for called C function, as specifiedin s390 ELF ABI */ slgfi %r15, 160
s390x/macros.S +2
-0+ /* + * Save the address of the interrupt stack into the backchain
s390x/macros.S +3
-0+ * of the called function. + */ + stg %r2, STACK_FRAME_INT_BACKCHAIN(%r15) brasl %r14, \c_func algfi %r15, 160 RESTORE_REGS_STACK
PATCH v3 5/7 s390x: Print more information on program exceptions
In reply to Janosch FrankCurrently we only get a single line of output if a test runs in a unexpected program exception. Let's also print the general registers to give soem more context.
--- lib/s390x/interrupt.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+)
lib/s390x/interrupt.c +29 -0
@@ -115,11 +115,40 @@ static void fixup_pgm_int(struct stack_frame_int *stack)/* suppressed/terminated/completed point already at the next address */ } +static void print_int_regs (struct stack_frame_int *stack) +{ +printf ("\n" ); +printf ("GPRS:\n" ); +printf ("%016lx %016lx %016lx %016lx\n" , + stack->grs1[0 ], stack->grs1[1 ], stack->grs0[0 ], stack->grs0[1 ]); +printf ("%016lx %016lx %016lx %016lx\n" , + stack->grs0[2 ], stack->grs0[3 ], stack->grs0[4 ], stack->grs0[5 ]); +printf ("%016lx %016lx %016lx %016lx\n" , + stack->grs0[6 ], stack->grs0[7 ], stack->grs0[8 ], stack->grs0[9 ]); +printf ("%016lx %016lx %016lx %016lx\n" , + stack->grs0[10 ], stack->grs0[11 ], stack->grs0[12 ], stack->grs0[13 ]); +printf ("\n" ); +} + +static void print_pgm_info (struct stack_frame_int *stack) + +{ +printf ("\n" ); +printf ("Unexpected program interrupt: %d on cpu %d at %#lx, ilen %d\n" , + lc->pgm_int_code,stap (), lc->pgm_old_psw.addr, + lc->pgm_int_id); +print_int_regs (stack); +dump_stack (); +report_summary (); +abort (); +} +void handle_pgm_int (struct stack_frame_int *stack) {if (!pgm_int_expected) {/* Force sclp_busy to false, otherwise we will loop forever */ sclp_handle_ext (); +print_pgm_info (stack);report_abort ("Unexpected program interrupt: %d on cpu %d at %#lx, ilen %d\n" , lc->pgm_int_code,stap (), lc->pgm_old_psw.addr, lc->pgm_int_id);
Signature · 1 line
2.25.1
Re: [kvm-unit-tests PATCH v3 5/7] s390x: Print more information on program exceptions
Quoted 3 lines · Janosch Frank
Currently we only get a single line of output if a test runs in a unexpected program exception. Let's also print the general registers to give soem more context.
s/soem/some/
With the typo fixed:
PATCH v3 6/7 s390x: Move diag308_load_reset to stack saving
In reply to Janosch FrankBy moving the last user of SAVE/RESTORE_REGS to the macros that use the stack we can finally remove these macros.
--- s390x/cpu.S | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
s390x/cpu.S +4 -2
@@ -18,7 +18,7 @@ */ .globl diag308_load_reset diag308_load_reset: - SAVE_REGS + SAVE_REGS_STACK /* Backup current PSW mask, as we have to restore it on success */ epsw %r0, %r1 st %r0, GEN_LC_SW_INT_PSW
@@ -31,6 +31,7 @@ diag308_load_reset: ogr %r0, %r1 /* Store it at the reset PSW location (real 0x0) */ stg %r0, 0 + stg %r15, GEN_LC_SW_INT_GRS + 15 * 8 /* Do the reset */ diag %r0,%r2,0x308 /* Failure path */
@@ -40,7 +41,8 @@ diag308_load_reset: /* load a cr0 that has the AFP control bit which enables all FPRs */ 0: larl %r1, initial_cr0 lctlg %c0, %c0, 0(%r1) - RESTORE_REGS + lg %r15, GEN_LC_SW_INT_GRS + 15 * 8 + RESTORE_REGS_STACK lhi %r2, 1 larl %r0, 1f stg %r0, GEN_LC_SW_INT_PSW + 8
Signature · 1 line
2.25.1
Re: [kvm-unit-tests PATCH v3 6/7] s390x: Move diag308_load_reset to stack saving
Quoted 33 lines · Janosch Frank
By moving the last user of SAVE/RESTORE_REGS to the macros that use the stack we can finally remove these macros.
Signed-off-by Janosch Frank <[email protected]>Reviewed-by Claudio Imbrenda <[email protected]>Reviewed-by Pierre Morel <[email protected]>--- s390x/cpu.S | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)s390x/cpu.S +2
-1@@ -18,7 +18,7 @@ */ .globl diag308_load_reset diag308_load_reset: - SAVE_REGS + SAVE_REGS_STACK /* Backup current PSW mask, as we have to restore it on success */ epsw %r0, %r1 st %r0, GEN_LC_SW_INT_PSW@@ -31,6 +31,7 @@ diag308_load_reset: ogr %r0, %r1 /* Store it at the reset PSW location (real 0x0) */ stg %r0, 0 + stg %r15, GEN_LC_SW_INT_GRS + 15 * 8 /* Do the reset */ diag %r0,%r2,0x308 /* Failure path */
s390x/cpu.S diag308_load_reset: · line 48
Quoted 9 lines
s390x/cpu.S +2
-1@@ -40,7 +41,8 @@ diag308_load_reset: /* load a cr0 that has the AFP control bit which enables all FPRs */ 0: larl %r1, initial_cr0 lctlg %c0, %c0, 0(%r1) - RESTORE_REGS + lg %r15, GEN_LC_SW_INT_GRS + 15 * 8 + RESTORE_REGS_STACK lhi %r2, 1 larl %r0, 1f stg %r0, GEN_LC_SW_INT_PSW + 8
PATCH v3 7/7 s390x: Remove SAVE/RESTORE_STACK and lowcore fpc and fprs save areas
In reply to Janosch FrankThere are no more users. At the same time remove sw_int_fpc and sw_int_frps plus their asm offsets macros since they are also unused now.
--- lib/s390x/asm-offsets.c | 2 -- lib/s390x/asm/arch_def.h | 4 +--- s390x/macros.S | 29 ----------------------------- 3 files changed, 1 insertion(+), 34 deletions(-)
lib/s390x/asm-offsets.c +0 -2
@@ -54,8 +54,6 @@ int main(void)OFFSET (GEN_LC_MCCK_NEW_PSW , lowcore, mcck_new_psw);OFFSET (GEN_LC_IO_NEW_PSW , lowcore, io_new_psw);OFFSET (GEN_LC_SW_INT_GRS , lowcore, sw_int_grs); -OFFSET (GEN_LC_SW_INT_FPRS , lowcore, sw_int_fprs); -OFFSET (GEN_LC_SW_INT_FPC , lowcore, sw_int_fpc);OFFSET (GEN_LC_SW_INT_CRS , lowcore, sw_int_crs);OFFSET (GEN_LC_SW_INT_PSW , lowcore, sw_int_psw);OFFSET (GEN_LC_MCCK_EXT_SA_ADDR , lowcore, mcck_ext_sa_addr);
lib/s390x/asm/arch_def.h +1 -3
@@ -103,9 +103,7 @@ struct lowcore {struct psw io_new_psw;/* 0x01f0 */ /* sw definition: save area for registers in interrupt handlers */ uint64_t sw_int_grs[16 ];/* 0x0200 */ -uint64_t sw_int_fprs[16 ];/* 0x0280 */ -uint32_t sw_int_fpc;/* 0x0300 */ -uint8_t pad_0x0304[0x0308 -0x0304 ];/* 0x0304 */ +uint8_t pad_0x0304[0x0308 -0x0280 ];/* 0x0280 */ uint64_t sw_int_crs[16 ];/* 0x0308 */ struct psw sw_int_psw;/* 0x0388 */ uint8_t pad_0x0310[0x11b0 -0x0398 ];/* 0x0398 */
s390x/macros.S +0 -29
@@ -33,35 +33,6 @@ lpswe \old_psw .endm - .macro SAVE_REGS - /* save grs 0-15 */ - stmg %r0, %r15, GEN_LC_SW_INT_GRS - /* save crs 0-15 */ - stctg %c0, %c15, GEN_LC_SW_INT_CRS - /* load a cr0 that has the AFP control bit which enables all FPRs */ - larl %r1, initial_cr0 - lctlg %c0, %c0, 0(%r1) - /* save fprs 0-15 + fpc */ - la %r1, GEN_LC_SW_INT_FPRS - .irp i, 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15 - std \i, \i * 8(%r1) - .endr - stfpc GEN_LC_SW_INT_FPC - .endm - - .macro RESTORE_REGS - /* restore fprs 0-15 + fpc */ - la %r1, GEN_LC_SW_INT_FPRS - .irp i, 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15 - ld \i, \i * 8(%r1) - .endr - lfpc GEN_LC_SW_INT_FPC - /* restore crs 0-15 */ - lctlg %c0, %c15, GEN_LC_SW_INT_CRS - /* restore grs 0-15 */ - lmg %r0, %r15, GEN_LC_SW_INT_GRS - .endm - /* Save registers on the stack (r15), so we can have stacked interrupts. */ .macro SAVE_REGS_STACK /* Allocate a full stack frame */
Signature · 1 line
2.25.1
Re: [kvm-unit-tests PATCH v3 7/7] s390x: Remove SAVE/RESTORE_STACK and lowcore fpc and fprs save areas
Quoted 31 lines · Janosch Frank
There are no more users. At the same time remove
sw_int_fpcandsw_int_frpsplus their asm offsets macros since they are also unused now.Signed-off-by Janosch Frank <[email protected]>Reviewed-by Claudio Imbrenda <[email protected]>Reviewed-by Pierre Morel <[email protected]>--- lib/s390x/asm-offsets.c | 2 -- lib/s390x/asm/arch_def.h | 4 +--- s390x/macros.S | 29 ----------------------------- 3 files changed, 1 insertion(+), 34 deletions(-)lib/s390x/asm-offsets.c +0
-2@@ -54,8 +54,6 @@ int main(void)OFFSET (GEN_LC_MCCK_NEW_PSW , lowcore, mcck_new_psw);OFFSET (GEN_LC_IO_NEW_PSW , lowcore, io_new_psw);OFFSET (GEN_LC_SW_INT_GRS , lowcore, sw_int_grs); -OFFSET (GEN_LC_SW_INT_FPRS , lowcore, sw_int_fprs); -OFFSET (GEN_LC_SW_INT_FPC , lowcore, sw_int_fpc);OFFSET (GEN_LC_SW_INT_CRS , lowcore, sw_int_crs);OFFSET (GEN_LC_SW_INT_PSW , lowcore, sw_int_psw);OFFSET (GEN_LC_MCCK_EXT_SA_ADDR , lowcore, mcck_ext_sa_addr);lib/s390x/asm/arch_def.h +0
-0
lib/s390x/asm/arch_def.h struct lowcore { · line 106
Quoted 7 lines
lib/s390x/asm/arch_def.h +1
-3@@ -103,9 +103,7 @@ struct lowcore {struct psw io_new_psw;/* 0x01f0 */ /* sw definition: save area for registers in interrupt handlers */ uint64_t sw_int_grs[16 ];/* 0x0200 */ -uint64_t sw_int_fprs[16 ];/* 0x0280 */ -uint32_t sw_int_fpc;/* 0x0300 */ -uint8_t pad_0x0304[0x0308 -0x0304 ];/* 0x0304 */ +uint8_t pad_0x0304[0x0308 -0x0280 ];/* 0x0280 */
Please rename to pad_0x280 now.
With that fixed: