s390x: some migration tests and gcc12 support
Hi Paolo,
please merge the following changes:
* support for gcc12
* cmm migration test
* storage key migration test
MERGE:
https://gitlab.com/kvm-unit-tests/kvm-unit-tests/-/merge_requests/33
PIPELINE:
https://gitlab.com/imbrenda/kvm-unit-tests/-/pipelines/563551059
PULL:
https://gitlab.com/imbrenda/kvm-unit-tests.git s390x-next-2022-06
Janis Schoetterl-Glausch (2):
s390x: Introduce symbol for lowcore and use it
s390x: Fix gcc 12 warning about array bounds
Nico Boehr (3):
lib: s390x: add header for CMM related defines
s390x: add cmm migration test
s390x: add migration test for storage keys
s390x/Makefile | 2 + lib/s390x/asm/arch_def.h | 2 + lib/s390x/asm/cmm.h | 50 +++++++++++++++++++++++ lib/s390x/asm/facility.h | 4 +- lib/s390x/asm/mem.h | 4 ++ lib/s390x/css.h | 2 - lib/s390x/css_lib.c | 12 +++--- lib/s390x/fault.c | 10 ++--- lib/s390x/interrupt.c | 61 ++++++++++++++-------------- lib/s390x/mmu.c | 3 +- s390x/flat.lds | 1 + s390x/snippets/c/flat.lds | 1 + s390x/cmm.c | 25 ++---------- s390x/css.c | 4 +- s390x/diag288.c | 4 +- s390x/edat.c | 5 +-- s390x/emulator.c | 15 ++++--- s390x/migration-cmm.c | 77 +++++++++++++++++++++++++++++++++++ s390x/migration-skey.c | 83 ++++++++++++++++++++++++++++++++++++++ s390x/mvpg.c | 7 ++-- s390x/sclp.c | 3 +- s390x/skey.c | 2 +- s390x/skrf.c | 11 ++--- s390x/smp.c | 23 +++++------ s390x/snippets/c/spec_ex.c | 5 +-- s390x/unittests.cfg | 8 ++++ 26 files changed, 306 insertions(+), 118 deletions(-) create mode 100644 lib/s390x/asm/cmm.h create mode 100644 s390x/migration-cmm.c create mode 100644 s390x/migration-skey.c
Signature · 1 line
2.36.1
[kvm-unit-tests GIT PULL 1/5] lib: s390x: add header for CMM related defines
From: Nico Boehr <[email protected]>
Since we're going to need the definitions in an upcoming migration test for CMM, add a header for CMM related defines. It is based on arch/s390/include/asm/page-states.h from linux.
While at it, use the constants in existing calls to CMM related functions.
Also move essa() and test_availability() there to be able to use it outside cmm.c.
--- lib/s390x/asm/cmm.h | 50 +++++++++++++++++++++++++++++++++++++++++++++ s390x/cmm.c | 25 +++-------------------- 2 files changed, 53 insertions(+), 22 deletions(-) create mode 100644 lib/s390x/asm/cmm.h
lib/s390x/asm/cmm.h new file +50 -0
@@ -0,0 +1,50 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright IBM Corp. 2017, 2022 +* Author(s): Claudio Imbrenda <[email protected]> +* Nico Boehr <[email protected]> +*/ +#include <asm/interrupt.h> + +#ifndef PAGE_STATES_H +#define PAGE_STATES_H + +#define ESSA_GET_STATE 0 +#define ESSA_SET_STABLE 1 +#define ESSA_SET_UNUSED 2 +#define ESSA_SET_VOLATILE 3 +#define ESSA_SET_POT_VOLATILE 4 +#define ESSA_SET_STABLE_RESIDENT 5 +#define ESSA_SET_STABLE_IF_RESIDENT 6 +#define ESSA_SET_STABLE_NODAT 7 + +#define ESSA_MAX ESSA_SET_STABLE_NODAT + +#define ESSA_USAGE_STABLE 0 +#define ESSA_USAGE_UNUSED 1 +#define ESSA_USAGE_POT_VOLATILE 2 +#define ESSA_USAGE_VOLATILE 3 + +static unsigned long essa (uint8_t state,unsigned long paddr) +{ +uint64_t extr_state; + + asmvolatile (".insn rrf,0xb9ab0000,%[extr_state],%[addr],%[new_state],0" \ + : [extr_state]"=d" (extr_state) \ + : [addr]"a" (paddr), [new_state]"i" (state)); + +return (unsigned long )extr_state; +} + +/* +* Unfortunately the availability is not indicated by stfl bits, but +* we have to try to execute it and test for an operation exception. +*/ +static inline bool check_essa_available (void ) +{ +expect_pgm_int (); +essa (ESSA_GET_STATE ,0 ); +return clear_pgm_int () ==0 ; +} + +#endif
s390x/cmm.c +3 -22
@@ -12,19 +12,10 @@#include <asm/asm-offsets.h> #include <asm/interrupt.h> #include <asm/page.h> +#include <asm/cmm.h> static uint8_t pagebuf[PAGE_SIZE] __attribute__((aligned(PAGE_SIZE))); -static unsigned long essa (uint8_t state,unsigned long paddr) -{ -uint64_t extr_state; - - asmvolatile (".insn rrf,0xb9ab0000,%[extr_state],%[addr],%[new_state],0" - : [extr_state]"=d" (extr_state) - : [addr]"a" (paddr), [new_state]"i" (state)); -return (unsigned long )extr_state; -} -static void test_params (void ) {report_prefix_push ("invalid ORC 8" );
@@ -39,24 +30,14 @@ static void test_priv(void)report_prefix_push ("privileged" );expect_pgm_int ();enter_pstate (); -essa (0 , (unsigned long )pagebuf); +essa (ESSA_GET_STATE , (unsigned long )pagebuf);check_pgm_int_code (PGM_INT_CODE_PRIVILEGED_OPERATION );report_prefix_pop (); } -/* Unfortunately the availability is not indicated by stfl bits, but -* we have to try to execute it and test for an operation exception. -*/ -static bool test_availability (void ) -{ -expect_pgm_int (); -essa (0 , (unsigned long )pagebuf); -return clear_pgm_int () ==0 ; -} -int main (void ) { -bool has_essa =test_availability (); +bool has_essa =check_essa_available ();report_prefix_push ("cmm" );if (!has_essa) {
Signature · 1 line
2.36.1
[kvm-unit-tests GIT PULL 2/5] s390x: add cmm migration test
In reply to Claudio ImbrendaFrom: Nico Boehr <[email protected]>
When a VM is migrated, we expect the page states to be preserved. Add a test which checks for that.
--- s390x/Makefile | 1 + s390x/migration-cmm.c | 77 +++++++++++++++++++++++++++++++++++++++++++ s390x/unittests.cfg | 4 +++ 3 files changed, 82 insertions(+) create mode 100644 s390x/migration-cmm.c
s390x/Makefile +1 -0
@@ -32,6 +32,7 @@ tests += $(TEST_DIR)/epsw.elf tests += $(TEST_DIR)/adtl-status.elf tests += $(TEST_DIR)/migration.elf tests += $(TEST_DIR)/pv-attest.elf +tests += $(TEST_DIR)/migration-cmm.elf pv-tests += $(TEST_DIR)/pv-diags.elf
s390x/migration-cmm.c new file +77 -0
77 lines not on this page · raw message
s390x/unittests.cfg +4 -0
@@ -176,3 +176,7 @@ extra_params = -cpu qemu,gs=off,vx=off file = migration.elf groups = migration smp = 2 + +[migration-cmm] +file = migration-cmm.elf +groups = migration
Signature · 1 line
2.36.1
[kvm-unit-tests GIT PULL 4/5] s390x: Fix gcc 12 warning about array bounds
In reply to Claudio ImbrendaFrom: Janis Schoetterl-Glausch <[email protected]>
gcc 12 warns about pointer constant <4k dereference. Silence the warning by using the extern lowcore symbol to derive the pointers. This way gcc cannot conclude that the pointer is <4k.
Message-Id: <[email protected]>
--- lib/s390x/asm/mem.h | 4 ++++ s390x/emulator.c | 5 +++-- s390x/skey.c | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-)
lib/s390x/asm/mem.h +4 -0
@@ -7,6 +7,10 @@*/ #ifndef _ASMS390X_MEM_H_#define _ASMS390X_MEM_H_ +#include <asm/arch_def.h> + +/* create pointer while avoiding compiler warnings */ +#define OPAQUE_PTR (x) ((void *)(((uint64_t)&lowcore) + (x)))#define SKEY_ACC 0xf0#define SKEY_FP 0x08
s390x/emulator.c +3 -2
@@ -12,6 +12,7 @@#include <asm/cpacf.h> #include <asm/interrupt.h> #include <asm/float.h> +#include <asm/mem.h> #include <linux/compiler.h> static inline void __test_spm_ipm (uint8_t cc,uint8_t key)
@@ -138,7 +139,7 @@ static __always_inline void __test_cpacf_invalid_parm(unsigned int opcode) {report_prefix_push ("invalid parm address" );expect_pgm_int (); -__cpacf_query (opcode, (void *)-1 ); +__cpacf_query (opcode,OPAQUE_PTR (-1 ));check_pgm_int_code (PGM_INT_CODE_ADDRESSING );report_prefix_pop (); }
@@ -148,7 +149,7 @@ static __always_inline void __test_cpacf_protected_parm(unsigned int opcode)report_prefix_push ("protected parm address" );expect_pgm_int ();low_prot_enable (); -__cpacf_query (opcode, (void *)8 ); +__cpacf_query (opcode,OPAQUE_PTR (8 ));low_prot_disable ();check_pgm_int_code (PGM_INT_CODE_PROTECTION );report_prefix_pop ();
s390x/skey.c +1 -1
@@ -349,7 +349,7 @@ static void test_set_prefix(void)set_storage_key (pagebuf,0x28 ,0 );expect_pgm_int ();install_page (root,virt_to_pte_phys (root, pagebuf),0 ); -set_prefix_key_1 ((uint32_t *)2048 ); +set_prefix_key_1 (OPAQUE_PTR (2048 ));install_page (root,0 ,0 );check_pgm_int_code (PGM_INT_CODE_PROTECTION );report (get_prefix () == old_prefix,"did not set prefix" );
Signature · 1 line
2.36.1
[kvm-unit-tests GIT PULL 5/5] s390x: add migration test for storage keys
In reply to Claudio ImbrendaFrom: Nico Boehr <[email protected]>
Upon migration, we expect storage keys set by the guest to be preserved, so add a test for it.
We keep 128 pages and set predictable storage keys. Then, we migrate and check that they can be read back and match the value originally set.
Message-Id: <[email protected]>
--- s390x/Makefile | 1 + s390x/migration-skey.c | 83 ++++++++++++++++++++++++++++++++++++++++++ s390x/unittests.cfg | 4 ++ 3 files changed, 88 insertions(+) create mode 100644 s390x/migration-skey.c
s390x/Makefile +1 -0
@@ -33,6 +33,7 @@ tests += $(TEST_DIR)/adtl-status.elf tests += $(TEST_DIR)/migration.elf tests += $(TEST_DIR)/pv-attest.elf tests += $(TEST_DIR)/migration-cmm.elf +tests += $(TEST_DIR)/migration-skey.elf pv-tests += $(TEST_DIR)/pv-diags.elf
s390x/migration-skey.c new file +83 -0
83 lines not on this page · raw message
s390x/unittests.cfg +4 -0
@@ -180,3 +180,7 @@ smp = 2 [migration-cmm] file = migration-cmm.elf groups = migration + +[migration-skey] +file = migration-skey.elf +groups = migration
Signature · 1 line
2.36.1
[kvm-unit-tests GIT PULL 3/5] s390x: Introduce symbol for lowcore and use it
In reply to Claudio ImbrendaFrom: Janis Schoetterl-Glausch <[email protected]>
This gets rid of bunch of pointers pointing to the lowcore used in various places and replaces it with a unified way of addressing the lowcore.
The new symbol is not a pointer. While this will lead to worse code generation (cannot use register 0 for addressing), that should not matter too much for kvm unit tests.
Since the lowcore is located per definition at address 0, the symbol is defined via the linker scripts.
The symbol also will be used to create pointers that the compiler cannot warn about as being outside the bounds of an array.
Message-Id: <[email protected]>
--- lib/s390x/asm/arch_def.h | 2 ++ lib/s390x/asm/facility.h | 4 +-- lib/s390x/css.h | 2 -- lib/s390x/css_lib.c | 12 ++++---- lib/s390x/fault.c | 10 +++---- lib/s390x/interrupt.c | 61 +++++++++++++++++++------------------- lib/s390x/mmu.c | 3 +- s390x/flat.lds | 1 + s390x/snippets/c/flat.lds | 1 + s390x/css.c | 4 +-- s390x/diag288.c | 4 +-- s390x/edat.c | 5 ++-- s390x/emulator.c | 10 +++---- s390x/mvpg.c | 7 ++--- s390x/sclp.c | 3 +- s390x/skrf.c | 11 +++---- s390x/smp.c | 23 +++++++------- s390x/snippets/c/spec_ex.c | 5 ++-- 18 files changed, 75 insertions(+), 93 deletions(-)
lib/s390x/asm/arch_def.h +2 -0
@@ -145,6 +145,8 @@ struct lowcore { } __attribute__ ((__packed__));_Static_assert (sizeof (struct lowcore ) ==0x1900 ,"Lowcore size" ); +extern struct lowcore lowcore; +#define PGM_INT_CODE_OPERATION 0x01#define PGM_INT_CODE_PRIVILEGED_OPERATION 0x02#define PGM_INT_CODE_EXECUTE 0x03
lib/s390x/asm/facility.h +1 -3
@@ -36,10 +36,8 @@ static inline void stfle(uint64_t *fac, unsigned int nb_doublewords)static inline void setup_facilities (void ) { -struct lowcore *lc =NULL ; -stfl (); -memcpy (stfl_doublewords, &lc->stfl,sizeof (lc->stfl)); +memcpy (stfl_doublewords, &lowcore.stfl,sizeof (lowcore.stfl));if (test_facility (7 ))stfle (stfl_doublewords,NB_STFL_DOUBLEWORDS ); }
lib/s390x/css.h +0 -2
@@ -9,8 +9,6 @@#ifndef _S390X_CSS_H_#define _S390X_CSS_H_ -#define lowcore_ptr ((struct lowcore *)0x0) -/* subchannel ID bit 16 must always be one */ #define SCHID_ONE 0x00010000
lib/s390x/css_lib.c +6 -6
@@ -357,11 +357,11 @@ void css_irq_io(void)int sid;report_prefix_push ("Interrupt" ); - sid = lowcore_ptr->subsys_id_word; + sid = lowcore.subsys_id_word;/* Lowlevel set the SID as interrupt parameter. */ -if (lowcore_ptr->io_int_param != sid) { +if (lowcore.io_int_param != sid) {report_fail ("io_int_param: %x differs from subsys_id_word: %x" , - lowcore_ptr->io_int_param, sid); + lowcore.io_int_param, sid); goto pop; }report_prefix_pop ();
@@ -387,7 +387,7 @@ void css_irq_io(void) } pop:report_prefix_pop (); - lowcore_ptr->io_old_psw.mask &= ~PSW_MASK_WAIT ; + lowcore.io_old_psw.mask &= ~PSW_MASK_WAIT ; }int start_ccw1_chain (unsigned int sid,struct ccw1 *ccw)
@@ -432,9 +432,9 @@ int wait_and_check_io_completion(int schid)report_prefix_push ("check I/O completion" ); -if (lowcore_ptr->io_int_param != schid) { +if (lowcore.io_int_param != schid) {report_fail ("interrupt parameter: expected %08x got %08x" , - schid, lowcore_ptr->io_int_param); + schid, lowcore.io_int_param); ret =-1 ; goto end; }
lib/s390x/fault.c +4 -6
@@ -13,8 +13,6 @@#include <asm/page.h> #include <fault.h> -static struct lowcore *lc = (struct lowcore *)0x0 ; -/* Decodes the protection exceptions we'll most likely see */ static void print_decode_pgm_prot (uint64_t teid) {
@@ -37,7 +35,7 @@ static void print_decode_pgm_prot(uint64_t teid)void print_decode_teid (uint64_t teid) {int asce_id = teid &3 ; -bool dat = lc->pgm_old_psw.mask &PSW_MASK_DAT ; +bool dat = lowcore.pgm_old_psw.mask &PSW_MASK_DAT ;printf ("Memory exception information:\n" );printf ("DAT: %s\n" , dat ?"on" :"off" );
@@ -58,15 +56,15 @@ void print_decode_teid(uint64_t teid)break ; } -if (lc->pgm_int_code ==PGM_INT_CODE_PROTECTION ) +if (lowcore.pgm_int_code ==PGM_INT_CODE_PROTECTION )print_decode_pgm_prot (teid);/* * If teid bit 61 is off for these two exception the reported * address is unpredictable. */ -if ((lc->pgm_int_code ==PGM_INT_CODE_SECURE_STOR_ACCESS || - lc->pgm_int_code ==PGM_INT_CODE_SECURE_STOR_VIOLATION ) && +if ((lowcore.pgm_int_code ==PGM_INT_CODE_SECURE_STOR_ACCESS || + lowcore.pgm_int_code ==PGM_INT_CODE_SECURE_STOR_VIOLATION ) && !test_bit_inv (61 , &teid)) {printf ("Address: %lx, unpredictable\n " , teid &PAGE_MASK );return ;
lib/s390x/interrupt.c +30 -31
178 lines not on this page · raw message
lib/s390x/mmu.c +1 -2
@@ -43,7 +43,6 @@ void configure_dat(int enable)static void mmu_enable (pgd_t *pgtable) { -struct lowcore *lc =NULL ;const uint64_t asce =__pa (pgtable) |ASCE_DT_REGION1 |REGION_TABLE_LENGTH ;
@@ -55,7 +54,7 @@ static void mmu_enable(pgd_t *pgtable)configure_dat (1 );/* we can now also use DAT unconditionally in our PGM handler */ - lc->pgm_new_psw.mask |=PSW_MASK_DAT ; + lowcore.pgm_new_psw.mask |=PSW_MASK_DAT ; }/*
s390x/flat.lds +1 -0
@@ -7,6 +7,7 @@ SECTIONS * address 0x10000 (cstart64.S .init). */ . = 0; + lowcore = .; LONG(0x00080000) LONG(0x80010000) /* Restart new PSW for booting via PSW restart. */
s390x/snippets/c/flat.lds +1 -0
@@ -7,6 +7,7 @@ SECTIONS * address 0x4000 (cstart.S .init). */ . = 0; + lowcore = .; LONG(0x00080000) LONG(0x80004000) /* Restart new PSW for booting via PSW restart. */
s390x/css.c +2 -2
@@ -74,7 +74,7 @@ static void test_sense(void)return ; } - lowcore_ptr->io_int_param =0 ; + lowcore.io_int_param =0 ; senseid =alloc_io_mem (sizeof (*senseid),0 );if (!senseid) {
@@ -143,7 +143,7 @@ static void sense_id(void)static void css_init (void ) {assert (register_io_int_func (css_irq_io) ==0 ); - lowcore_ptr->io_int_param =0 ; + lowcore.io_int_param =0 ;report (get_chsc_scsc (),"Store Channel Characteristics" ); }
s390x/diag288.c +1 -3
@@ -12,8 +12,6 @@#include <asm/asm-offsets.h> #include <asm/interrupt.h> -struct lowcore *lc = (struct lowcore *)0x0 ; -#define CODE_INIT 0#define CODE_CHANGE 1#define CODE_CANCEL 2
@@ -92,7 +90,7 @@ static void test_bite(void)load_psw_mask (mask);/* Arm watchdog */ - lc->restart_new_psw.mask =extract_psw_mask () & ~PSW_MASK_EXT ; + lowcore.restart_new_psw.mask =extract_psw_mask () & ~PSW_MASK_EXT ;diag288 (CODE_INIT ,15 ,ACTION_RESTART ); asmvolatile (" larl %r0, 1f\n" " stg %r0, 424\n"
s390x/edat.c +2 -3
@@ -23,7 +23,6 @@ static uint8_t prefix_buf[LC_SIZE] __attribute__((aligned(LC_SIZE))); static unsigned int tmp[1024] __attribute__((aligned(PAGE_SIZE)));static void *root, *mem, *m; -static struct lowcore *lc;volatile unsigned int *p;/*
@@ -34,10 +33,10 @@ static bool check_pgm_prot(void *ptr) {union teid teid; -if (lc->pgm_int_code !=PGM_INT_CODE_PROTECTION ) +if (lowcore.pgm_int_code !=PGM_INT_CODE_PROTECTION )return false; - teid.val = lc->trans_exc_id; + teid.val = lowcore.trans_exc_id;/* * depending on the presence of the ESOP feature, the rest of the
s390x/emulator.c +4 -6
@@ -14,8 +14,6 @@#include <asm/float.h> #include <linux/compiler.h> -struct lowcore *lc =NULL ; -static inline void __test_spm_ipm (uint8_t cc,uint8_t key) {uint64_t in = (cc <<28 ) | (key <<24 );
@@ -262,7 +260,7 @@ static void test_prno(void)static void test_dxc (void ) {/* DXC (0xff) is to be stored in LC and FPC on a trap (CRT) with AFP */ - lc->dxc_vxc =0x12345678 ; + lowcore.dxc_vxc =0x12345678 ;set_fpc_dxc (0 );report_prefix_push ("afp" );
@@ -271,12 +269,12 @@ static void test_dxc(void) : : "r"(0) : "memory");check_pgm_int_code (PGM_INT_CODE_DATA ); -report (lc->dxc_vxc ==0xff ,"dxc in LC" ); +report (lowcore.dxc_vxc ==0xff ,"dxc in LC" );report (get_fpc_dxc () ==0xff ,"dxc in FPC" );report_prefix_pop ();/* DXC (0xff) is to be stored in LC only on a trap (CRT) without AFP */ - lc->dxc_vxc =0x12345678 ; + lowcore.dxc_vxc =0x12345678 ;set_fpc_dxc (0 );report_prefix_push ("no-afp" );
@@ -288,7 +286,7 @@ static void test_dxc(void)afp_enable ();check_pgm_int_code (PGM_INT_CODE_DATA ); -report (lc->dxc_vxc ==0xff ,"dxc in LC" ); +report (lowcore.dxc_vxc ==0xff ,"dxc in LC" );report (get_fpc_dxc () ==0 ,"dxc not in FPC" );report_prefix_pop (); }
s390x/mvpg.c +3 -4
@@ -33,7 +33,6 @@ static uint8_t source[PAGE_SIZE] __attribute__((aligned(PAGE_SIZE))); static uint8_t buffer[PAGE_SIZE] __attribute__((aligned(PAGE_SIZE))); -static struct lowcore *const lc;/* Keep track of fresh memory */ static uint8_t *fresh;
@@ -87,7 +86,7 @@ static int page_ok(const uint8_t *p)*/ static inline bool check_oai (void ) { -return *(uint8_t *)(lc->pgm_old_psw.addr -1 ) == lc->op_acc_id; +return *(uint8_t *)(lowcore.pgm_old_psw.addr -1 ) == lowcore.op_acc_id; }static void test_exceptions (void )
@@ -216,7 +215,7 @@ static void test_mmu_prot(void)report_prefix_push ("source invalid" );protect_page (source,PAGE_ENTRY_I ); - lc->op_acc_id =0 ; + lowcore.op_acc_id =0 ;expect_pgm_int ();mvpg (0 , fresh, source);report (clear_pgm_int () ==PGM_INT_CODE_PAGE_TRANSLATION ,"exception" );
@@ -227,7 +226,7 @@ static void test_mmu_prot(void)report_prefix_push ("destination invalid" );protect_page (fresh,PAGE_ENTRY_I ); - lc->op_acc_id =0 ; + lowcore.op_acc_id =0 ;expect_pgm_int ();mvpg (0 , fresh, source);report (clear_pgm_int () ==PGM_INT_CODE_PAGE_TRANSLATION ,"exception" );
s390x/sclp.c +1 -2
@@ -31,7 +31,6 @@ static union {WriteEventData data; } sccb_template;static uint32_t valid_code;/* valid command code for READ SCP INFO */ -static struct lowcore *lc;/** * Perform one service call, handling exceptions and interrupts.
@@ -43,7 +42,7 @@ static int sclp_service_call_test(unsigned int command, void *sccb)sclp_mark_busy ();sclp_setup_int (); cc =servc (command,__pa (sccb)); -if (lc->pgm_int_code) { +if (lowcore.pgm_int_code) {sclp_handle_ext ();return 0 ; }
s390x/skrf.c +4 -7
@@ -123,17 +123,15 @@ static void set_flag(int val)static void ecall_cleanup (void ) { -struct lowcore *lc = (void *)0x0 ; - - lc->ext_new_psw.mask =PSW_MASK_64 ; - lc->sw_int_crs[0 ] =BIT_ULL (CTL0_AFP ); + lowcore.ext_new_psw.mask =PSW_MASK_64 ; + lowcore.sw_int_crs[0 ] =BIT_ULL (CTL0_AFP );/* * PGM old contains the ext new PSW, we need to clean it up, * so we don't get a special operation exception on the lpswe * of pgm old. */ - lc->pgm_old_psw.mask =PSW_MASK_64 ; + lowcore.pgm_old_psw.mask =PSW_MASK_64 ;check_pgm_int_code (PGM_INT_CODE_SPECIFICATION );set_flag (1 );
@@ -142,13 +140,12 @@ static void ecall_cleanup(void)/* Set a key into the external new psw mask and open external call masks */ static void ecall_setup (void ) { -struct lowcore *lc = (void *)0x0 ;uint64_t mask;register_pgm_cleanup_func (ecall_cleanup);expect_pgm_int ();/* Put a skey into the ext new psw */ - lc->ext_new_psw.mask =0x00F0000000000000UL |PSW_MASK_64 ; + lowcore.ext_new_psw.mask =0x00F0000000000000UL |PSW_MASK_64 ;/* Open up ext masks */ ctl_set_bit (0 ,CTL0_EXTERNAL_CALL ); mask =extract_psw_mask ();
s390x/smp.c +10 -13
@@ -155,28 +155,27 @@ static void test_stop(void)static void test_stop_store_status (void ) {struct cpu *cpu =smp_cpu_from_idx (1 ); -struct lowcore *lc = (void *)0x0 ;report_prefix_push ("stop store status" );report_prefix_push ("running" );smp_cpu_restart (1 ); - lc->prefix_sa =0 ; - lc->grs_sa[15 ] =0 ; + lowcore.prefix_sa =0 ; + lowcore.grs_sa[15 ] =0 ;smp_cpu_stop_store_status (1 );mb ();report (smp_cpu_stopped (1 ),"cpu stopped" ); -report (lc->prefix_sa == (uint32_t )(uintptr_t )cpu->lowcore,"prefix" ); -report (lc->grs_sa[15 ],"stack" ); +report (lowcore.prefix_sa == (uint32_t )(uintptr_t )cpu->lowcore,"prefix" ); +report (lowcore.grs_sa[15 ],"stack" );report_prefix_pop ();report_prefix_push ("stopped" ); - lc->prefix_sa =0 ; - lc->grs_sa[15 ] =0 ; + lowcore.prefix_sa =0 ; + lowcore.grs_sa[15 ] =0 ;smp_cpu_stop_store_status (1 );mb ();report (smp_cpu_stopped (1 ),"cpu stopped" ); -report (lc->prefix_sa == (uint32_t )(uintptr_t )cpu->lowcore,"prefix" ); -report (lc->grs_sa[15 ],"stack" ); +report (lowcore.prefix_sa == (uint32_t )(uintptr_t )cpu->lowcore,"prefix" ); +report (lowcore.grs_sa[15 ],"stack" );report_prefix_pop ();report_prefix_pop ();
@@ -290,7 +289,6 @@ static void test_set_prefix(void)static void ecall (void ) {unsigned long mask; -struct lowcore *lc = (void *)0x0 ;expect_ext_int ();ctl_set_bit (0 ,CTL0_EXTERNAL_CALL );
@@ -298,7 +296,7 @@ static void ecall(void) mask |=PSW_MASK_EXT ;load_psw_mask (mask);set_flag (1 ); -while (lc->ext_int_code !=0x1202 ) {mb (); } +while (lowcore.ext_int_code !=0x1202 ) {mb (); }report_pass ("received" );set_flag (1 ); }
@@ -324,7 +322,6 @@ static void test_ecall(void)static void emcall (void ) {unsigned long mask; -struct lowcore *lc = (void *)0x0 ;expect_ext_int ();ctl_set_bit (0 ,CTL0_EMERGENCY_SIGNAL );
@@ -332,7 +329,7 @@ static void emcall(void) mask |=PSW_MASK_EXT ;load_psw_mask (mask);set_flag (1 ); -while (lc->ext_int_code !=0x1201 ) {mb (); } +while (lowcore.ext_int_code !=0x1201 ) {mb (); }report_pass ("received" );set_flag (1 ); }
s390x/snippets/c/spec_ex.c +2 -3
@@ -10,12 +10,11 @@ __attribute__((section (".text" )))int main (void ) { -struct lowcore *lowcore = (struct lowcore *)0 ;uint64_t bad_psw =0 ;/* PSW bit 12 has no name or meaning and must be 0 */ - lowcore->pgm_new_psw.mask =BIT (63 -12 ); - lowcore->pgm_new_psw.addr =0xdeadbeee ; + lowcore.pgm_new_psw.mask =BIT (63 -12 ); + lowcore.pgm_new_psw.addr =0xdeadbeee ; asmvolatile ("lpsw %0" ::"Q" (bad_psw));return 0 ; }
Signature · 1 line
2.36.1