s390x: Snippet fixes
v2 cover s390x: Snippet fixes
A small set of fixes mostly related to the snippet support and error management.
v2:
* Added basic linker script cleanups
* Changed alignment from 64k to 4k
* Added more comments
* Removed unneeded sections
* This patch set is a also preparation for a larger loader script change by Marc
Janosch Frank (7):
s390x: Cleanup flat.lds
s390x: snippets: c: Cleanup flat.lds
s390x: Add a linker script to assembly snippets
s390x: snippets: Fix SET_PSW_NEW_ADDR macro
lib: s390x: sie: Set guest memory pointer
s390x: Clear first stack frame and end backtrace early
lib: s390x: Handle debug prints for SIE exceptions correctly
lib/s390x/interrupt.c | 46 ++++++++++++++++++++++++++----
lib/s390x/sie.c | 1 +
lib/s390x/sie.h | 2 ++
lib/s390x/snippet.h | 3 +-
lib/s390x/stack.c | 2 ++
s390x/Makefile | 5 ++--
s390x/cpu.S | 6 ++--
s390x/cstart64.S | 2 ++
s390x/flat.lds | 19 +++---------
s390x/mvpg-sie.c | 2 +-
s390x/pv-diags.c | 6 ++--
s390x/snippets/{c => asm}/flat.lds | 39 +++++++++----------------
s390x/snippets/asm/macros.S | 2 +-
s390x/snippets/c/flat.lds | 28 ++++++------------
14 files changed, 87 insertions(+), 76 deletions(-)
copy s390x/snippets/{c => asm}/flat.lds (55%)Signature · 1 line
2.34.1
PATCH v2 1/7 s390x: Cleanup flat.lds
It seems like the loader file was copied over from another architecture which has a different page size (64K) than s390 (4K).
Let's use a 4k alignment instead of the 64k one and remove unneeded entries.
--- s390x/flat.lds | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-)
s390x/flat.lds +4 -15
@@ -24,20 +24,8 @@ SECTIONS *(.text) *(.text.*) } - . = ALIGN(64K); + . = ALIGN(4K); etext = .; - .opd : { *(.opd) } - . = ALIGN(16); - .dynamic : { - dynamic_start = .; - *(.dynamic) - } - .dynsym : { - dynsym_start = .; - *(.dynsym) - } - .rela.dyn : { *(.rela*) } - . = ALIGN(16); .data : { *(.data) *(.data.rel*)
@@ -48,10 +36,11 @@ SECTIONS __bss_start = .; .bss : { *(.bss) } __bss_end = .; - . = ALIGN(64K); + . = ALIGN(4K); edata = .; + /* Reserve 64K for the stack */ . += 64K; - . = ALIGN(64K); + . = ALIGN(4K); /* * stackptr set with initial stack frame preallocated */
Signature · 1 line
2.34.1
Re: [kvm-unit-tests PATCH v2 1/7] s390x: Cleanup flat.lds
Quoted 7 lines · On Thu, 12 Jan 2023 15:45:42 +0000 Janosch Frank <[email protected]> wrote:
It seems like the loader file was copied over from another architecture which has a different page size (64K) than s390 (4K).
Let's use a 4k alignment instead of the 64k one and remove unneeded entries.
Signed-off-by Janosch Frank <[email protected]>
Quoted 44 lines
--- s390x/flat.lds | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-)s390x/flat.lds +4
-15@@ -24,20 +24,8 @@ SECTIONS *(.text) *(.text.*) } - . = ALIGN(64K); + . = ALIGN(4K); etext = .; - .opd : { *(.opd) } - . = ALIGN(16); - .dynamic : { - dynamic_start = .; - *(.dynamic) - } - .dynsym : { - dynsym_start = .; - *(.dynsym) - } - .rela.dyn : { *(.rela*) } - . = ALIGN(16); .data : { *(.data) *(.data.rel*)@@ -48,10 +36,11 @@ SECTIONS __bss_start = .; .bss : { *(.bss) } __bss_end = .; - . = ALIGN(64K); + . = ALIGN(4K); edata = .; + /* Reserve 64K for the stack */ . += 64K; - . = ALIGN(64K); + . = ALIGN(4K); /* * stackptr set with initial stack frame preallocated */
PATCH v2 2/7 s390x: snippets: c: Cleanup flat.lds
In reply to Janosch FrankThere are a lot of things in there which we don't need for snippets and the alignments can be switched from 64K to 4K since that's the s390 page size.
--- s390x/snippets/c/flat.lds | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-)
s390x/snippets/c/flat.lds +9 -19
@@ -16,27 +16,22 @@ SECTIONS QUAD(0x0000000000004000) } . = 0x4000; + /* + * The stack grows down from 0x4000 to 0x2000, we pre-allocoate + * a frame via the -160. + */ stackptr = . - 160; stacktop = .; + /* Start text 0x4000 */ .text : { *(.init) *(.text) *(.text.*) } - . = ALIGN(64K); + . = ALIGN(4K); etext = .; - .opd : { *(.opd) } - . = ALIGN(16); - .dynamic : { - dynamic_start = .; - *(.dynamic) - } - .dynsym : { - dynsym_start = .; - *(.dynsym) - } - .rela.dyn : { *(.rela*) } - . = ALIGN(16); + /* End text */ + /* Start data */ .data : { *(.data) *(.data.rel*)
@@ -44,11 +39,6 @@ SECTIONS . = ALIGN(16); .rodata : { *(.rodata) *(.rodata.*) } . = ALIGN(16); - __bss_start = .; .bss : { *(.bss) } - __bss_end = .; - . = ALIGN(64K); - edata = .; - . += 64K; - . = ALIGN(64K); + /* End data */ }
Signature · 1 line
2.34.1
Re: [kvm-unit-tests PATCH v2 2/7] s390x: snippets: c: Cleanup flat.lds
Quoted 5 lines · On Thu, 12 Jan 2023 15:45:43 +0000 Janosch Frank <[email protected]> wrote:
There are a lot of things in there which we don't need for snippets and the alignments can be switched from 64K to 4K since that's the s390 page size.
Signed-off-by Janosch Frank <[email protected]>
Quoted 57 lines
--- s390x/snippets/c/flat.lds | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-)s390x/snippets/c/flat.lds +9
-19@@ -16,27 +16,22 @@ SECTIONS QUAD(0x0000000000004000) } . = 0x4000; + /* + * The stack grows down from 0x4000 to 0x2000, we pre-allocoate + * a frame via the -160. + */ stackptr = . - 160; stacktop = .; + /* Start text 0x4000 */ .text : { *(.init) *(.text) *(.text.*) } - . = ALIGN(64K); + . = ALIGN(4K); etext = .; - .opd : { *(.opd) } - . = ALIGN(16); - .dynamic : { - dynamic_start = .; - *(.dynamic) - } - .dynsym : { - dynsym_start = .; - *(.dynsym) - } - .rela.dyn : { *(.rela*) } - . = ALIGN(16); + /* End text */ + /* Start data */ .data : { *(.data) *(.data.rel*)@@ -44,11 +39,6 @@ SECTIONS . = ALIGN(16); .rodata : { *(.rodata) *(.rodata.*) } . = ALIGN(16); - __bss_start = .; .bss : { *(.bss) } - __bss_end = .; - . = ALIGN(64K); - edata = .; - . += 64K; - . = ALIGN(64K); + /* End data */ }
PATCH v2 3/7 s390x: Add a linker script to assembly snippets
In reply to Janosch FrankA linker script has a few benefits:
- Random data doesn't end up in the binary breaking tests
- We can easily define a lowcore and load the snippet from 0x0 instead of 0x4000 which makes asm snippets behave like c snippets
- We can easily define an invalid PGM new PSW to ensure an exit on a guest PGM
--- lib/s390x/snippet.h | 3 +-- s390x/Makefile | 5 +++-- s390x/mvpg-sie.c | 2 +- s390x/pv-diags.c | 6 +++--- s390x/snippets/asm/flat.lds | 41 +++++++++++++++++++++++++++++++++++++ 5 files changed, 49 insertions(+), 8 deletions(-) create mode 100644 s390x/snippets/asm/flat.lds
lib/s390x/snippet.h +1 -2
@@ -32,8 +32,7 @@#define SNIPPET_PV_TWEAK0 0x42UL#define SNIPPET_PV_TWEAK1 0UL -#define SNIPPET_OFF_C 0 -#define SNIPPET_OFF_ASM 0x4000 +#define SNIPPET_UNPACK_OFF 0/*
s390x/Makefile +3 -2
@@ -136,7 +136,8 @@ $(SNIPPET_DIR)/c/%.o: $(SNIPPET_DIR)/c/%.c $(asm-offsets) $(CC) $(CFLAGS) -c -nostdlib -o $@ $< $(SNIPPET_DIR)/asm/%.gbin: $(SNIPPET_DIR)/asm/%.o - $(OBJCOPY) -O binary -j ".rodata" -j ".text" -j ".data" -j ".bss" --set-section-flags .bss=alloc,load,contents $(patsubst %.gbin,%.o,$@) $@ + $(CC) $(LDFLAGS) -o $@ -T $(SRCDIR)/s390x/snippets/asm/flat.lds $< + $(OBJCOPY) -O binary -j ".rodata" -j ".lowcore" -j ".text" -j ".data" -j ".bss" --set-section-flags .bss=alloc,load,contents $@ $@ truncate -s '%4096' $@ $(SNIPPET_DIR)/c/%.gbin: $(SNIPPET_DIR)/c/%.o $(snippet_lib) $(FLATLIBS)
@@ -145,7 +146,7 @@ $(SNIPPET_DIR)/c/%.gbin: $(SNIPPET_DIR)/c/%.o $(snippet_lib) $(FLATLIBS) truncate -s '%4096' $@ $(SNIPPET_DIR)/asm/%.hdr: $(SNIPPET_DIR)/asm/%.gbin $(HOST_KEY_DOCUMENT) - $(GEN_SE_HEADER) -k $(HOST_KEY_DOCUMENT) -c $<,0x4000,0x00000000000000420000000000000000 --psw-addr 0x4000 -o $@ + $(GEN_SE_HEADER) -k $(HOST_KEY_DOCUMENT) -c $<,0x0,0x00000000000000420000000000000000 --psw-addr 0x4000 -o $@ $(SNIPPET_DIR)/c/%.hdr: $(SNIPPET_DIR)/c/%.gbin $(HOST_KEY_DOCUMENT) $(GEN_SE_HEADER) -k $(HOST_KEY_DOCUMENT) -c $<,0x0,0x00000000000000420000000000000000 --psw-addr 0x4000 -o $@
s390x/mvpg-sie.c +1 -1
@@ -87,7 +87,7 @@ static void setup_guest(void)snippet_setup_guest (&vm, false);snippet_init (&vm,SNIPPET_NAME_START (c, mvpg_snippet), -SNIPPET_LEN (c, mvpg_snippet),SNIPPET_OFF_C ); +SNIPPET_LEN (c, mvpg_snippet),SNIPPET_UNPACK_OFF );/* Enable MVPG interpretation as we want to test KVM and not ourselves */ vm.sblk->eca =ECA_MVPGI ;
s390x/pv-diags.c +3 -3
@@ -28,7 +28,7 @@ static void test_diag_500(void) snippet_pv_init(&vm, SNIPPET_NAME_START(asm, snippet_pv_diag_500), SNIPPET_HDR_START(asm, snippet_pv_diag_500), - size_gbin, size_hdr,SNIPPET_OFF_ASM ); + size_gbin, size_hdr,SNIPPET_UNPACK_OFF );sie (&vm); report(vm.sblk->icptcode == ICPT_PV_INSTR && vm.sblk->ipa == 0x8302 &&
@@ -83,7 +83,7 @@ static void test_diag_288(void) snippet_pv_init(&vm, SNIPPET_NAME_START(asm, snippet_pv_diag_288), SNIPPET_HDR_START(asm, snippet_pv_diag_288), - size_gbin, size_hdr,SNIPPET_OFF_ASM ); + size_gbin, size_hdr,SNIPPET_UNPACK_OFF );sie (&vm); report(vm.sblk->icptcode == ICPT_PV_INSTR && vm.sblk->ipa == 0x8302 &&
@@ -124,7 +124,7 @@ static void test_diag_yield(void) snippet_pv_init(&vm, SNIPPET_NAME_START(asm, snippet_pv_diag_yield), SNIPPET_HDR_START(asm, snippet_pv_diag_yield), - size_gbin, size_hdr,SNIPPET_OFF_ASM ); + size_gbin, size_hdr,SNIPPET_UNPACK_OFF );/* 0x44 */ report_prefix_push ("0x44" );
s390x/snippets/asm/flat.lds new file +41 -0
41 lines not on this page · raw message
Signature · 1 line
2.34.1
Re: [kvm-unit-tests PATCH v2 3/7] s390x: Add a linker script to assembly snippets
Quoted 8 lines · On Thu, 12 Jan 2023 15:45:44 +0000 Janosch Frank <[email protected]> wrote:
A linker script has a few benefits:
- Random data doesn't end up in the binary breaking tests
- We can easily define a lowcore and load the snippet from0x0instead of0x4000which makes asm snippets behave like c snippets
- We can easily define an invalid PGM new PSW to ensure an exit on a guest PGMSigned-off-by Janosch Frank <[email protected]>
Quoted 137 lines
--- lib/s390x/snippet.h | 3 +-- s390x/Makefile | 5 +++-- s390x/mvpg-sie.c | 2 +- s390x/pv-diags.c | 6 +++--- s390x/snippets/asm/flat.lds | 41 +++++++++++++++++++++++++++++++++++++ 5 files changed, 49 insertions(+), 8 deletions(-) create mode 100644 s390x/snippets/asm/flat.ldslib/s390x/snippet.h +1
-2@@ -32,8 +32,7 @@#define SNIPPET_PV_TWEAK0 0x42UL#define SNIPPET_PV_TWEAK1 0UL -#define SNIPPET_OFF_C 0 -#define SNIPPET_OFF_ASM 0x4000 +#define SNIPPET_UNPACK_OFF 0/* s390x/Makefile +3
-2@@ -136,7 +136,8 @@ $(SNIPPET_DIR)/c/%.o: $(SNIPPET_DIR)/c/%.c $(asm-offsets) $(CC) $(CFLAGS) -c -nostdlib -o $@ $< $(SNIPPET_DIR)/asm/%.gbin: $(SNIPPET_DIR)/asm/%.o - $(OBJCOPY) -O binary -j ".rodata" -j ".text" -j ".data" -j ".bss" --set-section-flags .bss=alloc,load,contents $(patsubst %.gbin,%.o,$@) $@ + $(CC) $(LDFLAGS) -o $@ -T $(SRCDIR)/s390x/snippets/asm/flat.lds $< + $(OBJCOPY) -O binary -j ".rodata" -j ".lowcore" -j ".text" -j ".data" -j ".bss" --set-section-flags .bss=alloc,load,contents $@ $@ truncate -s '%4096' $@ $(SNIPPET_DIR)/c/%.gbin: $(SNIPPET_DIR)/c/%.o $(snippet_lib) $(FLATLIBS)@@ -145,7 +146,7 @@ $(SNIPPET_DIR)/c/%.gbin: $(SNIPPET_DIR)/c/%.o $(snippet_lib) $(FLATLIBS) truncate -s '%4096' $@ $(SNIPPET_DIR)/asm/%.hdr: $(SNIPPET_DIR)/asm/%.gbin $(HOST_KEY_DOCUMENT) - $(GEN_SE_HEADER) -k $(HOST_KEY_DOCUMENT) -c $<,0x4000,0x00000000000000420000000000000000 --psw-addr 0x4000 -o $@ + $(GEN_SE_HEADER) -k $(HOST_KEY_DOCUMENT) -c $<,0x0,0x00000000000000420000000000000000 --psw-addr 0x4000 -o $@ $(SNIPPET_DIR)/c/%.hdr: $(SNIPPET_DIR)/c/%.gbin $(HOST_KEY_DOCUMENT) $(GEN_SE_HEADER) -k $(HOST_KEY_DOCUMENT) -c $<,0x0,0x00000000000000420000000000000000 --psw-addr 0x4000 -o $@s390x/mvpg-sie.c +1
-1@@ -87,7 +87,7 @@ static void setup_guest(void)snippet_setup_guest (&vm, false);snippet_init (&vm,SNIPPET_NAME_START (c, mvpg_snippet), -SNIPPET_LEN (c, mvpg_snippet),SNIPPET_OFF_C ); +SNIPPET_LEN (c, mvpg_snippet),SNIPPET_UNPACK_OFF );/* Enable MVPG interpretation as we want to test KVM and not ourselves */ vm.sblk->eca =ECA_MVPGI ;s390x/pv-diags.c +3
-3@@ -28,7 +28,7 @@ static void test_diag_500(void) snippet_pv_init(&vm, SNIPPET_NAME_START(asm, snippet_pv_diag_500), SNIPPET_HDR_START(asm, snippet_pv_diag_500), - size_gbin, size_hdr,SNIPPET_OFF_ASM ); + size_gbin, size_hdr,SNIPPET_UNPACK_OFF );sie (&vm); report(vm.sblk->icptcode == ICPT_PV_INSTR && vm.sblk->ipa == 0x8302 &&@@ -83,7 +83,7 @@ static void test_diag_288(void) snippet_pv_init(&vm, SNIPPET_NAME_START(asm, snippet_pv_diag_288), SNIPPET_HDR_START(asm, snippet_pv_diag_288), - size_gbin, size_hdr,SNIPPET_OFF_ASM ); + size_gbin, size_hdr,SNIPPET_UNPACK_OFF );sie (&vm); report(vm.sblk->icptcode == ICPT_PV_INSTR && vm.sblk->ipa == 0x8302 &&@@ -124,7 +124,7 @@ static void test_diag_yield(void) snippet_pv_init(&vm, SNIPPET_NAME_START(asm, snippet_pv_diag_yield), SNIPPET_HDR_START(asm, snippet_pv_diag_yield), - size_gbin, size_hdr,SNIPPET_OFF_ASM ); + size_gbin, size_hdr,SNIPPET_UNPACK_OFF );/* 0x44 */ report_prefix_push ("0x44" );s390x/snippets/asm/flat.lds new file +41
-0@@ -0,0 +1,41 @@ +SECTIONS +{ + .lowcore : { + /* + * Initial short psw for disk boot, with 31 bit addressing for + * non z/Arch environment compatibility and the instruction + * address 0x4000. + */ + . = 0; + LONG(0x00080000) + LONG(0x80004000) + /* Restart new PSW for booting via PSW restart. */ + . = 0x1a0; + QUAD(0x0000000180000000) + QUAD(0x0000000000004000) + /* + * Invalid PGM new PSW so we hopefully get a code 8 + * intercept on a PGM + */ + . = 0x1d0; + QUAD(0x0008000000000000) + QUAD(0x0000000000000001) + } + . = 0x4000; + /* Start text 0x4000 */ + .text : { + *(.text) + *(.text.*) + } + . = ALIGN(16); + etext = .; + /* End text */ + /* Start data */ + .data : { + *(.data) + *(.data.rel*) + } + . = ALIGN(16); + .rodata : { *(.rodata) *(.rodata.*) } + /* End data */ +}
PATCH v2 4/7 s390x: snippets: Fix SET_PSW_NEW_ADDR macro
In reply to Janosch FrankLet's store the psw mask instead of the address of the location where we should load the mask from.
--- s390x/snippets/asm/macros.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
s390x/snippets/asm/macros.S +1 -1
@@ -18,7 +18,7 @@ */ .macro SET_PSW_NEW_ADDR reg, psw_new_addr, addr_psw larl \reg, psw_mask_64 -stg \reg, \addr_psw +mvc \addr_psw(8,%r0), 0(\reg) larl \reg, \psw_new_addr stg \reg, \addr_psw + 8 .endm
Signature · 1 line
2.34.1
PATCH v2 5/7 lib: s390x: sie: Set guest memory pointer
In reply to Janosch FrankSeems like it was introduced but never set. It's nicer to have a pointer than to cast the MSO of a VM.
--- lib/s390x/sie.c | 1 + 1 file changed, 1 insertion(+)
lib/s390x/sie.c +1 -0
@@ -93,6 +93,7 @@ void sie_guest_create(struct vm *vm, uint64_t guest_mem, uint64_t guest_mem_len)/* Guest memory chunks are always 1MB */ assert (!(guest_mem_len & ~HPAGE_MASK )); + vm->guest_mem = (uint8_t *)guest_mem;/* For non-PV guests we re-use the host's ASCE for ease of use */ vm->save_area.guest.asce =stctg (1 );/* Currently MSO/MSL is the easiest option */
Signature · 1 line
2.34.1
PATCH v2 6/7 s390x: Clear first stack frame and end backtrace early
In reply to Janosch FrankWhen setting the first stack frame to 0, we can check for a 0 backchain pointer when doing backtraces to know when to stop.
--- lib/s390x/stack.c | 2 ++ s390x/cstart64.S | 2 ++ 2 files changed, 4 insertions(+)
lib/s390x/stack.c +2 -0
@@ -22,6 +22,8 @@ int backtrace_frame(const void *frame, const void **return_addrs, int max_depth)for (depth =0 ; stack && depth < max_depth; depth++) { return_addrs[depth] = (void *)stack->grs[8 ]; stack = stack->back_chain; +if (!stack) +break ; }return depth;
s390x/cstart64.S +2 -0
@@ -37,6 +37,8 @@ start: sam64 # Set addressing mode to 64 bit /* setup stack */ larl %r15, stackptr + /* Clear first stack frame */ + xc 0(160,%r15), 0(%r15) /* setup initial PSW mask + control registers*/ larl %r1, initial_psw lpswe 0(%r1)
Signature · 1 line
2.34.1
PATCH v2 7/7 lib: s390x: Handle debug prints for SIE exceptions correctly
In reply to Janosch FrankWhen we leave SIE due to an exception, we'll still have guest values in registers 0 - 13 and that's not clearly portraied in our debug prints. So let's fix that.
--- lib/s390x/interrupt.c | 46 ++++++++++++++++++++++++++++++++++++++----- lib/s390x/sie.h | 2 ++ s390x/cpu.S | 6 ++++-- 3 files changed, 47 insertions(+), 7 deletions(-)
lib/s390x/interrupt.c +41 -5
@@ -9,6 +9,7 @@*/ #include <libcflat.h> #include <asm/barrier.h> +#include <asm/asm-offsets.h> #include <sclp.h> #include <interrupt.h> #include <sie.h>
@@ -188,9 +189,12 @@ static void print_storage_exception_information(void) } } -static void print_int_regs (struct stack_frame_int *stack) +static void print_int_regs (struct stack_frame_int *stack,bool sie) { +struct kvm_s390_sie_block *sblk; +printf ("\n" ); +printf ("%s\n" , sie ?"Guest registers:" :"Host registers:" );printf ("GPRS:\n" );printf ("%016lx %016lx %016lx %016lx\n" , stack->grs1[0 ], stack->grs1[1 ], stack->grs0[0 ], stack->grs0[1 ]);
@@ -198,24 +202,56 @@ static void print_int_regs(struct stack_frame_int *stack) 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 ]); + +if (sie) { + sblk = (struct kvm_s390_sie_block *)stack->grs0[12 ]; +printf ("%016lx %016lx %016lx %016lx\n" , + stack->grs0[10 ], stack->grs0[11 ], sblk->gg14, sblk->gg15); + }else { +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) { -bool in_sie; +bool in_sie, in_sie_gregs; +struct vm_save_area *vregs; in_sie = (lowcore.pgm_old_psw.addr >= (uintptr_t )sie_entry && lowcore.pgm_old_psw.addr <= (uintptr_t )sie_exit); + in_sie_gregs = (lowcore.pgm_old_psw.addr >= (uintptr_t )sie_entry_gregs && + lowcore.pgm_old_psw.addr <= (uintptr_t )sie_exit_gregs);printf ("\n" );printf ("Unexpected program interrupt %s: %#x on cpu %d at %#lx, ilen %d\n" , in_sie ?"in SIE" :"" , lowcore.pgm_int_code,stap (), lowcore.pgm_old_psw.addr, lowcore.pgm_int_id); -print_int_regs (stack); + +/* +* If we fall out of SIE before loading the host registers, +* then we need to do it here so we print the host registers +* and not the guest registers. +* +* Back tracing is actually not a problem since SIE restores gr15. +*/ +if (in_sie_gregs) { +print_int_regs (stack, true); + vregs = *((struct vm_save_area **)(stack->grs0[13 ] + __SF_SIE_SAVEAREA)); + +/* +* The grs are not linear on the interrupt stack frame. +* We copy 0 and 1 here and 2 - 15 with the memcopy below. +*/ + stack->grs1[0 ] = vregs->host.grs[0 ]; + stack->grs1[1 ] = vregs->host.grs[1 ]; +/* 2 - 15 */ +memcpy (stack->grs0, &vregs->host.grs[2 ],sizeof (stack->grs0) -8 ); + } +print_int_regs (stack, false);dump_stack ();/* Dump stack doesn't end with a \n so we add it here instead */
lib/s390x/sie.h +2 -0
@@ -273,6 +273,8 @@ struct vm {extern void sie_entry (void );extern void sie_exit (void ); +extern void sie_entry_gregs (void ); +extern void sie_exit_gregs (void );extern void sie64a (struct kvm_s390_sie_block *sblk,struct vm_save_area *save_area);void sie (struct vm *vm);void sie_expect_validity (struct vm *vm);
s390x/cpu.S +4 -2
@@ -82,7 +82,8 @@ sie64a: # Store scb and save_area pointer into stack frame stg %r2,__SF_SIE_CONTROL(%r15) # save control block pointer stg %r3,__SF_SIE_SAVEAREA(%r15) # save guest register save area - +.globl sie_entry_gregs +sie_entry_gregs: # Load guest's gprs, fprs and fpc .irp i, 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15 ld \i, \i * 8 + SIE_SAVEAREA_GUEST_FPRS(%r3)
@@ -121,7 +122,8 @@ sie_exit: .endr lfpc SIE_SAVEAREA_HOST_FPC(%r14) lmg %r0,%r14,SIE_SAVEAREA_HOST_GRS(%r14) # restore kernel registers - +.globl sie_exit_gregs +sie_exit_gregs: br %r14 .align 8
Signature · 1 line
2.34.1
Re: [kvm-unit-tests PATCH v2 7/7] lib: s390x: Handle debug prints for SIE exceptions correctly
Quoted 57 lines · On Thu, 12 Jan 2023 15:45:48 +0000 Janosch Frank <[email protected]> wrote:
When we leave SIE due to an exception, we'll still have guest values in registers 0 - 13 and that's not clearly portraied in our debug prints. So let's fix that.
Signed-off-by Janosch Frank <[email protected]>--- lib/s390x/interrupt.c | 46 ++++++++++++++++++++++++++++++++++++++----- lib/s390x/sie.h | 2 ++ s390x/cpu.S | 6 ++++-- 3 files changed, 47 insertions(+), 7 deletions(-)lib/s390x/interrupt.c +15
-3@@ -9,6 +9,7 @@*/ #include <libcflat.h> #include <asm/barrier.h> +#include <asm/asm-offsets.h> #include <sclp.h> #include <interrupt.h> #include <sie.h> @@ -188,9 +189,12 @@ static void print_storage_exception_information(void) } } -static void print_int_regs (struct stack_frame_int *stack) +static void print_int_regs (struct stack_frame_int *stack,bool sie) { +struct kvm_s390_sie_block *sblk; +printf ("\n" ); +printf ("%s\n" , sie ?"Guest registers:" :"Host registers:" );printf ("GPRS:\n" );printf ("%016lx %016lx %016lx %016lx\n" , stack->grs1[0 ], stack->grs1[1 ], stack->grs0[0 ], stack->grs0[1 ]);@@ -198,24 +202,56 @@ static void print_int_regs(struct stack_frame_int *stack) 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 ]); + +if (sie) { + sblk = (struct kvm_s390_sie_block *)stack->grs0[12 ]; +printf ("%016lx %016lx %016lx %016lx\n" , + stack->grs0[10 ], stack->grs0[11 ], sblk->gg14, sblk->gg15); + }else { +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)
lib/s390x/interrupt.c static void print_int_regs(struct stack_frame_int *stack) · line 227
Quoted 10 lines
lib/s390x/interrupt.c +4
-1{ -bool in_sie; +bool in_sie, in_sie_gregs; +struct vm_save_area *vregs; in_sie = (lowcore.pgm_old_psw.addr >= (uintptr_t )sie_entry && lowcore.pgm_old_psw.addr <= (uintptr_t )sie_exit); + in_sie_gregs = (lowcore.pgm_old_psw.addr >= (uintptr_t )sie_entry_gregs && + lowcore.pgm_old_psw.addr <= (uintptr_t )sie_exit_gregs);
can you explain why <= instead of < ? (I think I know why, but a comment would not hurt)
with that fixed:
Quoted 68 lines
lib/s390x/interrupt.c +22
-1printf ("\n" );printf ("Unexpected program interrupt %s: %#x on cpu %d at %#lx, ilen %d\n" , in_sie ?"in SIE" :"" , lowcore.pgm_int_code,stap (), lowcore.pgm_old_psw.addr, lowcore.pgm_int_id); -print_int_regs (stack); + +/* +* If we fall out of SIE before loading the host registers, +* then we need to do it here so we print the host registers +* and not the guest registers. +* +* Back tracing is actually not a problem since SIE restores gr15. +*/ +if (in_sie_gregs) { +print_int_regs (stack, true); + vregs = *((struct vm_save_area **)(stack->grs0[13 ] + __SF_SIE_SAVEAREA)); + +/* +* The grs are not linear on the interrupt stack frame. +* We copy 0 and 1 here and 2 - 15 with the memcopy below. +*/ + stack->grs1[0 ] = vregs->host.grs[0 ]; + stack->grs1[1 ] = vregs->host.grs[1 ]; +/* 2 - 15 */ +memcpy (stack->grs0, &vregs->host.grs[2 ],sizeof (stack->grs0) -8 ); + } +print_int_regs (stack, false);dump_stack ();/* Dump stack doesn't end with a \n so we add it here instead */ lib/s390x/sie.h +2
-0@@ -273,6 +273,8 @@ struct vm {extern void sie_entry (void );extern void sie_exit (void ); +extern void sie_entry_gregs (void ); +extern void sie_exit_gregs (void );extern void sie64a (struct kvm_s390_sie_block *sblk,struct vm_save_area *save_area);void sie (struct vm *vm);void sie_expect_validity (struct vm *vm);s390x/cpu.S +4
-2@@ -82,7 +82,8 @@ sie64a: # Store scb and save_area pointer into stack frame stg %r2,__SF_SIE_CONTROL(%r15) # save control block pointer stg %r3,__SF_SIE_SAVEAREA(%r15) # save guest register save area - +.globl sie_entry_gregs +sie_entry_gregs: # Load guest's gprs, fprs and fpc .irp i, 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15 ld \i, \i * 8 + SIE_SAVEAREA_GUEST_FPRS(%r3)@@ -121,7 +122,8 @@ sie_exit: .endr lfpc SIE_SAVEAREA_HOST_FPC(%r14) lmg %r0,%r14,SIE_SAVEAREA_HOST_GRS(%r14) # restore kernel registers - +.globl sie_exit_gregs +sie_exit_gregs: br %r14 .align 8
Re: [kvm-unit-tests PATCH v2 7/7] lib: s390x: Handle debug prints for SIE exceptions correctly
Quoted 66 lines · Claudio Imbrenda
Quoted 63 lines · On Thu, 12 Jan 2023 15:45:48 +0000 Janosch Frank <[email protected]> wrote:
When we leave SIE due to an exception, we'll still have guest values in registers 0 - 13 and that's not clearly portraied in our debug prints. So let's fix that.
Signed-off-by Janosch Frank <[email protected]>--- lib/s390x/interrupt.c | 46 ++++++++++++++++++++++++++++++++++++++----- lib/s390x/sie.h | 2 ++ s390x/cpu.S | 6 ++++-- 3 files changed, 47 insertions(+), 7 deletions(-)lib/s390x/interrupt.c +17
-4@@ -9,6 +9,7 @@*/ #include <libcflat.h> #include <asm/barrier.h> +#include <asm/asm-offsets.h> #include <sclp.h> #include <interrupt.h> #include <sie.h> @@ -188,9 +189,12 @@ static void print_storage_exception_information(void) } } -static void print_int_regs (struct stack_frame_int *stack) +static void print_int_regs (struct stack_frame_int *stack,bool sie) { +struct kvm_s390_sie_block *sblk; +printf ("\n" ); +printf ("%s\n" , sie ?"Guest registers:" :"Host registers:" );printf ("GPRS:\n" );printf ("%016lx %016lx %016lx %016lx\n" , stack->grs1[0 ], stack->grs1[1 ], stack->grs0[0 ], stack->grs0[1 ]);@@ -198,24 +202,56 @@ static void print_int_regs(struct stack_frame_int *stack) 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 ]); + +if (sie) { + sblk = (struct kvm_s390_sie_block *)stack->grs0[12 ]; +printf ("%016lx %016lx %016lx %016lx\n" , + stack->grs0[10 ], stack->grs0[11 ], sblk->gg14, sblk->gg15); + }else { +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) { -bool in_sie; +bool in_sie, in_sie_gregs; +struct vm_save_area *vregs;
Quoted 7 lines
lib/s390x/interrupt.c static void print_int_regs(struct stack_frame_int *stack) · line 227
Quoted 4 lines
lib/s390x/interrupt.c +2
-0in_sie = (lowcore.pgm_old_psw.addr >= (uintptr_t )sie_entry && lowcore.pgm_old_psw.addr <= (uintptr_t )sie_exit); + in_sie_gregs = (lowcore.pgm_old_psw.addr >= (uintptr_t )sie_entry_gregs && + lowcore.pgm_old_psw.addr <= (uintptr_t )sie_exit_gregs);can you explain why <= instead of < ? (I think I know why, but a comment would not hurt)
This might be wrong now that the exit label points behind a lmg which can only cause the operation or the addressing exception.
The operation exception can only happen on a LMY without the long displacement HW support and the addressing exception should only happen in circumstances where any processed instruction will likely result in a new exception being thrown.
Quoted 74 lines
with that fixed:
Reviewed-by Claudio Imbrenda <[email protected]>Quoted 68 lines
lib/s390x/interrupt.c +22
-1printf ("\n" );printf ("Unexpected program interrupt %s: %#x on cpu %d at %#lx, ilen %d\n" , in_sie ?"in SIE" :"" , lowcore.pgm_int_code,stap (), lowcore.pgm_old_psw.addr, lowcore.pgm_int_id); -print_int_regs (stack); + +/* +* If we fall out of SIE before loading the host registers, +* then we need to do it here so we print the host registers +* and not the guest registers. +* +* Back tracing is actually not a problem since SIE restores gr15. +*/ +if (in_sie_gregs) { +print_int_regs (stack, true); + vregs = *((struct vm_save_area **)(stack->grs0[13 ] + __SF_SIE_SAVEAREA)); + +/* +* The grs are not linear on the interrupt stack frame. +* We copy 0 and 1 here and 2 - 15 with the memcopy below. +*/ + stack->grs1[0 ] = vregs->host.grs[0 ]; + stack->grs1[1 ] = vregs->host.grs[1 ]; +/* 2 - 15 */ +memcpy (stack->grs0, &vregs->host.grs[2 ],sizeof (stack->grs0) -8 ); + } +print_int_regs (stack, false);dump_stack ();/* Dump stack doesn't end with a \n so we add it here instead */ lib/s390x/sie.h +2
-0@@ -273,6 +273,8 @@ struct vm {extern void sie_entry (void );extern void sie_exit (void ); +extern void sie_entry_gregs (void ); +extern void sie_exit_gregs (void );extern void sie64a (struct kvm_s390_sie_block *sblk,struct vm_save_area *save_area);void sie (struct vm *vm);void sie_expect_validity (struct vm *vm);s390x/cpu.S +4
-2@@ -82,7 +82,8 @@ sie64a: # Store scb and save_area pointer into stack frame stg %r2,__SF_SIE_CONTROL(%r15) # save control block pointer stg %r3,__SF_SIE_SAVEAREA(%r15) # save guest register save area - +.globl sie_entry_gregs +sie_entry_gregs: # Load guest's gprs, fprs and fpc .irp i, 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15 ld \i, \i * 8 + SIE_SAVEAREA_GUEST_FPRS(%r3)@@ -121,7 +122,8 @@ sie_exit: .endr lfpc SIE_SAVEAREA_HOST_FPC(%r14) lmg %r0,%r14,SIE_SAVEAREA_HOST_GRS(%r14) # restore kernel registers - +.globl sie_exit_gregs +sie_exit_gregs: br %r14 .align 8