s390x update 2021-07-07
Dear Paolo,
please merge or pull the following changes:
* Add snippet support that makes starting guests in tests easier
* Cleanup
MERGE:
https://gitlab.com/kvm-unit-tests/kvm-unit-tests/-/merge_requests/13
PIPELINE:
https://gitlab.com/frankja/kvm-unit-tests/-/pipelines/333035606
PULL:
The following changes since commit bc6f264386b4cb2cadc8b2492315f3e6e8a801a2:
Merge branch 'arm/queue' into 'master' (2021-06-30 13:35:55 +0000)
are available in the Git repository at:
https://gitlab.com/frankja/kvm-unit-tests.git s390x-pull-2021-07-07
for you to fetch changes up to 81598ca0d3fbeb52e02eecf5ddbc15e30f8c600a:
lib: s390x: Remove left behing PGM report (2021-07-07 08:00:29 +0000)
Janosch Frank (7):
s390x: snippets: Add gitignore as well as linker script and start
assembly
s390x: mvpg: Add SIE mvpg test
s390x: sie: Add missing includes
s390x: sie: Fix sie.h integer types
lib: s390x: uv: Add offset comments to uv_query and extend it
lib: s390x: Print if a pgm happened while in SIE
lib: s390x: Remove left behing PGM report
Steffen Eiden (1):
s390x: snippets: Add snippet compilation
.gitignore | 1 + lib/s390x/asm/uv.h | 33 +++---- lib/s390x/interrupt.c | 14 +-- lib/s390x/sie.h | 11 ++- s390x/Makefile | 29 +++++-- s390x/mvpg-sie.c | 149 ++++++++++++++++++++++++++++++++ s390x/snippets/c/cstart.S | 16 ++++ s390x/snippets/c/flat.lds | 51 +++++++++++ s390x/snippets/c/mvpg-snippet.c | 33 +++++++ s390x/unittests.cfg | 3 + 10 files changed, 308 insertions(+), 32 deletions(-) create mode 100644 s390x/mvpg-sie.c create mode 100644 s390x/snippets/c/cstart.S create mode 100644 s390x/snippets/c/flat.lds create mode 100644 s390x/snippets/c/mvpg-snippet.c
Signature · 1 line
2.31.1
[kvm-unit-tests GIT PULL 2/8] s390x: snippets: Add snippet compilation
From: Steffen Eiden <[email protected]>
This patch provides the necessary make targets to properly compile snippets and link them into their associated host.
To define the guest-host definition, we use the make-feature SECONDEXPANSION in combination with Target specific Variable Values. The variable snippets has different values depending on the current target. This enables us to define which snippets (=guests) belong to which hosts. Furthermore, using the second-expansion, we can use snippets in the perquisites of the host's %.elf rule, which otherwise would be not set.
--- s390x/Makefile | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-)
s390x/Makefile +21 -6
@@ -76,11 +76,26 @@ OBJDIRS += lib/s390x asmlib = $(TEST_DIR)/cstart64.o $(TEST_DIR)/cpu.o FLATLIBS = $(libcflat) -%.elf: %.o $(FLATLIBS) $(SRCDIR)/s390x/flat.lds $(asmlib) - $(CC) $(CFLAGS) -c -o $(@:.elf=.aux.o) \ - $(SRCDIR)/lib/auxinfo.c -DPROGNAME=\"$@\" - $(CC) $(LDFLAGS) -o $@ -T $(SRCDIR)/s390x/flat.lds \ - $(filter %.o, $^) $(FLATLIBS) $(@:.elf=.aux.o) + +SNIPPET_DIR = $(TEST_DIR)/snippets +snippet_asmlib = $(SNIPPET_DIR)/c/cstart.o + +# perquisites (=guests) for the snippet hosts. +# $(TEST_DIR)/<snippet-host>.elf: snippets = $(SNIPPET_DIR)/<c/asm>/<snippet>.gbin + +$(SNIPPET_DIR)/asm/%.gbin: $(SNIPPET_DIR)/asm/%.o $(FLATLIBS) + $(OBJCOPY) -O binary $(patsubst %.gbin,%.o,$@) $@ + $(OBJCOPY) -I binary -O elf64-s390 -B "s390:64-bit" $@ $@ + +$(SNIPPET_DIR)/c/%.gbin: $(SNIPPET_DIR)/c/%.o $(snippet_asmlib) $(FLATLIBS) + $(CC) $(LDFLAGS) -o $@ -T $(SNIPPET_DIR)/c/flat.lds $(patsubst %.gbin,%.o,$@) $(snippet_asmlib) $(FLATLIBS) + $(OBJCOPY) -O binary $@ $@ + $(OBJCOPY) -I binary -O elf64-s390 -B "s390:64-bit" $@ $@ + +.SECONDEXPANSION: +%.elf: $$(snippets) %.o $(FLATLIBS) $(SRCDIR)/s390x/flat.lds $(asmlib) + $(CC) $(CFLAGS) -c -o $(@:.elf=.aux.o) $(SRCDIR)/lib/auxinfo.c -DPROGNAME=\"$@\" + $(CC) $(LDFLAGS) -o $@ -T $(SRCDIR)/s390x/flat.lds $(filter %.o, $^) $(FLATLIBS) $(snippets) $(@:.elf=.aux.o) $(RM) $(@:.elf=.aux.o) @chmod a-x $@
@@ -94,7 +109,7 @@ FLATLIBS = $(libcflat) $(GENPROTIMG) --host-key-document $(HOST_KEY_DOCUMENT) --no-verify --image $< -o $@ arch_clean: asm_offsets_clean - $(RM) $(TEST_DIR)/*.{o,elf,bin} $(TEST_DIR)/.*.d lib/s390x/.*.d + $(RM) $(TEST_DIR)/*.{o,elf,bin} $(TEST_DIR)/.*.d $(SNIPPET_DIR)/c/*.{o,gbin} $(SNIPPET_DIR)/c/.*.d lib/s390x/.*.d generated-files = $(asm-offsets) $(tests:.elf=.o) $(asmlib) $(cflatobjs): $(generated-files)
Signature · 1 line
2.31.1
[kvm-unit-tests GIT PULL 4/8] s390x: sie: Add missing includes
In reply to Janosch Frankarch_def.h is needed for struct psw. stdint.h is needed for the uint*_t types.
--- lib/s390x/sie.h | 3 +++ 1 file changed, 3 insertions(+)
lib/s390x/sie.h +3 -0
@@ -2,6 +2,9 @@#ifndef _S390X_SIE_H_#define _S390X_SIE_H_ +#include <stdint.h> +#include <asm/arch_def.h> +#define CPUSTAT_STOPPED 0x80000000#define CPUSTAT_WAIT 0x10000000#define CPUSTAT_ECALL_PEND 0x08000000
Signature · 1 line
2.31.1
[kvm-unit-tests GIT PULL 3/8] s390x: mvpg: Add SIE mvpg test
In reply to Janosch FrankLet's also check the PEI values to make sure our VSIE implementation is correct.
--- s390x/Makefile | 2 + s390x/mvpg-sie.c | 149 ++++++++++++++++++++++++++++++++ s390x/snippets/c/mvpg-snippet.c | 33 +++++++ s390x/unittests.cfg | 3 + 4 files changed, 187 insertions(+) create mode 100644 s390x/mvpg-sie.c create mode 100644 s390x/snippets/c/mvpg-snippet.c
s390x/Makefile +2 -0
@@ -23,6 +23,7 @@ tests += $(TEST_DIR)/sie.elf tests += $(TEST_DIR)/mvpg.elf tests += $(TEST_DIR)/uv-host.elf tests += $(TEST_DIR)/edat.elf +tests += $(TEST_DIR)/mvpg-sie.elf tests_binary = $(patsubst %.elf,%.bin,$(tests)) ifneq ($(HOST_KEY_DOCUMENT),)
@@ -82,6 +83,7 @@ snippet_asmlib = $(SNIPPET_DIR)/c/cstart.o # perquisites (=guests) for the snippet hosts. # $(TEST_DIR)/<snippet-host>.elf: snippets = $(SNIPPET_DIR)/<c/asm>/<snippet>.gbin +$(TEST_DIR)/mvpg-sie.elf: snippets = $(SNIPPET_DIR)/c/mvpg-snippet.gbin $(SNIPPET_DIR)/asm/%.gbin: $(SNIPPET_DIR)/asm/%.o $(FLATLIBS) $(OBJCOPY) -O binary $(patsubst %.gbin,%.o,$@) $@
s390x/mvpg-sie.c new file +149 -0
149 lines not on this page · raw message
s390x/snippets/c/mvpg-snippet.c new file +33 -0
@@ -0,0 +1,33 @@ +#include <libcflat.h> + +static inline void force_exit (void ) +{ + asmvolatile (" diag 0,0,0x44\n" ); +} + +static inline int mvpg (unsigned long r0,void *dest,void *src) +{ + register unsigned long reg0 asm ("0") = r0; +int cc; + + asmvolatile (" mvpg %1,%2\n" +" ipm %0\n" +" srl %0,28" + :"=d" (cc) :"a" (dest),"a" (src),"d" (reg0) + :"memory" ,"cc" ); +return cc; +} + +static void test_mvpg_real (void ) +{ +mvpg (0 , (void *)0x5000 , (void *)0x6000 ); +force_exit (); +} + +__attribute__((section (".text" )))int main (void ) +{ +test_mvpg_real (); +test_mvpg_real (); +test_mvpg_real (); +return 0 ; +}
s390x/unittests.cfg +3 -0
@@ -106,3 +106,6 @@ timeout = 10 [edat] file = edat.elf + +[mvpg-sie] +file = mvpg-sie.elf
Signature · 1 line
2.31.1
[kvm-unit-tests GIT PULL 5/8] s390x: sie: Fix sie.h integer types
In reply to Janosch FrankLet's only use the uint*_t types.
--- lib/s390x/sie.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
lib/s390x/sie.h +4 -4
@@ -173,9 +173,9 @@ struct kvm_s390_sie_block { } __attribute__((packed));struct vm_save_regs { -u64 grs[16 ]; -u64 fprs[16 ]; -u32 fpc; +uint64_t grs[16 ]; +uint64_t fprs[16 ]; +uint32_t fpc; };/* We might be able to nestle all of this into the stack frame. But
@@ -191,7 +191,7 @@ struct vm {struct kvm_s390_sie_block *sblk;struct vm_save_area save_area;/* Ptr to first guest page */ -u8 *guest_mem; +uint8_t *guest_mem; };extern void sie_entry (void );
Signature · 1 line
2.31.1
[kvm-unit-tests GIT PULL 6/8] lib: s390x: uv: Add offset comments to uv_query and extend it
In reply to Janosch FrankThe struct is getting longer, let's add offset comments so we know where we change things when we add struct members.
--- lib/s390x/asm/uv.h | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-)
lib/s390x/asm/uv.h +17 -16
@@ -84,22 +84,23 @@ struct uv_cb_init { } __attribute__((packed)) __attribute__((aligned(8)));struct uv_cb_qui { -struct uv_cb_header header; -u64 reserved08; -u64 inst_calls_list[4 ]; -u64 reserved30[2 ]; -u64 uv_base_stor_len; -u64 reserved48; -u64 conf_base_phys_stor_len; -u64 conf_base_virt_stor_len; -u64 conf_virt_var_stor_len; -u64 cpu_stor_len; -u32 reserved70[3 ]; -u32 max_num_sec_conf; -u64 max_guest_stor_addr; -u8 reserved88[158 -136 ]; -u16 max_guest_cpus; -u8 reserveda0[200 -160 ]; +struct uv_cb_header header;/* 0x0000 */ +u64 reserved08;/* 0x0008 */ +u64 inst_calls_list[4 ];/* 0x0010 */ +u64 reserved30[2 ];/* 0x0030 */ +u64 uv_base_stor_len;/* 0x0040 */ +u64 reserved48;/* 0x0048 */ +u64 conf_base_phys_stor_len;/* 0x0050 */ +u64 conf_base_virt_stor_len;/* 0x0058 */ +u64 conf_virt_var_stor_len;/* 0x0060 */ +u64 cpu_stor_len;/* 0x0068 */ +u32 reserved70[3 ];/* 0x0070 */ +u32 max_num_sec_conf;/* 0x007c */ +u64 max_guest_stor_addr;/* 0x0080 */ +u8 reserved88[158 -136 ];/* 0x0088 */ +uint16_t max_guest_cpus;/* 0x009e */ +u64 uv_feature_indications;/* 0x00a0 */ +u8 reserveda8[200 -168 ];/* 0x00a8 */ } __attribute__((packed)) __attribute__((aligned(8)));struct uv_cb_cgc {
Signature · 1 line
2.31.1
[kvm-unit-tests GIT PULL 8/8] lib: s390x: Remove left behing PGM report
In reply to Janosch FrankWhen I added the backtrace support I forgot to remove the PGM report.
--- lib/s390x/interrupt.c | 3 --- 1 file changed, 3 deletions(-)
lib/s390x/interrupt.c +0 -3
@@ -162,9 +162,6 @@ void handle_pgm_int(struct stack_frame_int *stack)/* 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); } pgm_int_expected = false;
Signature · 1 line
2.31.1
[kvm-unit-tests GIT PULL 7/8] lib: s390x: Print if a pgm happened while in SIE
In reply to Janosch FrankFor debugging it helps if you know if the PGM happened while being in SIE or not.
--- lib/s390x/interrupt.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
lib/s390x/interrupt.c +8 -3
@@ -141,10 +141,15 @@ static void print_int_regs(struct stack_frame_int *stack)static void print_pgm_info (struct stack_frame_int *stack) { +bool in_sie; + + in_sie = (lc->pgm_old_psw.addr >= (uintptr_t )sie_entry && + lc->pgm_old_psw.addr <= (uintptr_t )sie_exit); +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); +printf ("Unexpected program interrupt %s: %d on cpu %d at %#lx, ilen %d\n" , + in_sie ?"in SIE" :"" , + lc->pgm_int_code,stap (), lc->pgm_old_psw.addr, lc->pgm_int_id);print_int_regs (stack);dump_stack ();report_summary ();
Signature · 1 line
2.31.1
[kvm-unit-tests GIT PULL 1/8] s390x: snippets: Add gitignore as well as linker script and start assembly
In reply to Janosch FrankSnippets are small guests which can be run under a unit test that implements a simple hypervisor. They can be written in C or assembly. The C code needs a linker script and a start assembly file that jumps to main to work properly. So let's add that as well as a gitignore entry for the new files.
--- .gitignore | 1 + s390x/snippets/c/cstart.S | 16 ++++++++++++ s390x/snippets/c/flat.lds | 51 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 68 insertions(+) create mode 100644 s390x/snippets/c/cstart.S create mode 100644 s390x/snippets/c/flat.lds
.gitignore +1 -0
@@ -23,3 +23,4 @@ cscope.* /api/dirty-log /api/dirty-log-perf /s390x/*.bin +/s390x/snippets/*/*.gbin
s390x/snippets/c/cstart.S new file +16 -0
@@ -0,0 +1,16 @@ +#include <asm/sigp.h> + +.section .init + .globl start +start: + /* XOR all registers with themselves to clear them fully. */ + .irp i, 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15 + xgr \i,\i + .endr + /* 0x3000 is the stack page for now */ + lghi %r15, 0x4000 - 160 + sam64 + brasl %r14, main + /* For now let's only use cpu 0 in snippets so this will always work. */ + xgr %r0, %r0 + sigp %r2, %r0, SIGP_STOP
s390x/snippets/c/flat.lds new file +51 -0
51 lines not on this page · raw message
Signature · 1 line
2.31.1
Quoted 50 lines · Janosch Frank
Dear Paolo,
please merge or pull the following changes:
* Add snippet support that makes starting guests in tests easier
* CleanupMERGE:
https://gitlab.com/kvm-unit-tests/kvm-unit-tests/-/merge_requests/13PIPELINE:
https://gitlab.com/frankja/kvm-unit-tests/-/pipelines/333035606PULL:
The following changes since commitbc6f264386b4cb2cadc8b2492315f3e6e8a801a2:Merge branch 'arm/queue' into 'master' (2021-06-30 13:35:55 +0000)are available in the Git repository at:
https://gitlab.com/frankja/kvm-unit-tests.git s390x-pull-2021-07-07for you to fetch changes up to
81598ca0d3fbeb52e02eecf5ddbc15e30f8c600a:lib: s390x: Remove left behing PGM report (2021-07-07 08:00:29 +0000)
Janosch Frank (7):
s390x: snippets: Add gitignore as well as linker script and start
assembly
s390x: mvpg: Add SIE mvpg test
s390x: sie: Add missing includes
s390x: sie: Fixsie.hinteger types
lib: s390x: uv: Add offset comments touv_queryand extend it
lib: s390x: Print if a pgm happened while in SIE
lib: s390x: Remove left behing PGM reportSteffen Eiden (1):
s390x: snippets: Add snippet compilation.gitignore | 1 + lib/s390x/asm/uv.h | 33 +++---- lib/s390x/interrupt.c | 14 +-- lib/s390x/sie.h | 11 ++- s390x/Makefile | 29 +++++-- s390x/mvpg-sie.c | 149 ++++++++++++++++++++++++++++++++ s390x/snippets/c/cstart.S | 16 ++++ s390x/snippets/c/flat.lds | 51 +++++++++++ s390x/snippets/c/mvpg-snippet.c | 33 +++++++ s390x/unittests.cfg | 3 + 10 files changed, 308 insertions(+), 32 deletions(-)
Quoted 5 lines
create mode 100644
s390x/mvpg-sie.c
create mode 100644s390x/snippets/c/cstart.Screate mode 100644s390x/snippets/c/flat.ldscreate mode 100644s390x/snippets/c/mvpg-snippet.c
Merged, thanks!
Paolo