s390x: Add support for running guests without MSO/MSL
v2 cover s390x: Add support for running guests without MSO/MSL
v2:
---
* add function to change DAT/AS mode for all irq handlers (Janosch, Claudio)
* instead of a new flag in PROG0C, check the pgm int code in lowcore (Janosch)
* fix indents, comments (Nina)
Right now, all SIE tests in kvm-unit-tests (i.e. where kvm-unit-test is the hypervisor) run using MSO/MSL.
This is convenient, because it's simple. But it also comes with disadvantages, for example some features are unavailabe with MSO/MSL.
This series adds support for running guests without MSO/MSL with dedicated guest page tables for the GPA->HPA translation.
Since SIE implicitly uses the primary space mode for the guest, the host can't run in the primary space mode, too. To avoid moving all tests to the home space mode, only switch to home space mode when it is actually needed.
This series also comes with various bugfixes that were caught while develoing this.
Nico Boehr (6):
s390x: add function to set DAT mode for all interrupts
s390x: sie: switch to home space mode before entering SIE
s390x: lib: don't forward PSW when handling exception in SIE
s390x: fix compile of interrupt.c
s390x: lib: sie: don't reenter SIE on pgm int
s390x: add a test for SIE without MSO/MSL
lib/s390x/asm/arch_def.h | 1 + lib/s390x/asm/interrupt.h | 5 ++ lib/s390x/asm/mem.h | 1 + lib/s390x/interrupt.c | 54 +++++++++++++++++ lib/s390x/mmu.c | 5 +- lib/s390x/sie.c | 22 ++++++- s390x/Makefile | 2 + s390x/sie-dat.c | 120 +++++++++++++++++++++++++++++++++++++ s390x/snippets/c/sie-dat.c | 58 ++++++++++++++++++ s390x/unittests.cfg | 3 + 10 files changed, 268 insertions(+), 3 deletions(-) create mode 100644 s390x/sie-dat.c create mode 100644 s390x/snippets/c/sie-dat.c
Signature · 1 line
2.39.1
PATCH v2 1/6 s390x: add function to set DAT mode for all interrupts
When toggling DAT or switch address space modes, it is likely that interrupts should be handled in the same DAT or address space mode.
Add a function which toggles DAT and address space mode for all interruptions, except restart interrupts.
--- lib/s390x/asm/interrupt.h | 4 ++++ lib/s390x/interrupt.c | 38 ++++++++++++++++++++++++++++++++++++++ lib/s390x/mmu.c | 5 +++-- 3 files changed, 45 insertions(+), 2 deletions(-)
lib/s390x/asm/interrupt.h +4 -0
@@ -83,6 +83,10 @@ void expect_ext_int(void);uint16_t clear_pgm_int (void );void check_pgm_int_code (uint16_t code); +#define IRQ_DAT_ON true +#define IRQ_DAT_OFF false +void irq_set_dat_mode (bool dat,uint64_t as); +/* Activate low-address protection */ static inline void low_prot_enable (void ) {
lib/s390x/interrupt.c +38 -0
@@ -9,6 +9,7 @@*/ #include <libcflat.h> #include <asm/barrier.h> +#include <asm/mem.h> #include <asm/asm-offsets.h> #include <sclp.h> #include <interrupt.h>
@@ -104,6 +105,43 @@ void register_ext_cleanup_func(void (*f)(struct stack_frame_int *))THIS_CPU ->ext_cleanup_func = f; } +/** +* irq_set_dat_mode - Set the DAT mode of all interrupt handlers, except for +* restart. +* This will update the DAT mode and address space mode of all interrupt new +* PSWs. +* +* Since enabling DAT needs initalized CRs and the restart new PSW is often used +* to initalize CRs, the restart new PSW is never touched to avoid the chicken +* and egg situation. +* +* @dat specifies whether to use DAT or not +* @as specifies the address space mode to use - one of AS_PRIM, AS_ACCR, +* AS_SECN or AS_HOME. +*/ +void irq_set_dat_mode (bool dat,uint64_t as) +{ +struct psw * irq_psws[] = { +OPAQUE_PTR (GEN_LC_EXT_NEW_PSW ), +OPAQUE_PTR (GEN_LC_SVC_NEW_PSW ), +OPAQUE_PTR (GEN_LC_PGM_NEW_PSW ), +OPAQUE_PTR (GEN_LC_MCCK_NEW_PSW ), +OPAQUE_PTR (GEN_LC_IO_NEW_PSW ), +NULL /* sentinel */ + }; + +assert (as ==AS_PRIM || as ==AS_ACCR || as ==AS_SECN || as ==AS_HOME ); + +for (struct psw *irq_psw = irq_psws[0 ]; irq_psw !=NULL ; irq_psw++) { +if (!dat) + irq_psw->mask &= ~PSW_MASK_DAT ; +else + irq_psw->mask |=PSW_MASK_DAT | as << (63 -16 ); + } + +mb (); +} +static void fixup_pgm_int (struct stack_frame_int *stack) {/* If we have an error on SIE we directly move to sie_exit */
lib/s390x/mmu.c +3 -2
@@ -12,6 +12,7 @@#include <asm/pgtable.h> #include <asm/arch_def.h> #include <asm/barrier.h> +#include <asm/interrupt.h> #include <vmalloc.h> #include "mmu.h"
@@ -41,8 +42,8 @@ static void mmu_enable(pgd_t *pgtable)/* enable dat (primary == 0 set as default) */ enable_dat (); -/* we can now also use DAT unconditionally in our PGM handler */ - lowcore.pgm_new_psw.mask |=PSW_MASK_DAT ; +/* we can now also use DAT in all interrupt handlers */ +irq_set_dat_mode (IRQ_DAT_ON ,AS_PRIM ); }/*
Signature · 1 line
2.39.1
Re: [kvm-unit-tests PATCH v2 1/6] s390x: add function to set DAT mode for all interrupts
Quoted 62 lines · On Tue, 16 May 2023 15:04:51 +0200 Nico Boehr <[email protected]> wrote:
When toggling DAT or switch address space modes, it is likely that interrupts should be handled in the same DAT or address space mode.
Add a function which toggles DAT and address space mode for all interruptions, except restart interrupts.
Signed-off-by Nico Boehr <[email protected]>--- lib/s390x/asm/interrupt.h | 4 ++++ lib/s390x/interrupt.c | 38 ++++++++++++++++++++++++++++++++++++++ lib/s390x/mmu.c | 5 +++-- 3 files changed, 45 insertions(+), 2 deletions(-)lib/s390x/asm/interrupt.h +4
-0@@ -83,6 +83,10 @@ void expect_ext_int(void);uint16_t clear_pgm_int (void );void check_pgm_int_code (uint16_t code); +#define IRQ_DAT_ON true +#define IRQ_DAT_OFF false +void irq_set_dat_mode (bool dat,uint64_t as); +/* Activate low-address protection */ static inline void low_prot_enable (void ) {lib/s390x/interrupt.c +19
-0@@ -9,6 +9,7 @@*/ #include <libcflat.h> #include <asm/barrier.h> +#include <asm/mem.h> #include <asm/asm-offsets.h> #include <sclp.h> #include <interrupt.h> @@ -104,6 +105,43 @@ void register_ext_cleanup_func(void (*f)(struct stack_frame_int *))THIS_CPU ->ext_cleanup_func = f; } +/** +* irq_set_dat_mode - Set the DAT mode of all interrupt handlers, except for +* restart. +* This will update the DAT mode and address space mode of all interrupt new +* PSWs. +* +* Since enabling DAT needs initalized CRs and the restart new PSW is often used +* to initalize CRs, the restart new PSW is never touched to avoid the chicken +* and egg situation. +* +* @dat specifies whether to use DAT or not +* @as specifies the address space mode to use - one of AS_PRIM, AS_ACCR, +* AS_SECN or AS_HOME. +*/ +void irq_set_dat_mode (bool dat,uint64_t as) +{ +struct psw * irq_psws[] = { +OPAQUE_PTR (GEN_LC_EXT_NEW_PSW ),
lib/s390x/interrupt.c void register_ext_cleanup_func(void (*f)(struct stack_frame_int *)) · line 135
Quoted 10 lines
lib/s390x/interrupt.c +10
-0+OPAQUE_PTR (GEN_LC_SVC_NEW_PSW ), +OPAQUE_PTR (GEN_LC_PGM_NEW_PSW ), +OPAQUE_PTR (GEN_LC_MCCK_NEW_PSW ), +OPAQUE_PTR (GEN_LC_IO_NEW_PSW ), + NULL /* sentinel */ + }; + +assert (as ==AS_PRIM || as ==AS_ACCR || as ==AS_SECN || as ==AS_HOME ); + +for (struct psw *irq_psw = irq_psws[0 ]; irq_psw !=NULL ; irq_psw++) {
just call it psw, or cur_psw, it's a little confusing otherwise
add in arch_def.c:
#define PSW_MASK_AS 0x0000C00000000000UL
lib/s390x/interrupt.c void register_ext_cleanup_func(void (*f)(struct stack_frame_int *)) · line 137
Quoted 2 lines
lib/s390x/interrupt.c +2
-0+if (!dat) + irq_psw->mask &= ~PSW_MASK_DAT ;
cur_psw->mask &= ~(PSW_MASK_DAT | PSW_MASK_AS);
if (dat)
cur_psw->mask |= PSW_MASK_DAT | BIT_ULL(63 - 16);
alternatively, you can redefine psw with a bitfield (as you mentioned offline):
cur_psw->mask.dat = dat;
if (dat)
cur_psw->mask.as = as;
lib/s390x/interrupt.c void register_ext_cleanup_func(void (*f)(struct stack_frame_int *)) · line 139
Quoted 2 lines
lib/s390x/interrupt.c +2
-0+else + irq_psw->mask |=PSW_MASK_DAT | as << (63 -16 );
otherwise here you're ORing stuff to other stuff, if you had 3 and you OR 0 you get 3, but you actually want 0
lib/s390x/interrupt.c void register_ext_cleanup_func(void (*f)(struct stack_frame_int *)) · line 142
Quoted 3 lines
lib/s390x/interrupt.c +3
-0+ } + +mb ();
what's the purpose of this?
Quoted 28 lines
lib/s390x/interrupt.c +2
-0+} +static void fixup_pgm_int (struct stack_frame_int *stack) {/* If we have an error on SIE we directly move to sie_exit */ lib/s390x/mmu.c +3
-2@@ -12,6 +12,7 @@#include <asm/pgtable.h> #include <asm/arch_def.h> #include <asm/barrier.h> +#include <asm/interrupt.h> #include <vmalloc.h> #include "mmu.h" @@ -41,8 +42,8 @@ static void mmu_enable(pgd_t *pgtable)/* enable dat (primary == 0 set as default) */ enable_dat (); -/* we can now also use DAT unconditionally in our PGM handler */ - lowcore.pgm_new_psw.mask |=PSW_MASK_DAT ; +/* we can now also use DAT in all interrupt handlers */ +irq_set_dat_mode (IRQ_DAT_ON ,AS_PRIM ); }/*
Re: [kvm-unit-tests PATCH v2 1/6] s390x: add function to set DAT mode for all interrupts
Quoting Claudio Imbrenda (2023-05-16 19:17:24)
[...]
Quoted 4 lines
Quoted 4 lines
lib/s390x/interrupt.c +0
-0
[...]
Quoted 2 lines
Quoted 2 lines
lib/s390x/interrupt.c +2
-0+void irq_set_dat_mode (bool dat,uint64_t as) +{
[...]
Quoted 3 lines
Quoted 1 line
+ for (struct psw
*irq_psw= irq_psws[0];irq_psw!= NULL; irq_psw++) {just call it psw, or
cur_psw, it's a little confusing otherwise
will do.
[...]
Quoted 6 lines
alternatively, you can redefine psw with a bitfield (as you mentioned offline):
cur_psw->mask.dat= dat;
if (dat)cur_psw->mask.as = as;
Yep, I'll go with that.
Quoted 6 lines
lib/s390x/interrupt.c void register_ext_cleanup_func(void (*f)(struct stack_frame_int *)) · line 139
Quoted 3 lines
lib/s390x/interrupt.c +2
-0+else + irq_psw->mask |=PSW_MASK_DAT | as << (63 -16 );otherwise here you're ORing stuff to other stuff, if you had 3 and you OR 0 you get 3, but you actually want 0
And that's the advantage of the bitfield. :)
Quoted 6 lines
lib/s390x/interrupt.c void register_ext_cleanup_func(void (*f)(struct stack_frame_int *)) · line 142
Quoted 4 lines
lib/s390x/interrupt.c +3
-0+ } + +mb ();what's the purpose of this?
Make sure that the lowcore really has been written, but I think it's quite useless, since a function is a sequence point, right?
Re: [kvm-unit-tests PATCH v2 1/6] s390x: add function to set DAT mode for all interrupts
Quoted 36 lines · On Wed, 17 May 2023 14:25:01 +0200 Nico Boehr <[email protected]> wrote:
Quoting Claudio Imbrenda (2023-05-16 19:17:24)
[...]Quoted 4 lines
Quoted 4 lines
lib/s390x/interrupt.c +0
-0[...]
Quoted 2 lines
Quoted 2 lines
lib/s390x/interrupt.c +2
-0+void irq_set_dat_mode (bool dat,uint64_t as) +{[...]
Quoted 3 lines
Quoted 1 line
+ for (struct psw
*irq_psw= irq_psws[0];irq_psw!= NULL; irq_psw++) {just call it psw, or
cur_psw, it's a little confusing otherwisewill do.
[...]
Quoted 6 lines
alternatively, you can redefine psw with a bitfield (as you mentioned offline):
cur_psw->mask.dat= dat;
if (dat)cur_psw->mask.as = as;Yep, I'll go with that.
Quoted 6 lines
lib/s390x/interrupt.c void register_ext_cleanup_func(void (*f)(struct stack_frame_int *)) · line 139
Quoted 3 lines
lib/s390x/interrupt.c +2
-0+else + irq_psw->mask |=PSW_MASK_DAT | as << (63 -16 );otherwise here you're ORing stuff to other stuff, if you had 3 and you OR 0 you get 3, but you actually want 0
And that's the advantage of the bitfield. :)
Quoted 1 line
Quoted 8 lines
Quoted 5 lines
lib/s390x/interrupt.c void register_ext_cleanup_func(void (*f)(struct stack_frame_int *)) · line 142
Quoted 3 lines
lib/s390x/interrupt.c +3
-0+ } + +mb ();what's the purpose of this?
Make sure that the lowcore really has been written, but I think it's quite useless, since a function is a sequence point, right?
yes
PATCH v2 2/6 s390x: sie: switch to home space mode before entering SIE
In reply to Nico BoehrThis is to prepare for running guests without MSO/MSL, which is currently not possible.
We already have code in sie64a to setup a guest primary ASCE before entering SIE, so we can in theory switch to the page tables which translate gpa to hpa.
But the host is running in primary space mode already, so changing the primary ASCE before entering SIE will also affect the host's code and data.
To make this switch useful, the host should run in a different address space mode. Hence, set up and change to home address space mode before installing the guest ASCE.
The home space ASCE is just copied over from the primary space ASCE, so no functional change is intended, also for tests that want to use MSO/MSL. If a test intends to use a different primary space ASCE, it can now just set the guest.asce in the save_area.
--- lib/s390x/asm/arch_def.h | 1 + lib/s390x/sie.c | 18 ++++++++++++++++++ lib/s390x/sie.h | 1 + 3 files changed, 20 insertions(+)
lib/s390x/asm/arch_def.h +1 -0
@@ -67,6 +67,7 @@ struct cpu {#define AS_HOME 3#define PSW_MASK_DAT 0x0400000000000000UL +#define PSW_MASK_HOME 0x0000C00000000000UL#define PSW_MASK_IO 0x0200000000000000UL#define PSW_MASK_EXT 0x0100000000000000UL#define PSW_MASK_KEY 0x00F0000000000000UL
lib/s390x/sie.c +18 -0
@@ -46,6 +46,8 @@ void sie_handle_validity(struct vm *vm)void sie (struct vm *vm) { +uint64_t old_cr13; +if (vm->sblk->sdf ==2 )memcpy (vm->sblk->pv_grregs, vm->save_area.guest.grs,sizeof (vm->save_area.guest.grs));
@@ -53,6 +55,16 @@ void sie(struct vm *vm)/* Reset icptcode so we don't trip over it below */ vm->sblk->icptcode =0 ; +/* set up home address space to match primary space */ + old_cr13 =stctg (13 ); +lctlg (13 ,stctg (1 )); + +/* switch to home space so guest tables can be different from host */ +psw_mask_set_bits (PSW_MASK_HOME ); + +/* also handle all interruptions in home space while in SIE */ +irq_set_dat_mode (IRQ_DAT_ON ,AS_HOME ); +while (vm->sblk->icptcode ==0 ) {sie64a (vm->sblk, &vm->save_area);sie_handle_validity (vm);
@@ -60,6 +72,12 @@ void sie(struct vm *vm) vm->save_area.guest.grs[14 ] = vm->sblk->gg14; vm->save_area.guest.grs[15 ] = vm->sblk->gg15; +irq_set_dat_mode (IRQ_DAT_ON ,AS_PRIM ); +psw_mask_clear_bits (PSW_MASK_HOME ); + +/* restore the old CR 13 */ +lctlg (13 , old_cr13); +if (vm->sblk->sdf ==2 )memcpy (vm->save_area.guest.grs, vm->sblk->pv_grregs,sizeof (vm->save_area.guest.grs));
lib/s390x/sie.h +1 -0
@@ -284,5 +284,6 @@ void sie_handle_validity(struct vm *vm);void sie_guest_sca_create (struct vm *vm);void sie_guest_create (struct vm *vm,uint64_t guest_mem,uint64_t guest_mem_len);void sie_guest_destroy (struct vm *vm); +bool sie_had_pgm_int (struct vm *vm);#endif /* _S390X_SIE_H_ */
Signature · 1 line
2.39.1
Re: [kvm-unit-tests PATCH v2 2/6] s390x: sie: switch to home space mode before entering SIE
Quoted 22 lines · On Tue, 16 May 2023 15:04:52 +0200 Nico Boehr <[email protected]> wrote:
This is to prepare for running guests without MSO/MSL, which is currently not possible.
We already have code in sie64a to setup a guest primary ASCE before entering SIE, so we can in theory switch to the page tables which translate gpa to hpa.
But the host is running in primary space mode already, so changing the primary ASCE before entering SIE will also affect the host's code and data.
To make this switch useful, the host should run in a different address space mode. Hence, set up and change to home address space mode before installing the guest ASCE.
The home space ASCE is just copied over from the primary space ASCE, so no functional change is intended, also for tests that want to use MSO/MSL. If a test intends to use a different primary space ASCE, it can now just set the guest.asce in the
save_area.Signed-off-by Nico Boehr <[email protected]>---
[...]
lib/s390x/sie.h void sie_handle_validity(struct vm *vm); · line 287
Quoted 9 lines
lib/s390x/sie.h +1
-0@@ -284,5 +284,6 @@ void sie_handle_validity(struct vm *vm);void sie_guest_sca_create (struct vm *vm);void sie_guest_create (struct vm *vm,uint64_t guest_mem,uint64_t guest_mem_len);void sie_guest_destroy (struct vm *vm); +bool sie_had_pgm_int (struct vm *vm);
what's this?
Quoted 2 lines
lib/s390x/sie.h +0
-0#endif /* _S390X_SIE_H_ */
Re: [kvm-unit-tests PATCH v2 2/6] s390x: sie: switch to home space mode before entering SIE
Quoting Claudio Imbrenda (2023-05-16 19:22:25)
[...]
Quoted 11 lines
lib/s390x/sie.h void sie_handle_validity(struct vm *vm); · line 287
Quoted 9 lines
lib/s390x/sie.h +1
-0@@ -284,5 +284,6 @@ void sie_handle_validity(struct vm *vm);void sie_guest_sca_create (struct vm *vm);void sie_guest_create (struct vm *vm,uint64_t guest_mem,uint64_t guest_mem_len);void sie_guest_destroy (struct vm *vm); +bool sie_had_pgm_int (struct vm *vm);what's this?
Opsie, fixed :)
PATCH v2 3/6 s390x: lib: don't forward PSW when handling exception in SIE
In reply to Nico BoehrWhen we're handling a pgm int in SIE, we want to return to the SIE cleanup after handling the exception. That's why we set pgm_old_psw to the sie_exit label in fixup_pgm_int.
On nullifing pgm ints, fixup_pgm_int will also forward the old PSW such that we don't cause an pgm int again.
However, when we want to return to the sie_exit label, this is not needed (since we've manually set pgm_old_psw). Instead, forwarding the PSW might cause us to skip an instruction or end up in the middle of an instruction.
So, let's just skip the rest of the fixup in case we're inside SIE.
Note that we're intentionally not fixing up the PSW in the guest; that's best left to the test at hand by registering their own psw fixup.
--- lib/s390x/interrupt.c | 1 + 1 file changed, 1 insertion(+)
lib/s390x/interrupt.c +1 -0
@@ -148,6 +148,7 @@ static void fixup_pgm_int(struct stack_frame_int *stack)if (lowcore.pgm_old_psw.addr >= (uint64_t )&sie_entry && lowcore.pgm_old_psw.addr <= (uint64_t )&sie_exit) { lowcore.pgm_old_psw.addr = (uint64_t )&sie_exit; +return ; }switch (lowcore.pgm_int_code) {
Signature · 1 line
2.39.1
PATCH v2 4/6 s390x: fix compile of interrupt.c
In reply to Nico BoehrA future commit will include interrupt.h from sie.c.
Since interrupt.h includes mem.h, but sie.c does not include facility.h, this will lead to the following compile error:
In file included from lib/s390x/interrupt.c:10:/home/nrb/kvm-unit-tests/lib/asm/mem.h: In function ‘set_storage_key_mb’:/home/nrb/kvm-unit-tests/lib/asm/mem.h:42:16: error: implicit declaration of function ‘test_facility’ [-Werror=implicit-function-declaration]
42 | assert(test_facility(8));
| ^~~~~~~~~~~~~Add the missing include in interrupt.h
--- lib/s390x/asm/mem.h | 1 + 1 file changed, 1 insertion(+)
lib/s390x/asm/mem.h +1 -0
@@ -8,6 +8,7 @@#ifndef _ASMS390X_MEM_H_#define _ASMS390X_MEM_H_#include <asm/arch_def.h> +#include <asm/facility.h> /* create pointer while avoiding compiler warnings */ #define OPAQUE_PTR (x) ((void *)(((uint64_t)&lowcore) + (x)))
Signature · 1 line
2.39.1
Re: [kvm-unit-tests PATCH v2 4/6] s390x: fix compile of interrupt.c
Quoted 1 line · On Tue, 16 May 2023 15:04:54 +0200 Nico Boehr <[email protected]> wrote:
A future commit will include
interrupt.hfromsie.c.
can you merge this into that future commit that will require it?
Quoted 29 lines
Since
interrupt.hincludesmem.h, butsie.cdoes not includefacility.h, this will lead to the following compile error:In file included from
lib/s390x/interrupt.c:10:/home/nrb/kvm-unit-tests/lib/asm/mem.h: In function ‘set_storage_key_mb’:/home/nrb/kvm-unit-tests/lib/asm/mem.h:42:16: error: implicit declaration of function ‘test_facility’ [-Werror=implicit-function-declaration]42 | assert(test_facility(8)); | ^~~~~~~~~~~~~Add the missing include in
interrupt.hSigned-off-by Nico Boehr <[email protected]>--- lib/s390x/asm/mem.h | 1 + 1 file changed, 1 insertion(+)lib/s390x/asm/mem.h +1
-0@@ -8,6 +8,7 @@#ifndef _ASMS390X_MEM_H_#define _ASMS390X_MEM_H_#include <asm/arch_def.h> +#include <asm/facility.h> /* create pointer while avoiding compiler warnings */ #define OPAQUE_PTR (x) ((void *)(((uint64_t)&lowcore) + (x)))
PATCH v2 5/6 s390x: lib: sie: don't reenter SIE on pgm int
In reply to Nico BoehrAt the moment, when a PGM int occurs while in SIE, we will just reenter SIE after the interrupt handler was called.
This is because sie() has a loop which checks icptcode and re-enters SIE if it is zero.
However, this behaviour is quite undesirable for SIE tests, since it doesn't give the host the chance to assert on the PGM int. Instead, we will just re-enter SIE, on nullifing conditions even causing the exception again.
In sie(), check whether a pgm int code is set in lowcore. If it has, exit the loop so the test can react to the interrupt. Add a new function read_pgm_int_code() to obtain the interrupt code.
Note that this introduces a slight oddity with sie and pgm int in certain cases: If a PGM int occurs between a expect_pgm_int() and sie(), we will now never enter SIE until the pgm_int_code is cleared by e.g. clear_pgm_int().
--- lib/s390x/asm/interrupt.h | 1 + lib/s390x/interrupt.c | 15 +++++++++++++++ lib/s390x/sie.c | 4 +++- lib/s390x/sie.h | 1 - 4 files changed, 19 insertions(+), 2 deletions(-)
lib/s390x/asm/interrupt.h +1 -0
@@ -81,6 +81,7 @@ void handle_svc_int(void);void expect_pgm_int (void );void expect_ext_int (void );uint16_t clear_pgm_int (void ); +uint16_t read_pgm_int_code (void );void check_pgm_int_code (uint16_t code);#define IRQ_DAT_ON true
lib/s390x/interrupt.c +15 -0
@@ -60,6 +60,21 @@ uint16_t clear_pgm_int(void)return code; } +/** +* read_pgm_int_code - Get the program interruption code of the last pgm int +* on the current CPU. +* +* This is similar to clear_pgm_int(), except that it doesn't clear the +* interruption information from lowcore. +* +* Returns 0 when none occured. +*/ +uint16_t read_pgm_int_code (void ) +{ +mb (); +return lowcore.pgm_int_code; +} +/** * check_pgm_int_code - Check the program interrupt code on the current CPU. * @code the expected program interrupt code on the current CPU
lib/s390x/sie.c +3 -1
@@ -13,6 +13,7 @@#include <libcflat.h> #include <sie.h> #include <asm/page.h> +#include <asm/interrupt.h> #include <libcflat.h> #include <alloc_page.h>
@@ -65,7 +66,8 @@ void sie(struct vm *vm)/* also handle all interruptions in home space while in SIE */ irq_set_dat_mode (IRQ_DAT_ON ,AS_HOME ); -while (vm->sblk->icptcode ==0 ) { +/* leave SIE when we have an intercept or an interrupt so the test can react to it */ +while (vm->sblk->icptcode ==0 && !read_pgm_int_code ()) {sie64a (vm->sblk, &vm->save_area);sie_handle_validity (vm); }
lib/s390x/sie.h +0 -1
@@ -284,6 +284,5 @@ void sie_handle_validity(struct vm *vm);void sie_guest_sca_create (struct vm *vm);void sie_guest_create (struct vm *vm,uint64_t guest_mem,uint64_t guest_mem_len);void sie_guest_destroy (struct vm *vm); -bool sie_had_pgm_int (struct vm *vm);#endif /* _S390X_SIE_H_ */
Signature · 1 line
2.39.1
Re: [kvm-unit-tests PATCH v2 5/6] s390x: lib: sie: don't reenter SIE on pgm int
Quoted 48 lines · On Tue, 16 May 2023 15:04:55 +0200 Nico Boehr <[email protected]> wrote:
At the moment, when a PGM int occurs while in SIE, we will just reenter SIE after the interrupt handler was called.
This is because
sie()has a loop which checks icptcode and re-enters SIE if it is zero.However, this behaviour is quite undesirable for SIE tests, since it doesn't give the host the chance to assert on the PGM int. Instead, we will just re-enter SIE, on nullifing conditions even causing the exception again.
In
sie(), check whether a pgm int code is set in lowcore. If it has, exit the loop so the test can react to the interrupt. Add a new functionread_pgm_int_code()to obtain the interrupt code.Note that this introduces a slight oddity with sie and pgm int in certain cases: If a PGM int occurs between a
expect_pgm_int()andsie(), we will now never enter SIE until thepgm_int_codeis cleared by e.g.clear_pgm_int().Signed-off-by Nico Boehr <[email protected]>--- lib/s390x/asm/interrupt.h | 1 + lib/s390x/interrupt.c | 15 +++++++++++++++ lib/s390x/sie.c | 4 +++- lib/s390x/sie.h | 1 - 4 files changed, 19 insertions(+), 2 deletions(-)lib/s390x/asm/interrupt.h +1
-0@@ -81,6 +81,7 @@ void handle_svc_int(void);void expect_pgm_int (void );void expect_ext_int (void );uint16_t clear_pgm_int (void ); +uint16_t read_pgm_int_code (void );void check_pgm_int_code (uint16_t code);#define IRQ_DAT_ON truelib/s390x/interrupt.c +0
-0@@ -60,6 +60,21 @@ uint16_t clear_pgm_int(void)return code; }
lib/s390x/interrupt.c uint16_t clear_pgm_int(void) · line 72
Quoted 10 lines
lib/s390x/interrupt.c +10
-0+/** +* read_pgm_int_code - Get the program interruption code of the last pgm int +* on the current CPU. +* +* This is similar to clear_pgm_int(), except that it doesn't clear the +* interruption information from lowcore. +* +* Returns 0 when none occured. +*/ +uint16_t read_pgm_int_code (void )
could this whole function go in the header as static inline?
lib/s390x/interrupt.c uint16_t clear_pgm_int(void) · line 74
Quoted 2 lines
lib/s390x/interrupt.c +2
-0+{ +mb ();
is the mb really needed?
Quoted 33 lines
lib/s390x/interrupt.c +3
-0+return lowcore.pgm_int_code; +} +/** * check_pgm_int_code - Check the program interrupt code on the current CPU. * @code the expected program interrupt code on the current CPU lib/s390x/sie.c +3
-1@@ -13,6 +13,7 @@#include <libcflat.h> #include <sie.h> #include <asm/page.h> +#include <asm/interrupt.h> #include <libcflat.h> #include <alloc_page.h> @@ -65,7 +66,8 @@ void sie(struct vm *vm)/* also handle all interruptions in home space while in SIE */ irq_set_dat_mode (IRQ_DAT_ON ,AS_HOME ); -while (vm->sblk->icptcode ==0 ) { +/* leave SIE when we have an intercept or an interrupt so the test can react to it */ +while (vm->sblk->icptcode ==0 && !read_pgm_int_code ()) {sie64a (vm->sblk, &vm->save_area);sie_handle_validity (vm); }lib/s390x/sie.h +0
-0
lib/s390x/sie.h void sie_handle_validity(struct vm *vm); · line 287
Quoted 4 lines
lib/s390x/sie.h +0
-1@@ -284,6 +284,5 @@ void sie_handle_validity(struct vm *vm);void sie_guest_sca_create (struct vm *vm);void sie_guest_create (struct vm *vm,uint64_t guest_mem,uint64_t guest_mem_len);void sie_guest_destroy (struct vm *vm); -bool sie_had_pgm_int (struct vm *vm);
... ?
Quoted 2 lines
lib/s390x/sie.h +0
-0#endif /* _S390X_SIE_H_ */
Re: [kvm-unit-tests PATCH v2 5/6] s390x: lib: sie: don't reenter SIE on pgm int
Quoting Claudio Imbrenda (2023-05-16 19:30:18)
[...]
Quoted 4 lines
Quoted 4 lines
lib/s390x/interrupt.c +0
-0
[...]
Quoted 4 lines
Quoted 4 lines
+/**
+ *read_pgm_int_code- Get the program interruption code of the last pgm int
+ * on the current CPU.
+ *
Quoted 8 lines
Quoted 6 lines
+ * This is similar to
clear_pgm_int(), except that it doesn't clear the
+ * interruption information from lowcore.
+ *
+ * Returns 0 when none occured.
+ */
+uint16_tread_pgm_int_code(void)could this whole function go in the header as static inline?
Yes, sure, changed.
Quoted 4 lines
lib/s390x/interrupt.c uint16_t clear_pgm_int(void) · line 74
Quoted 2 lines
lib/s390x/interrupt.c +2
-0+{ +mb ();is the mb really needed?
No, I don't think so, since this is a function, I'll remove this.
PATCH v2 6/6 s390x: add a test for SIE without MSO/MSL
In reply to Nico BoehrSince we now have the ability to run guests without MSO/MSL, add a test to make sure this doesn't break.
--- s390x/Makefile | 2 + s390x/sie-dat.c | 120 +++++++++++++++++++++++++++++++++++++ s390x/snippets/c/sie-dat.c | 58 ++++++++++++++++++ s390x/unittests.cfg | 3 + 4 files changed, 183 insertions(+) create mode 100644 s390x/sie-dat.c create mode 100644 s390x/snippets/c/sie-dat.c
s390x/Makefile +2 -0
@@ -40,6 +40,7 @@ tests += $(TEST_DIR)/panic-loop-pgm.elf tests += $(TEST_DIR)/migration-sck.elf tests += $(TEST_DIR)/exittime.elf tests += $(TEST_DIR)/ex.elf +tests += $(TEST_DIR)/sie-dat.elf pv-tests += $(TEST_DIR)/pv-diags.elf
@@ -120,6 +121,7 @@ snippet_lib = $(snippet_asmlib) lib/auxinfo.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 +$(TEST_DIR)/sie-dat.elf: snippets = $(SNIPPET_DIR)/c/sie-dat.gbin $(TEST_DIR)/spec_ex-sie.elf: snippets = $(SNIPPET_DIR)/c/spec_ex.gbin $(TEST_DIR)/pv-diags.elf: pv-snippets += $(SNIPPET_DIR)/asm/snippet-pv-diag-yield.gbin
s390x/sie-dat.c new file +120 -0
120 lines not on this page · raw message
s390x/snippets/c/sie-dat.c new file +58 -0
58 lines not on this page · raw message
s390x/unittests.cfg +3 -0
@@ -218,3 +218,6 @@ extra_params = -append '--parallel' [execute] file = ex.elf + +[sie-dat] +file = sie-dat.elf
Signature · 1 line
2.39.1