KVM: s390: Fix z16 support (for KVM master)
Christian Borntraeger
maintainerPaolo,
please pull the following for 6.10
The following changes since commit dee67a94d4c6cbd05b8f6e1181498e94caa33334:
Merge tag 'kvm-x86-fixes-6.10-rcN' of https://github.com/kvm-x86/linux into HEAD (2024-06-21 08:03:55 -0400)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git tags/kvm-s390-master-6.10-1
for you to fetch changes up to 4c6abb7f7b349f00c0f7ed5045bf67759c012892:
KVM: s390: fix LPSWEY handling (2024-07-01 14:31:15 +0200)
----------------------------------------------------------------
KVM: s390: Fix z16 support
The z16 support might fail with the lpswey instruction. Provide a handler.
----------------------------------------------------------------
Christian Borntraeger (1):
KVM: s390: fix LPSWEY handling
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(+)
Christian Borntraeger
maintainer[GIT PULL 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.
Message-ID: <[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/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
Paolo Bonzini
maintainerQuoted 10 lines · Christian Borntraeger
Paolo,
please pull the following for 6.10
The following changes since commit
dee67a94d4c6cbd05b8f6e1181498e94caa33334:Merge tag 'kvm-x86-fixes-6.10-rcN' of https://github.com/kvm-x86/linux into HEAD (2024-06-21 08:03:55 -0400)
Quoted 7 lines
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.gittags/kvm-s390-master-6.10-1for you to fetch changes up to
4c6abb7f7b349f00c0f7ed5045bf67759c012892:KVM: s390: fix LPSWEY handling (2024-07-01 14:31:15 +0200)
Pulled, thanks.
Paolo
Quoted 17 lines
----------------------------------------------------------------
KVM: s390: Fix z16 supportThe z16 support might fail with the lpswey instruction. Provide a handler.
----------------------------------------------------------------
Christian Borntraeger (1):
KVM: s390: fix LPSWEY handlingarch/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(+)