Some cleanup patches
v3 cover Some cleanup patches
Changelog:v2->v3:
+ rebased
+ added r-b's from Janosch, Nico, and Nina
+ reworked patch 5
+ worked in comments from Nina (patch 6)
+ droppped old patch "[kvm-unit-tests PATCH v2 8/8] s390x/Makefile: add an extra %.aux.o target" (will send a separate patch for it because I've changed it for ARM, Power, and s390x)v1->v2:
+ worked in comments from Claudio and Janosch
+ added r-b's from Janosch
+ added a new patch: s390x/Makefile: add an extra %.aux.o target
Marc Hartmayer (7):
.gitignore: ignore s390x/comm.key file s390x/Makefile: simplify %.hdr target rules s390x/Makefile: fix *.gbin target dependencies s390x/Makefile: refactor CPPFLAGS
s390x: use preprocessor for linker script generation
s390x: define a macro for the stack frame size lib/linux/const.h: test for __ASSEMBLER__ as well
.gitignore | 2 ++
lib/linux/const.h | 2 +-
lib/s390x/asm-offsets.c | 1 +
s390x/Makefile | 25 ++++++++------
s390x/cstart64.S | 2 +-
s390x/{flat.lds => flat.lds.S} | 4 ++-
s390x/gs.c | 38 ++++++++++++---------
s390x/macros.S | 4 +--
s390x/snippets/asm/{flat.lds => flat.lds.S} | 0
s390x/snippets/c/{flat.lds => flat.lds.S} | 6 ++--
10 files changed, 50 insertions(+), 34 deletions(-)
rename s390x/{flat.lds => flat.lds.S} (93%)
rename s390x/snippets/asm/{flat.lds => flat.lds.S} (100%)
rename s390x/snippets/c/{flat.lds => flat.lds.S} (88%)Signature · 1 line
2.34.1
PATCH v3 1/7 .gitignore: ignore `s390x/comm.key` file
Ignore the Secure Execution Customer Communication Key file.
--- .gitignore | 1 + 1 file changed, 1 insertion(+)
.gitignore +1 -0
@@ -28,5 +28,6 @@ cscope.* /s390x/*.bin /s390x/snippets/*/*.gbin /efi-tests/* +/s390x/comm.key /s390x/snippets/*/*.hdr /s390x/snippets/*/*.*obj
Signature · 1 line
2.34.1
PATCH v3 2/7 s390x/Makefile: simplify `%.hdr` target rules
In reply to Marc HartmayerMerge the two Makefile target rules $(SNIPPET_DIR)/asm/%.hdr and $(SNIPPET_DIR)/c/%.hdr into one target rule.
--- s390x/Makefile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
s390x/Makefile +1 -4
@@ -145,10 +145,7 @@ $(SNIPPET_DIR)/c/%.gbin: $(SNIPPET_DIR)/c/%.o $(snippet_lib) $(FLATLIBS) $(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)/asm/%.hdr: $(SNIPPET_DIR)/asm/%.gbin $(HOST_KEY_DOCUMENT) - $(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) +%.hdr: %.gbin $(HOST_KEY_DOCUMENT) $(GEN_SE_HEADER) -k $(HOST_KEY_DOCUMENT) -c $<,0x0,0x00000000000000420000000000000000 --psw-addr 0x4000 -o $@ .SECONDARY:
Signature · 1 line
2.34.1
PATCH v3 3/7 s390x/Makefile: fix `*.gbin` target dependencies
In reply to Marc HartmayerIf the linker scripts change, then the .gbin binaries must be rebuilt. While at it, replace $(SRCDIR)/s390x/snippets with $(SNIPPET_DIR) for these Makefile rules.
--- s390x/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
s390x/Makefile +4 -4
@@ -135,13 +135,13 @@ $(SNIPPET_DIR)/asm/%.o: $(SNIPPET_DIR)/asm/%.S $(asm-offsets) $(SNIPPET_DIR)/c/%.o: $(SNIPPET_DIR)/c/%.c $(asm-offsets) $(CC) $(CFLAGS) -c -nostdlib -o $@ $< -$(SNIPPET_DIR)/asm/%.gbin: $(SNIPPET_DIR)/asm/%.o - $(CC) $(LDFLAGS) -o $@ -T $(SRCDIR)/s390x/snippets/asm/flat.lds $< +$(SNIPPET_DIR)/asm/%.gbin: $(SNIPPET_DIR)/asm/%.o $(SNIPPET_DIR)/asm/flat.lds + $(CC) $(LDFLAGS) -o $@ -T $(SNIPPET_DIR)/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) - $(CC) $(LDFLAGS) -o $@ -T $(SRCDIR)/s390x/snippets/c/flat.lds $< $(snippet_lib) $(FLATLIBS) +$(SNIPPET_DIR)/c/%.gbin: $(SNIPPET_DIR)/c/%.o $(snippet_lib) $(FLATLIBS) $(SNIPPET_DIR)/c/flat.lds + $(CC) $(LDFLAGS) -o $@ -T $(SNIPPET_DIR)/c/flat.lds $< $(snippet_lib) $(FLATLIBS) $(OBJCOPY) -O binary -j ".rodata" -j ".lowcore" -j ".text" -j ".data" -j ".bss" --set-section-flags .bss=alloc,load,contents $@ $@ truncate -s '%4096' $@
Signature · 1 line
2.34.1
PATCH v3 4/7 s390x/Makefile: refactor CPPFLAGS
In reply to Marc HartmayerThis change makes it easier to reuse them. While at it, remove lib include path since it seems to be unused.
--- s390x/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
s390x/Makefile +4 -1
@@ -63,9 +63,12 @@ test_cases: $(tests) test_cases_binary: $(tests_binary) test_cases_pv: $(tests_pv_binary) +INCLUDE_PATHS = $(SRCDIR)/lib $(SRCDIR)/lib/s390x +CPPFLAGS = $(addprefix -I,$(INCLUDE_PATHS)) + CFLAGS += -std=gnu99 CFLAGS += -ffreestanding -CFLAGS += -I $(SRCDIR)/lib -I $(SRCDIR)/lib/s390x -I lib +CFLAGS += $(CPPFLAGS) CFLAGS += -O2 CFLAGS += -march=zEC12 CFLAGS += -mbackchain
Signature · 1 line
2.34.1
PATCH v3 5/7 s390x: use preprocessor for linker script generation
In reply to Marc HartmayerThe old .lds scripts are being renamed to .lds.S and the actual .lds scripts are being generated by the assembler preprocessor. This change allows us to use constants defined by macros in the .lds.S files.
---
.gitignore | 1 +
s390x/Makefile | 7 +++++--
s390x/{flat.lds => flat.lds.S} | 0
s390x/snippets/asm/{flat.lds => flat.lds.S} | 0
s390x/snippets/c/{flat.lds => flat.lds.S} | 0
5 files changed, 6 insertions(+), 2 deletions(-)
rename s390x/{flat.lds => flat.lds.S} (100%)
rename s390x/snippets/asm/{flat.lds => flat.lds.S} (100%)
rename s390x/snippets/c/{flat.lds => flat.lds.S} (100%).gitignore +1 -0
@@ -31,3 +31,4 @@ cscope.* /s390x/comm.key /s390x/snippets/*/*.hdr /s390x/snippets/*/*.*obj +/s390x/**/*.lds
s390x/Makefile +5 -2
@@ -76,7 +76,7 @@ CFLAGS += -fno-delete-null-pointer-checks LDFLAGS += -nostdlib -Wl,--build-id=none # We want to keep intermediate files -.PRECIOUS: %.o +.PRECIOUS: %.o %.lds asm-offsets = lib/$(ARCH)/asm-offsets.h include $(SRCDIR)/scripts/asm-offsets.mak
@@ -159,6 +159,9 @@ $(SNIPPET_DIR)/c/%.gbin: $(SNIPPET_DIR)/c/%.o $(snippet_lib) $(FLATLIBS) $(SNIPP %.hdr.obj: %.hdr $(OBJCOPY) -I binary -O elf64-s390 -B "s390:64-bit" $< $@ +lds-autodepend-flags = -MMD -MF $(dir $*).$(notdir $*).d -MT $@ +%.lds: %.lds.S + $(CPP) $(lds-autodepend-flags) $(CPPFLAGS) -P -C -o $@ $< .SECONDEXPANSION: %.elf: $(FLATLIBS) $(asmlib) $(SRCDIR)/s390x/flat.lds $$(snippets-obj) $$(snippet-hdr-obj) %.o
@@ -211,7 +214,7 @@ $(snippet_asmlib): $$(patsubst %.o,%.S,$$@) $(asm-offsets) arch_clean: asm_offsets_clean - $(RM) $(TEST_DIR)/*.{o,elf,bin} $(SNIPPET_DIR)/*/*.{o,elf,*bin,*obj,hdr} $(SNIPPET_DIR)/asm/.*.d $(TEST_DIR)/.*.d lib/s390x/.*.d $(comm-key) + $(RM) $(TEST_DIR)/*.{o,elf,bin,lds} $(SNIPPET_DIR)/*/*.{o,elf,*bin,*obj,hdr,lds} $(SNIPPET_DIR)/asm/.*.d $(TEST_DIR)/.*.d lib/s390x/.*.d $(comm-key) generated-files = $(asm-offsets) $(tests:.elf=.o) $(asmlib) $(cflatobjs): $(generated-files)
s390x/flat.lds.S renamed from s390x/flat.lds +0 -0
s390x/snippets/asm/flat.lds.S renamed from s390x/snippets/asm/flat.lds +0 -0
s390x/snippets/c/flat.lds.S renamed from s390x/snippets/c/flat.lds +0 -0
Signature · 1 line
2.34.1
Re: [kvm-unit-tests PATCH v3 5/7] s390x: use preprocessor for linker script generation
Quoted 6 lines · On Tue, 7 Mar 2023 10:10:49 +0100 Marc Hartmayer <[email protected]>…
The old
.ldsscripts are being renamed to.lds.Sand the actual.ldsscripts are being generated by the assembler preprocessor. This change allows us to use constants defined by macros in the.lds.Sfiles.Signed-off-by Marc Hartmayer <[email protected]>
Quoted 64 lines
--- .gitignore | 1 + s390x/Makefile | 7 +++++-- s390x/{flat.lds => flat.lds.S} | 0 s390x/snippets/asm/{flat.lds => flat.lds.S} | 0 s390x/snippets/c/{flat.lds => flat.lds.S} | 0 5 files changed, 6 insertions(+), 2 deletions(-) rename s390x/{flat.lds => flat.lds.S} (100%) rename s390x/snippets/asm/{flat.lds => flat.lds.S} (100%) rename s390x/snippets/c/{flat.lds => flat.lds.S} (100%).gitignore +1
-0@@ -31,3 +31,4 @@ cscope.* /s390x/comm.key /s390x/snippets/*/*.hdr /s390x/snippets/*/*.*obj +/s390x/**/*.ldss390x/Makefile +5
-2@@ -76,7 +76,7 @@ CFLAGS += -fno-delete-null-pointer-checks LDFLAGS += -nostdlib -Wl,--build-id=none # We want to keep intermediate files -.PRECIOUS: %.o +.PRECIOUS: %.o %.lds asm-offsets = lib/$(ARCH)/asm-offsets.h include $(SRCDIR)/scripts/asm-offsets.mak@@ -159,6 +159,9 @@ $(SNIPPET_DIR)/c/%.gbin: $(SNIPPET_DIR)/c/%.o $(snippet_lib) $(FLATLIBS) $(SNIPP %.hdr.obj: %.hdr $(OBJCOPY) -I binary -O elf64-s390 -B "s390:64-bit" $< $@ +lds-autodepend-flags = -MMD -MF $(dir $*).$(notdir $*).d -MT $@ +%.lds: %.lds.S + $(CPP) $(lds-autodepend-flags) $(CPPFLAGS) -P -C -o $@ $< .SECONDEXPANSION: %.elf: $(FLATLIBS) $(asmlib) $(SRCDIR)/s390x/flat.lds $$(snippets-obj) $$(snippet-hdr-obj) %.o@@ -211,7 +214,7 @@ $(snippet_asmlib): $$(patsubst %.o,%.S,$$@) $(asm-offsets) arch_clean: asm_offsets_clean - $(RM) $(TEST_DIR)/*.{o,elf,bin} $(SNIPPET_DIR)/*/*.{o,elf,*bin,*obj,hdr} $(SNIPPET_DIR)/asm/.*.d $(TEST_DIR)/.*.d lib/s390x/.*.d $(comm-key) + $(RM) $(TEST_DIR)/*.{o,elf,bin,lds} $(SNIPPET_DIR)/*/*.{o,elf,*bin,*obj,hdr,lds} $(SNIPPET_DIR)/asm/.*.d $(TEST_DIR)/.*.d lib/s390x/.*.d $(comm-key) generated-files = $(asm-offsets) $(tests:.elf=.o) $(asmlib) $(cflatobjs): $(generated-files)s390x/flat.lds.S renamed from s390x/flat.lds +0
-0s390x/snippets/asm/flat.lds.S renamed from s390x/snippets/asm/flat.lds +0
-0s390x/snippets/c/flat.lds.S renamed from s390x/snippets/c/flat.lds +0
-0
Re: [kvm-unit-tests PATCH v3 5/7] s390x: use preprocessor for linker script generation
In reply to Marc HartmayerQuoted 6 lines · Marc Hartmayer
The old
.ldsscripts are being renamed to.lds.Sand the actual.ldsscripts are being generated by the assembler preprocessor. This change allows us to use constants defined by macros in the.lds.Sfiles.Signed-off-by Marc Hartmayer <[email protected]>
[...]
PATCH v3 6/7 s390x: define a macro for the stack frame size
In reply to Marc HartmayerDefine and use a macro for the stack frame size. While at it, fix whitespace in the gs_handler_asm block.
--- lib/s390x/asm-offsets.c | 1 + s390x/Makefile | 2 +- s390x/cstart64.S | 2 +- s390x/flat.lds.S | 4 +++- s390x/gs.c | 38 +++++++++++++++++++++---------------- s390x/macros.S | 4 ++-- s390x/snippets/c/flat.lds.S | 6 ++++-- 7 files changed, 34 insertions(+), 23 deletions(-)
lib/s390x/asm-offsets.c +1 -0
@@ -87,6 +87,7 @@ int main(void)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 )); +DEFINE (STACK_FRAME_SIZE ,sizeof (struct stack_frame ));return 0 ; }
s390x/Makefile +1 -1
@@ -160,7 +160,7 @@ $(SNIPPET_DIR)/c/%.gbin: $(SNIPPET_DIR)/c/%.o $(snippet_lib) $(FLATLIBS) $(SNIPP $(OBJCOPY) -I binary -O elf64-s390 -B "s390:64-bit" $< $@ lds-autodepend-flags = -MMD -MF $(dir $*).$(notdir $*).d -MT $@ -%.lds: %.lds.S +%.lds: %.lds.S $(asm-offsets) $(CPP) $(lds-autodepend-flags) $(CPPFLAGS) -P -C -o $@ $< .SECONDEXPANSION:
s390x/cstart64.S +1 -1
@@ -38,7 +38,7 @@ start: /* setup stack */ larl %r15, stackptr /* Clear first stack frame */ - xc 0(160,%r15), 0(%r15) + xc 0(STACK_FRAME_SIZE,%r15), 0(%r15) /* setup initial PSW mask + control registers*/ larl %r1, initial_psw lpswe 0(%r1)
s390x/flat.lds.S +3 -1
@@ -1,3 +1,5 @@ +#include <asm/asm-offsets.h> + SECTIONS { .lowcore : {
@@ -44,6 +46,6 @@ SECTIONS /* * stackptr set with initial stack frame preallocated */ - stackptr = . - 160; + stackptr = . - STACK_FRAME_SIZE; stacktop = .; }
s390x/gs.c +22 -16
@@ -9,6 +9,7 @@* Janosch Frank <[email protected]> */ #include <libcflat.h> +#include <asm/asm-offsets.h> #include <asm/page.h> #include <asm/facility.h> #include <asm/interrupt.h>
@@ -35,22 +36,27 @@ static inline unsigned long load_guarded(unsigned long *p)/* guarded-storage event handler and finally it calls gs_handler */ extern void gs_handler_asm (void ); - asm(".globl gs_handler_asm\n" -"gs_handler_asm:\n" -" lgr %r14,%r15\n" /* Save current stack address in r14 */ -" aghi %r15,-320\n" /* Allocate stack frame */ -" stmg %r0,%r13,192(%r15)\n" /* Store regs to save area */ -" stg %r14,312(%r15)\n" -" la %r2,160(%r15)\n" /* Store gscb address in this_cb */ -" .insn rxy,0xe30000000049,0,160(%r15)\n" /* stgsc */ -" lg %r14,24(%r2)\n" /* Get GSEPLA from GSCB*/ -" lg %r14,40(%r14)\n" /* Get GSERA from GSEPL*/ -" stg %r14,304(%r15)\n" /* Store GSERA in r14 of reg save area */ -" brasl %r14,gs_handler\n" /* Jump to gs_handler */ -" lmg %r0,%r15,192(%r15)\n" /* Restore regs */ -" aghi %r14, 6\n" /* Add lgg instr len to GSERA */ -" br %r14\n" /* Jump to next instruction after lgg */ -" .size gs_handler_asm,.-gs_handler_asm\n" ); + asm (".macro STGSC args:vararg\n" +" .insn rxy,0xe30000000049,\\args\n" +" .endm\n" +" .globl gs_handler_asm\n" +"gs_handler_asm:\n" +" lgr %r14,%r15\n" /* Save current stack address in r14 */ + ".Lgs_handler_frame = 16*8+32+" xstr(STACK_FRAME_SIZE) "\n" +" aghi %r15,-(.Lgs_handler_frame)\n" /* Allocate stack frame */ +" stmg %r0,%r13,192(%r15)\n" /* Store regs to save area */ +" stg %r14,312(%r15)\n" + " la %r2," xstr(STACK_FRAME_SIZE) "(%r15)\n" /* Store gscb address in this_cb */ + " STGSC %r0," xstr(STACK_FRAME_SIZE) "(%r15)\n" +" lg %r14,24(%r2)\n" /* Get GSEPLA from GSCB*/ +" lg %r14,40(%r14)\n" /* Get GSERA from GSEPL*/ +" stg %r14,304(%r15)\n" /* Store GSERA in r14 of reg save area */ +" brasl %r14,gs_handler\n" /* Jump to gs_handler */ +" lmg %r0,%r15,192(%r15)\n" /* Restore regs */ +" aghi %r14, 6\n" /* Add lgg instr len to GSERA */ +" br %r14\n" /* Jump to next instruction after lgg */ +".size gs_handler_asm,.-gs_handler_asm\n" + );void gs_handler (struct gs_cb *this_cb) {
s390x/macros.S +2 -2
@@ -21,14 +21,14 @@ /* 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 + slgfi %r15, STACK_FRAME_SIZE /* * 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 + algfi %r15, STACK_FRAME_SIZE RESTORE_REGS_STACK lpswe \old_psw .endm
s390x/snippets/c/flat.lds.S +4 -2
@@ -1,3 +1,5 @@ +#include <asm/asm-offsets.h> + SECTIONS { .lowcore : {
@@ -18,9 +20,9 @@ SECTIONS . = 0x4000; /* * The stack grows down from 0x4000 to 0x2000, we pre-allocoate - * a frame via the -160. + * a frame via the -STACK_FRAME_SIZE. */ - stackptr = . - 160; + stackptr = . - STACK_FRAME_SIZE; stacktop = .; /* Start text 0x4000 */ .text : {
Signature · 1 line
2.34.1
Re: [kvm-unit-tests PATCH v3 6/7] s390x: define a macro for the stack frame size
Quoted 5 lines · On Tue, 7 Mar 2023 10:10:50 +0100 Marc Hartmayer <[email protected]>…
Define and use a macro for the stack frame size. While at it, fix whitespace in the
gs_handler_asmblock.Signed-off-by Marc Hartmayer <[email protected]>Co-developed-by Nina Schoetterl-Glausch <[email protected]>
Quoted 165 lines
--- lib/s390x/asm-offsets.c | 1 + s390x/Makefile | 2 +- s390x/cstart64.S | 2 +- s390x/flat.lds.S | 4 +++- s390x/gs.c | 38 +++++++++++++++++++++---------------- s390x/macros.S | 4 ++-- s390x/snippets/c/flat.lds.S | 6 ++++-- 7 files changed, 34 insertions(+), 23 deletions(-)lib/s390x/asm-offsets.c +1
-0@@ -87,6 +87,7 @@ int main(void)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 )); +DEFINE (STACK_FRAME_SIZE ,sizeof (struct stack_frame ));return 0 ; }s390x/Makefile +1
-1@@ -160,7 +160,7 @@ $(SNIPPET_DIR)/c/%.gbin: $(SNIPPET_DIR)/c/%.o $(snippet_lib) $(FLATLIBS) $(SNIPP $(OBJCOPY) -I binary -O elf64-s390 -B "s390:64-bit" $< $@ lds-autodepend-flags = -MMD -MF $(dir $*).$(notdir $*).d -MT $@ -%.lds: %.lds.S +%.lds: %.lds.S $(asm-offsets) $(CPP) $(lds-autodepend-flags) $(CPPFLAGS) -P -C -o $@ $< .SECONDEXPANSION:s390x/cstart64.S +1
-1@@ -38,7 +38,7 @@ start: /* setup stack */ larl %r15, stackptr /* Clear first stack frame */ - xc 0(160,%r15), 0(%r15) + xc 0(STACK_FRAME_SIZE,%r15), 0(%r15) /* setup initial PSW mask + control registers*/ larl %r1, initial_psw lpswe 0(%r1)s390x/flat.lds.S +3
-1@@ -1,3 +1,5 @@ +#include <asm/asm-offsets.h> + SECTIONS { .lowcore : {@@ -44,6 +46,6 @@ SECTIONS /* * stackptr set with initial stack frame preallocated */ - stackptr = . - 160; + stackptr = . - STACK_FRAME_SIZE; stacktop = .; }s390x/gs.c +22
-16@@ -9,6 +9,7 @@* Janosch Frank <[email protected]> */ #include <libcflat.h> +#include <asm/asm-offsets.h> #include <asm/page.h> #include <asm/facility.h> #include <asm/interrupt.h> @@ -35,22 +36,27 @@ static inline unsigned long load_guarded(unsigned long *p)/* guarded-storage event handler and finally it calls gs_handler */ extern void gs_handler_asm (void ); - asm(".globl gs_handler_asm\n" -"gs_handler_asm:\n" -" lgr %r14,%r15\n" /* Save current stack address in r14 */ -" aghi %r15,-320\n" /* Allocate stack frame */ -" stmg %r0,%r13,192(%r15)\n" /* Store regs to save area */ -" stg %r14,312(%r15)\n" -" la %r2,160(%r15)\n" /* Store gscb address in this_cb */ -" .insn rxy,0xe30000000049,0,160(%r15)\n" /* stgsc */ -" lg %r14,24(%r2)\n" /* Get GSEPLA from GSCB*/ -" lg %r14,40(%r14)\n" /* Get GSERA from GSEPL*/ -" stg %r14,304(%r15)\n" /* Store GSERA in r14 of reg save area */ -" brasl %r14,gs_handler\n" /* Jump to gs_handler */ -" lmg %r0,%r15,192(%r15)\n" /* Restore regs */ -" aghi %r14, 6\n" /* Add lgg instr len to GSERA */ -" br %r14\n" /* Jump to next instruction after lgg */ -" .size gs_handler_asm,.-gs_handler_asm\n" ); + asm (".macro STGSC args:vararg\n" +" .insn rxy,0xe30000000049,\\args\n" +" .endm\n" +" .globl gs_handler_asm\n" +"gs_handler_asm:\n" +" lgr %r14,%r15\n" /* Save current stack address in r14 */ + ".Lgs_handler_frame = 16*8+32+" xstr(STACK_FRAME_SIZE) "\n" +" aghi %r15,-(.Lgs_handler_frame)\n" /* Allocate stack frame */ +" stmg %r0,%r13,192(%r15)\n" /* Store regs to save area */ +" stg %r14,312(%r15)\n" + " la %r2," xstr(STACK_FRAME_SIZE) "(%r15)\n" /* Store gscb address in this_cb */ + " STGSC %r0," xstr(STACK_FRAME_SIZE) "(%r15)\n" +" lg %r14,24(%r2)\n" /* Get GSEPLA from GSCB*/ +" lg %r14,40(%r14)\n" /* Get GSERA from GSEPL*/ +" stg %r14,304(%r15)\n" /* Store GSERA in r14 of reg save area */ +" brasl %r14,gs_handler\n" /* Jump to gs_handler */ +" lmg %r0,%r15,192(%r15)\n" /* Restore regs */ +" aghi %r14, 6\n" /* Add lgg instr len to GSERA */ +" br %r14\n" /* Jump to next instruction after lgg */ +".size gs_handler_asm,.-gs_handler_asm\n" + );void gs_handler (struct gs_cb *this_cb) {s390x/macros.S +2
-2@@ -21,14 +21,14 @@ /* 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 + slgfi %r15, STACK_FRAME_SIZE /* * 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 + algfi %r15, STACK_FRAME_SIZE RESTORE_REGS_STACK lpswe \old_psw .endms390x/snippets/c/flat.lds.S +4
-2@@ -1,3 +1,5 @@ +#include <asm/asm-offsets.h> + SECTIONS { .lowcore : {@@ -18,9 +20,9 @@ SECTIONS . = 0x4000; /* * The stack grows down from 0x4000 to 0x2000, we pre-allocoate - * a frame via the -160. + * a frame via the -STACK_FRAME_SIZE. */ - stackptr = . - 160; + stackptr = . - STACK_FRAME_SIZE; stacktop = .; /* Start text 0x4000 */ .text : {
Re: [kvm-unit-tests PATCH v3 6/7] s390x: define a macro for the stack frame size
In reply to Marc HartmayerQuoted 5 lines · Marc Hartmayer
Define and use a macro for the stack frame size. While at it, fix whitespace in the
gs_handler_asmblock.Signed-off-by Marc Hartmayer <[email protected]>Co-developed-by Nina Schoetterl-Glausch <[email protected]>
[...]
Re: [kvm-unit-tests PATCH v3 6/7] s390x: define a macro for the stack frame size
In reply to Marc HartmayerHi Marc, Nina,
Quoting Marc Hartmayer (2023-03-07 10:10:50)
Quoted 5 lines
Define and use a macro for the stack frame size. While at it, fix whitespace in the
gs_handler_asmblock.Signed-off-by Marc Hartmayer <[email protected]>Co-developed-by Nina Schoetterl-Glausch <[email protected]>
this commit breaks cross-compilation on x86 for me.
Steps to reproduce:
$ mkdir build $ cd build $ ../configure --arch=s390x --cross-prefix=s390x-linux-gnu- $ make -j16
Error is:
In file included from /builds/Nico-Boehr/kvm-unit-tests/lib/s390x/interrupt.c:12:
/builds/Nico-Boehr/kvm-unit-tests/lib/s390x/asm/asm-offsets.h:8:10: fatal error: generated/asm-offsets.h: No such file or directory
8 | #include <generated/asm-offsets.h>
| ^~~~~~~~~~~~~~~~~~~~~~~~~
compilation terminated.
make: *** [<builtin>: lib/s390x/interrupt.o] Error 1
make: *** Waiting for unfinished jobs....
Can you take care of this? It prevents me from sending the next pull request.
Re: [kvm-unit-tests PATCH v3 6/7] s390x: define a macro for the stack frame size
Quoted 27 lines · Nico Boehr
Hi Marc, Nina,
Quoting Marc Hartmayer (2023-03-07 10:10:50)
Quoted 5 lines
Define and use a macro for the stack frame size. While at it, fix whitespace in the
gs_handler_asmblock.Signed-off-by Marc Hartmayer <[email protected]>Co-developed-by Nina Schoetterl-Glausch <[email protected]>this commit breaks cross-compilation on x86 for me.
Steps to reproduce:
$ mkdir build $ cd build $ ../configure --arch=s390x --cross-prefix=s390x-linux-gnu- $ make -j16Error is:
In file included from /builds/Nico-Boehr/kvm-unit-tests/lib/s390x/interrupt.c:12:
/builds/Nico-Boehr/kvm-unit-tests/lib/s390x/asm/asm-offsets.h:8:10: fatal error:generated/asm-offsets.h: No such file or directory
8 | #include <generated/asm-offsets.h>
| ^~~~~~~~~~~~~~~~~~~~~~~~~
compilation terminated.
make: *** [<builtin>:lib/s390x/interrupt.o] Error 1
make: *** Waiting for unfinished jobs....
Quoted 2 lines
Can you take care of this? It prevents me from sending the next pull request.
Thanks for reporting this. Commit 6ef5785d30e8 ("s390x/Makefile:
refactor CPPFLAGS") broke it. I will be sending a fix for this soon.
Signature · 8 lines
Kind regards / Beste Grüße Marc Hartmayer IBM Deutschland Research & Development GmbH Vorsitzender des Aufsichtsrats: Gregor Pillen Geschäftsführung: David Faller Sitz der Gesellschaft: Böblingen Registergericht: Amtsgericht Stuttgart, HRB 243294
PATCH v4 1/1 s390x/Makefile: refactor CPPFLAGS
In reply to Nico BoehrThis change makes it easier to reuse them. While at it, add a comment why the lib include path is required.
--- s390x/Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
s390x/Makefile +6 -1
@@ -63,9 +63,14 @@ test_cases: $(tests) test_cases_binary: $(tests_binary) test_cases_pv: $(tests_pv_binary) +INCLUDE_PATHS = $(SRCDIR)/lib $(SRCDIR)/lib/s390x +# Include generated header files (e.g. in case of out-of-source builds) +INCLUDE_PATHS += lib +CPPFLAGS = $(addprefix -I,$(INCLUDE_PATHS)) + CFLAGS += -std=gnu99 CFLAGS += -ffreestanding -CFLAGS += -I $(SRCDIR)/lib -I $(SRCDIR)/lib/s390x -I lib +CFLAGS += $(CPPFLAGS) CFLAGS += -O2 CFLAGS += -march=zEC12 CFLAGS += -mbackchain
Signature · 1 line
2.34.1
Re: [kvm-unit-tests PATCH v4] s390x/Makefile: refactor CPPFLAGS
Quoting Marc Hartmayer (2023-03-31 10:27:09)
Quoted 13 lines
This change makes it easier to reuse them. While at it, add a comment why the
libinclude path is required.Signed-off-by Marc Hartmayer <[email protected]>--- s390x/Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)s390x/Makefile +0
-0
s390x/Makefile test_cases: $(tests) · line 68
Quoted 6 lines
s390x/Makefile +3
-0@@ -63,9 +63,14 @@ test_cases: $(tests) test_cases_binary: $(tests_binary) test_cases_pv: $(tests_pv_binary) +INCLUDE_PATHS = $(SRCDIR)/lib $(SRCDIR)/lib/s390x +# Include generated header files (e.g. in case of out-of-source builds) +INCLUDE_PATHS += lib
Do you mind if I fix this up during picking?
ERROR: trailing whitespace
#35: FILE: s390x/Makefile:68:
+INCLUDE_PATHS += lib $
Re: [kvm-unit-tests PATCH v4] s390x/Makefile: refactor CPPFLAGS
Quoted 17 lines · Nico Boehr
Quoting Marc Hartmayer (2023-03-31 10:27:09)
Quoted 16 lines
This change makes it easier to reuse them. While at it, add a comment why the
libinclude path is required.Signed-off-by Marc Hartmayer <[email protected]>--- s390x/Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)s390x/Makefile +0
-0@@ -63,9 +63,14 @@ test_cases: $(tests) test_cases_binary: $(tests_binary) test_cases_pv: $(tests_pv_binary)
Quoted 5 lines
s390x/Makefile test_cases: $(tests) · line 68
Quoted 3 lines
s390x/Makefile +3
-0+INCLUDE_PATHS = $(SRCDIR)/lib $(SRCDIR)/lib/s390x +# Include generated header files (e.g. in case of out-of-source builds) +INCLUDE_PATHS += libDo you mind if I fix this up during picking?
Please fix it, thanks.
Quoted 4 lines
ERROR: trailing whitespace
#35: FILE: s390x/Makefile:68:
+INCLUDE_PATHS += lib $
--
Kind regards / Beste Grüße
Marc Hartmayer
IBM Deutschland Research & Development GmbH Vorsitzender des Aufsichtsrats: Gregor Pillen Geschäftsführung: David Faller
Sitz der Gesellschaft: Böblingen
Registergericht: Amtsgericht Stuttgart, HRB 243294
Re: [kvm-unit-tests PATCH v4] s390x/Makefile: refactor CPPFLAGS
In reply to Marc HartmayerQuoting Marc Hartmayer (2023-03-31 10:27:09)
Quoted 4 lines
This change makes it easier to reuse them. While at it, add a comment why the
libinclude path is required.Signed-off-by Marc Hartmayer <[email protected]>
PATCH v3 7/7 lib/linux/const.h: test for `__ASSEMBLER__` as well
In reply to Marc HartmayerOn s390x we're using the preprocessor for generating our linker scripts out of assembly files. The macro __ASSEMBLER__ is defined with value 1 when preprocessing assembly language using gcc. [1] Therefore, let's check for the macro __ASSEMBLER__ in lib/linux/const.h as well. Thus we can use macros that makes use of the _AC or _AT macro in the "linker scripts".
[1] https://gcc.gnu.org/onlinedocs/cpp/Standard-Predefined-Macros.html
--- lib/linux/const.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
lib/linux/const.h +1 -1
@@ -12,7 +12,7 @@* leave it unchanged in asm. */ -#ifdef __ASSEMBLY__ +#if defined(__ASSEMBLY__) || defined(__ASSEMBLER__)#define _AC (X ,Y ) X#define _AT (T ,X ) X#else
Signature · 1 line
2.34.1