KVM: s390: fix LPSWEY handling
Christian Borntraeger
maintainerPATCH v2 1/1 KVM: s390: fix LPSWEY handling
in rare cases, e.g. for injecting a machine check we do intercept all load PSW instructions via ICTL_LPSW. With facility 193 a new variant LPSWEY was added. KVM needs to handle that as well.
--- arch/s390/include/asm/kvm_host.h | 1 + arch/s390/kvm/kvm-s390.c | 1 + arch/s390/kvm/kvm-s390.h | 15 +++++++++++++++ arch/s390/kvm/priv.c | 32 ++++++++++++++++++++++++++++++++ 4 files changed, 49 insertions(+)
arch/s390/include/asm/kvm_host.h +1 -0
@@ -427,6 +427,7 @@ struct kvm_vcpu_stat {u64 instruction_io_other;u64 instruction_lpsw;u64 instruction_lpswe; +u64 instruction_lpswey;u64 instruction_pfmf;u64 instruction_ptff;u64 instruction_sck;
arch/s390/kvm/kvm-s390.c +1 -0
@@ -132,6 +132,7 @@ const struct _kvm_stats_desc kvm_vcpu_stats_desc[] = {STATS_DESC_COUNTER (VCPU , instruction_io_other),STATS_DESC_COUNTER (VCPU , instruction_lpsw),STATS_DESC_COUNTER (VCPU , instruction_lpswe), +STATS_DESC_COUNTER (VCPU , instruction_lpswey),STATS_DESC_COUNTER (VCPU , instruction_pfmf),STATS_DESC_COUNTER (VCPU , instruction_ptff), STATS_DESC_COUNTER(VCPU, instruction_sck),
arch/s390/kvm/kvm-s390.h +15 -0
@@ -138,6 +138,21 @@ static inline u64 kvm_s390_get_base_disp_s(struct kvm_vcpu *vcpu, u8 *ar)return (base2 ? vcpu->run->s.regs.gprs[base2] :0 ) + disp2; } +static inline u64 kvm_s390_get_base_disp_siy (struct kvm_vcpu *vcpu,u8 *ar) +{ +u32 base1 = vcpu->arch.sie_block->ipb >>28 ; +s64 disp1; + +/* The displacement is a 20bit _SIGNED_ value */ + disp1 =sign_extend64 (((vcpu->arch.sie_block->ipb &0x0fff0000 ) >>16 ) + + ((vcpu->arch.sie_block->ipb &0xff00 ) <<4 ),19 ); + +if (ar) + *ar = base1; + +return (base1 ? vcpu->run->s.regs.gprs[base1] :0 ) + disp1; +} +static inline void kvm_s390_get_base_disp_sse (struct kvm_vcpu *vcpu,u64 *address1,u64 *address2,u8 *ar_b1,u8 *ar_b2)
arch/s390/kvm/priv.c +32 -0
@@ -797,6 +797,36 @@ static int handle_lpswe(struct kvm_vcpu *vcpu)return 0 ; } +static int handle_lpswey (struct kvm_vcpu *vcpu) +{ +psw_t new_psw; +u64 addr; +int rc; +u8 ar; + + vcpu->stat.instruction_lpswey++; + +if (!test_kvm_facility (vcpu->kvm,193 )) +return kvm_s390_inject_program_int (vcpu,PGM_OPERATION ); + +if (vcpu->arch.sie_block->gpsw.mask &PSW_MASK_PSTATE ) +return kvm_s390_inject_program_int (vcpu,PGM_PRIVILEGED_OP ); + + addr =kvm_s390_get_base_disp_siy (vcpu, &ar); +if (addr &7 ) +return kvm_s390_inject_program_int (vcpu,PGM_SPECIFICATION ); + + rc =read_guest (vcpu, addr, ar, &new_psw,sizeof (new_psw)); +if (rc) +return kvm_s390_inject_prog_cond (vcpu, rc); + + vcpu->arch.sie_block->gpsw = new_psw; +if (!is_valid_psw (&vcpu->arch.sie_block->gpsw)) +return kvm_s390_inject_program_int (vcpu,PGM_SPECIFICATION ); + +return 0 ; +} +static int handle_stidp (struct kvm_vcpu *vcpu) {u64 stidp_data = vcpu->kvm->arch.model.cpuid;
@@ -1462,6 +1492,8 @@ int kvm_s390_handle_eb(struct kvm_vcpu *vcpu)case 0x61 :case 0x62 :return handle_ri (vcpu); +case 0x71 : +return handle_lpswey (vcpu);default :return -EOPNOTSUPP ; }
Signature · 1 line
2.45.0
Sven Schnelle
reviewerQuoted 38 lines · Christian Borntraeger
in rare cases, e.g. for injecting a machine check we do intercept all load PSW instructions via
ICTL_LPSW. With facility 193 a new variant LPSWEY was added. KVM needs to handle that as well.Fixes a3efa8429266 ("KVM: s390: gen_facilities: allow facilities 165, 193, 194 and 196")Reported-by Marc Hartmayer <[email protected]>Signed-off-by Christian Borntraeger <[email protected]>--- arch/s390/include/asm/kvm_host.h | 1 + arch/s390/kvm/kvm-s390.c | 1 + arch/s390/kvm/kvm-s390.h | 15 +++++++++++++++ arch/s390/kvm/priv.c | 32 ++++++++++++++++++++++++++++++++ 4 files changed, 49 insertions(+)arch/s390/kvm/priv.c +16
-0@@ -797,6 +797,36 @@ static int handle_lpswe(struct kvm_vcpu *vcpu)return 0 ; } +static int handle_lpswey (struct kvm_vcpu *vcpu) +{ +psw_t new_psw; +u64 addr; +int rc; +u8 ar; + + vcpu->stat.instruction_lpswey++; + +if (!test_kvm_facility (vcpu->kvm,193 )) +return kvm_s390_inject_program_int (vcpu,PGM_OPERATION ); + +if (vcpu->arch.sie_block->gpsw.mask &PSW_MASK_PSTATE ) +return kvm_s390_inject_program_int (vcpu,PGM_PRIVILEGED_OP ); + + addr =kvm_s390_get_base_disp_siy (vcpu, &ar);
arch/s390/kvm/priv.c static int handle_lpswe(struct kvm_vcpu *vcpu) · line 825
Quoted 10 lines
arch/s390/kvm/priv.c +10
-0+if (addr &7 ) +return kvm_s390_inject_program_int (vcpu,PGM_SPECIFICATION ); + + rc =read_guest (vcpu, addr, ar, &new_psw,sizeof (new_psw)); +if (rc) +return kvm_s390_inject_prog_cond (vcpu, rc); + + vcpu->arch.sie_block->gpsw = new_psw; +if (!is_valid_psw (&vcpu->arch.sie_block->gpsw)) +return kvm_s390_inject_program_int (vcpu,PGM_SPECIFICATION );
Shouldn't the gpsw get updated with new_psw after the check? POP says "The operation is suppressed on all addressing and protection exceptions."
Quoted 3 lines
arch/s390/kvm/priv.c +3
-0+ +return 0 ; +}
Christian Borntraeger
maintainerAm 01.07.24 um 08:08 schrieb Sven Schnelle:
Quoted 45 lines
Quoted 43 lines · Christian Borntraeger
in rare cases, e.g. for injecting a machine check we do intercept all load PSW instructions via
ICTL_LPSW. With facility 193 a new variant LPSWEY was added. KVM needs to handle that as well.Fixes a3efa8429266 ("KVM: s390: gen_facilities: allow facilities 165, 193, 194 and 196")Reported-by Marc Hartmayer <[email protected]>Signed-off-by Christian Borntraeger <[email protected]>--- arch/s390/include/asm/kvm_host.h | 1 + arch/s390/kvm/kvm-s390.c | 1 + arch/s390/kvm/kvm-s390.h | 15 +++++++++++++++ arch/s390/kvm/priv.c | 32 ++++++++++++++++++++++++++++++++ 4 files changed, 49 insertions(+)arch/s390/kvm/priv.c +21
-0@@ -797,6 +797,36 @@ static int handle_lpswe(struct kvm_vcpu *vcpu)return 0 ; } +static int handle_lpswey (struct kvm_vcpu *vcpu) +{ +psw_t new_psw; +u64 addr; +int rc; +u8 ar; + + vcpu->stat.instruction_lpswey++; + +if (!test_kvm_facility (vcpu->kvm,193 )) +return kvm_s390_inject_program_int (vcpu,PGM_OPERATION ); + +if (vcpu->arch.sie_block->gpsw.mask &PSW_MASK_PSTATE ) +return kvm_s390_inject_program_int (vcpu,PGM_PRIVILEGED_OP ); + + addr =kvm_s390_get_base_disp_siy (vcpu, &ar); +if (addr &7 ) +return kvm_s390_inject_program_int (vcpu,PGM_SPECIFICATION ); + + rc =read_guest (vcpu, addr, ar, &new_psw,sizeof (new_psw)); +if (rc)
Quoted 8 lines
arch/s390/kvm/priv.c static int handle_lpswe(struct kvm_vcpu *vcpu) · line 825
Quoted 5 lines
arch/s390/kvm/priv.c +5
-0+return kvm_s390_inject_prog_cond (vcpu, rc); + + vcpu->arch.sie_block->gpsw = new_psw; +if (!is_valid_psw (&vcpu->arch.sie_block->gpsw)) +return kvm_s390_inject_program_int (vcpu,PGM_SPECIFICATION );Shouldn't the gpsw get updated with
new_pswafter the check? POP says "The operation is suppressed on all addressing and protection exceptions."
Only for exception of the instruction but not for the target PSW. POP says:
The other PSW fields which are to be loaded by the instruction are not checked for validity before they are loaded. However, immediately after loading, a speci- fication exception is recognized, and a program inter- ruption occurs, when any of the following is true for the newly loaded PSW
Sven Schnelle
reviewerQuoted 43 lines · Christian Borntraeger
Am 01.07.24 um 08:08 schrieb Sven Schnelle:
Quoted 30 lines
Quoted 28 lines · Christian Borntraeger
arch/s390/kvm/priv.c +20
-0@@ -797,6 +797,36 @@ static int handle_lpswe(struct kvm_vcpu *vcpu)return 0 ; } +static int handle_lpswey(struct kvm_vcpu *vcpu) +{ +psw_t new_psw; +u64 addr; +int rc; +u8 ar; + + vcpu->stat.instruction_lpswey++; + +if (!test_kvm_facility (vcpu->kvm,193 )) +return kvm_s390_inject_program_int (vcpu,PGM_OPERATION ); + +if (vcpu->arch.sie_block->gpsw.mask &PSW_MASK_PSTATE ) +return kvm_s390_inject_program_int (vcpu,PGM_PRIVILEGED_OP ); + + addr =kvm_s390_get_base_disp_siy (vcpu, &ar); +if (addr &7 ) +return kvm_s390_inject_program_int (vcpu,PGM_SPECIFICATION ); + + rc =read_guest (vcpu, addr, ar, &new_psw,sizeof (new_psw)); +if (rc)Quoted 8 lines
arch/s390/kvm/priv.c static int handle_lpswe(struct kvm_vcpu *vcpu) · line 825
Quoted 5 lines
arch/s390/kvm/priv.c +5
-0+return kvm_s390_inject_prog_cond (vcpu, rc); + + vcpu->arch.sie_block->gpsw = new_psw; +if (!is_valid_psw (&vcpu->arch.sie_block->gpsw)) +return kvm_s390_inject_program_int (vcpu,PGM_SPECIFICATION );Shouldn't the gpsw get updated with
new_pswafter the check? POP says "The operation
is suppressed on all addressing and protection exceptions."Only for exception of the instruction but not for the target PSW. POP says:
Quoted 6 lines
The other PSW fields which are to be loaded by the instruction are not checked for validity before they are loaded. However, immediately after loading, a speci- fication exception is recognized, and a program inter- ruption occurs, when any of the following is true for the newly loaded PSW
Ok, sorry for the noise.
Christian Borntraeger
maintainerAm 01.07.24 um 09:25 schrieb Sven Schnelle:
Quoted 10 lines
Quoted 10 lines
Quoted 6 lines
arch/s390/kvm/priv.c static int handle_lpswe(struct kvm_vcpu *vcpu) · line 825
Quoted 3 lines
arch/s390/kvm/priv.c +3
-0+ vcpu->arch.sie_block->gpsw = new_psw; +if (!is_valid_psw (&vcpu->arch.sie_block->gpsw)) +return kvm_s390_inject_program_int (vcpu,PGM_SPECIFICATION );Shouldn't the gpsw get updated with
new_pswafter the check? POP says "The operation
is suppressed on all addressing and protection exceptions."Only for exception of the instruction but not for the target PSW. POP says:
Quoted 8 lines
Quoted 6 lines
The other PSW fields which are to be loaded by the instruction are not checked for validity before they are loaded. However, immediately after loading, a speci- fication exception is recognized, and a program inter- ruption occurs, when any of the following is true for the newly loaded PSW
Ok, sorry for the noise.
You can repend by doing a review and send an RB or other feedback :-)
Quoted 19 lines · Christian Borntraeger
in rare cases, e.g. for injecting a machine check we do intercept all load PSW instructions via
ICTL_LPSW. With facility 193 a new variant LPSWEY was added. KVM needs to handle that as well.Fixes a3efa8429266 ("KVM: s390: gen_facilities: allow facilities 165, 193, 194 and 196")Reported-by Marc Hartmayer <[email protected]>Signed-off-by Christian Borntraeger <[email protected]>--- arch/s390/include/asm/kvm_host.h | 1 + arch/s390/kvm/kvm-s390.c | 1 + arch/s390/kvm/kvm-s390.h | 15 +++++++++++++++ arch/s390/kvm/priv.c | 32 ++++++++++++++++++++++++++++++++ 4 files changed, 49 insertions(+)arch/s390/kvm/kvm-s390.h +0
-0
arch/s390/kvm/kvm-s390.h static inline u64 kvm_s390_get_base_disp_s(struct kvm_vcpu *vcpu, u8 *ar) · line 145
Quoted 8 lines
arch/s390/kvm/kvm-s390.h +5
-0@@ -138,6 +138,21 @@ static inline u64 kvm_s390_get_base_disp_s(struct kvm_vcpu *vcpu, u8 *ar)return (base2 ? vcpu->run->s.regs.gprs[base2] :0 ) + disp2; } +static inline u64 kvm_s390_get_base_disp_siy (struct kvm_vcpu *vcpu,u8 *ar) +{ +u32 base1 = vcpu->arch.sie_block->ipb >>28 ; +s64 disp1; +
Whitespace error. With that removed:
Quoted 9 lines
arch/s390/kvm/kvm-s390.h +9
-0+/* The displacement is a 20bit _SIGNED_ value */ + disp1 =sign_extend64 (((vcpu->arch.sie_block->ipb &0x0fff0000 ) >>16 ) + + ((vcpu->arch.sie_block->ipb &0xff00 ) <<4 ),19 ); + +if (ar) + *ar = base1; + +return (base1 ? vcpu->run->s.regs.gprs[base1] :0 ) + disp1; +}
Quoted 7 lines · On Fri, 28 Jun 2024 18:35:47 +0200 Christian Borntraeger…
in rare cases, e.g. for injecting a machine check we do intercept all load PSW instructions via
ICTL_LPSW. With facility 193 a new variant LPSWEY was added. KVM needs to handle that as well.Fixes a3efa8429266 ("KVM: s390: gen_facilities: allow facilities 165, 193, 194 and 196")Reported-by Marc Hartmayer <[email protected]>Signed-off-by Christian Borntraeger <[email protected]>
With the whitespace error reported by Sven fixed:
Quoted 107 lines
--- arch/s390/include/asm/kvm_host.h | 1 + arch/s390/kvm/kvm-s390.c | 1 + arch/s390/kvm/kvm-s390.h | 15 +++++++++++++++ arch/s390/kvm/priv.c | 32 ++++++++++++++++++++++++++++++++ 4 files changed, 49 insertions(+)arch/s390/include/asm/kvm_host.h +1
-0@@ -427,6 +427,7 @@ struct kvm_vcpu_stat {u64 instruction_io_other;u64 instruction_lpsw;u64 instruction_lpswe; +u64 instruction_lpswey;u64 instruction_pfmf;u64 instruction_ptff;u64 instruction_sck;arch/s390/kvm/kvm-s390.c +1
-0@@ -132,6 +132,7 @@ const struct _kvm_stats_desc kvm_vcpu_stats_desc[] = {STATS_DESC_COUNTER (VCPU , instruction_io_other),STATS_DESC_COUNTER (VCPU , instruction_lpsw),STATS_DESC_COUNTER (VCPU , instruction_lpswe), +STATS_DESC_COUNTER (VCPU , instruction_lpswey),STATS_DESC_COUNTER (VCPU , instruction_pfmf),STATS_DESC_COUNTER (VCPU , instruction_ptff), STATS_DESC_COUNTER(VCPU, instruction_sck),arch/s390/kvm/kvm-s390.h +15
-0@@ -138,6 +138,21 @@ static inline u64 kvm_s390_get_base_disp_s(struct kvm_vcpu *vcpu, u8 *ar)return (base2 ? vcpu->run->s.regs.gprs[base2] :0 ) + disp2; } +static inline u64 kvm_s390_get_base_disp_siy (struct kvm_vcpu *vcpu,u8 *ar) +{ +u32 base1 = vcpu->arch.sie_block->ipb >>28 ; +s64 disp1; + +/* The displacement is a 20bit _SIGNED_ value */ + disp1 =sign_extend64 (((vcpu->arch.sie_block->ipb &0x0fff0000 ) >>16 ) + + ((vcpu->arch.sie_block->ipb &0xff00 ) <<4 ),19 ); + +if (ar) + *ar = base1; + +return (base1 ? vcpu->run->s.regs.gprs[base1] :0 ) + disp1; +} +static inline void kvm_s390_get_base_disp_sse (struct kvm_vcpu *vcpu,u64 *address1,u64 *address2,u8 *ar_b1,u8 *ar_b2)arch/s390/kvm/priv.c +32
-0@@ -797,6 +797,36 @@ static int handle_lpswe(struct kvm_vcpu *vcpu)return 0 ; } +static int handle_lpswey (struct kvm_vcpu *vcpu) +{ +psw_t new_psw; +u64 addr; +int rc; +u8 ar; + + vcpu->stat.instruction_lpswey++; + +if (!test_kvm_facility (vcpu->kvm,193 )) +return kvm_s390_inject_program_int (vcpu,PGM_OPERATION ); + +if (vcpu->arch.sie_block->gpsw.mask &PSW_MASK_PSTATE ) +return kvm_s390_inject_program_int (vcpu,PGM_PRIVILEGED_OP ); + + addr =kvm_s390_get_base_disp_siy (vcpu, &ar); +if (addr &7 ) +return kvm_s390_inject_program_int (vcpu,PGM_SPECIFICATION ); + + rc =read_guest (vcpu, addr, ar, &new_psw,sizeof (new_psw)); +if (rc) +return kvm_s390_inject_prog_cond (vcpu, rc); + + vcpu->arch.sie_block->gpsw = new_psw; +if (!is_valid_psw (&vcpu->arch.sie_block->gpsw)) +return kvm_s390_inject_program_int (vcpu,PGM_SPECIFICATION ); + +return 0 ; +} +static int handle_stidp (struct kvm_vcpu *vcpu) {u64 stidp_data = vcpu->kvm->arch.model.cpuid;@@ -1462,6 +1492,8 @@ int kvm_s390_handle_eb(struct kvm_vcpu *vcpu)case 0x61 :case 0x62 :return handle_ri (vcpu); +case 0x71 : +return handle_lpswey (vcpu);default :return -EOPNOTSUPP ; }
Am 28.06.24 um 18:35 schrieb Christian Borntraeger:
Quoted 7 lines
in rare cases, e.g. for injecting a machine check we do intercept all load PSW instructions via
ICTL_LPSW. With facility 193 a new variant LPSWEY was added. KVM needs to handle that as well.Fixes a3efa8429266 ("KVM: s390: gen_facilities: allow facilities 165, 193, 194 and 196")Reported-by Marc Hartmayer <[email protected]>Signed-off-by Christian Borntraeger <[email protected]>
applied.