KVM: s390: Fix V!=R bug in STFLE shadowing
cover KVM: s390: Fix V!=R bug in STFLE shadowing
The address of the facility control block is a physical address, and therefore requires conversion from virtual (patch 2).
Also send unrelated patch 1 which was previously sent as part of "KVM: s390: Fix minor bugs in STFLE shadowing" but deferred.
Nina Schoetterl-Glausch (2):
KVM: s390: Minor refactor of base/ext facility lists
KVM: s390: vsie: Use virt_to_phys for facility control block
arch/s390/kvm/kvm-s390.c | 44 +++++++++++++++++----------------------- arch/s390/kvm/vsie.c | 3 ++- 2 files changed, 21 insertions(+), 26 deletions(-)
base-commit: e8f897f4afef0031fe618a8e94127a0934896aba
Signature · 1 line
2.40.1
PATCH RESEND 1/2 KVM: s390: Minor refactor of base/ext facility lists
Directly use the size of the arrays instead of going through the indirection of kvm_s390_fac_size().
Don't use magic number for the number of entries in the non hypervisor managed facility bit mask list.
Make the constraint of that number on kvm_s390_fac_base obvious. Get rid of implicit double anding of stfle_fac_list.
---
Notes:
I think it's nicer this way but it might be needless churn.
arch/s390/kvm/kvm-s390.c | 44 +++++++++++++++++----------------------- 1 file changed, 19 insertions(+), 25 deletions(-)
arch/s390/kvm/kvm-s390.c +19 -25
@@ -224,33 +224,25 @@ static int async_destroy = 1;module_param (async_destroy, int,0444 );MODULE_PARM_DESC (async_destroy,"Asynchronous destroy for protected guests" ); -/* -* For now we handle at most 16 double words as this is what the s390 base -* kernel handles and stores in the prefix page. If we ever need to go beyond -* this, this requires changes to code, but the external uapi can stay. -*/ -#define SIZE_INTERNAL 16 - +#define HMFAI_DWORDS 16/* * Base feature mask that defines default mask for facilities. Consists of the * defines in FACILITIES_KVM and the non-hypervisor managed bits. */ -static unsigned long kvm_s390_fac_base[SIZE_INTERNAL ] = {FACILITIES_KVM }; +static unsigned long kvm_s390_fac_base[HMFAI_DWORDS ] = {FACILITIES_KVM }; +static_assert (ARRAY_SIZE (((long []){FACILITIES_KVM })) <=HMFAI_DWORDS ); +static_assert (ARRAY_SIZE (kvm_s390_fac_base) <=S390_ARCH_FAC_MASK_SIZE_U64 ); +static_assert (ARRAY_SIZE (kvm_s390_fac_base) <=S390_ARCH_FAC_LIST_SIZE_U64 ); +static_assert (ARRAY_SIZE (kvm_s390_fac_base) <=ARRAY_SIZE (stfle_fac_list)); +/* * Extended feature mask. Consists of the defines in FACILITIES_KVM_CPUMODEL * and defines the facilities that can be enabled via a cpu model. */ -static unsigned long kvm_s390_fac_ext[SIZE_INTERNAL ] = {FACILITIES_KVM_CPUMODEL }; - -static unsigned long kvm_s390_fac_size (void ) -{ -BUILD_BUG_ON (SIZE_INTERNAL >S390_ARCH_FAC_MASK_SIZE_U64 ); -BUILD_BUG_ON (SIZE_INTERNAL >S390_ARCH_FAC_LIST_SIZE_U64 ); -BUILD_BUG_ON (SIZE_INTERNAL *sizeof (unsigned long ) > -sizeof (stfle_fac_list)); - -return SIZE_INTERNAL ; -} +static const unsigned long kvm_s390_fac_ext[] = {FACILITIES_KVM_CPUMODEL }; +static_assert (ARRAY_SIZE (kvm_s390_fac_ext) <=S390_ARCH_FAC_MASK_SIZE_U64 ); +static_assert (ARRAY_SIZE (kvm_s390_fac_ext) <=S390_ARCH_FAC_LIST_SIZE_U64 ); +static_assert (ARRAY_SIZE (kvm_s390_fac_ext) <=ARRAY_SIZE (stfle_fac_list));/* available cpu features supported by kvm */ static DECLARE_BITMAP(kvm_s390_available_cpu_feat, KVM_S390_VM_CPU_FEAT_NR_BITS);
@@ -3347,13 +3339,16 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type) kvm->arch.sie_page2->kvm = kvm; kvm->arch.model.fac_list = kvm->arch.sie_page2->fac_list; -for (i =0 ; i <kvm_s390_fac_size (); i++) { +for (i =0 ; i <ARRAY_SIZE (kvm_s390_fac_base); i++) { kvm->arch.model.fac_mask[i] = stfle_fac_list[i] & - (kvm_s390_fac_base[i] | - kvm_s390_fac_ext[i]); + kvm_s390_fac_base[i]; kvm->arch.model.fac_list[i] = stfle_fac_list[i] & kvm_s390_fac_base[i]; } +for (i =0 ; i <ARRAY_SIZE (kvm_s390_fac_ext); i++) { + kvm->arch.model.fac_mask[i] |= stfle_fac_list[i] & + kvm_s390_fac_ext[i]; + } kvm->arch.model.subfuncs = kvm_s390_available_subfunc;/* we are always in czam mode - even on pre z14 machines */
@@ -5857,9 +5852,8 @@ static int __init kvm_s390_init(void)return -EINVAL ; } -for (i =0 ; i <16 ; i++) - kvm_s390_fac_base[i] |= - stfle_fac_list[i] &nonhyp_mask (i); +for (i =0 ; i <HMFAI_DWORDS ; i++) + kvm_s390_fac_base[i] |=nonhyp_mask (i); r =__kvm_s390_init ();if (r)
Signature · 1 line
2.40.1
PATCH 2/2 KVM: s390: vsie: Use virt_to_phys for facility control block
In reply to Nina Schoetterl-GlauschIn order for SIE to interpretively execute STFLE, it requires the real or absolute address of a facility-list control block.
Before writing the location into the shadow SIE control block, convert it from a virtual address.
We currently do not run into this bug because the lower 31 bits are the same for virtual and physical addresses.
--- arch/s390/kvm/vsie.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/s390/kvm/vsie.c +2 -1
@@ -12,6 +12,7 @@#include <linux/list.h> #include <linux/bitmap.h> #include <linux/sched/signal.h> +#include <linux/io.h> #include <asm/gmap.h> #include <asm/mmu_context.h>
@@ -1006,7 +1007,7 @@ static int handle_stfle(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page)if (read_guest_real (vcpu, fac, &vsie_page->fac,stfle_size () *sizeof (u64)))return set_validity_icpt (scb_s,0x1090U ); - scb_s->fac = (__u32)(__u64) &vsie_page->fac; + scb_s->fac = (u32 )virt_to_phys (&vsie_page->fac); }return 0 ; }
Signature · 1 line
2.40.1
Re: [PATCH 2/2] KVM: s390: vsie: Use virt_to_phys for facility control block
Quoted 6 lines · Nina Schoetterl-Glausch
In order for SIE to interpretively execute STFLE, it requires the real or absolute address of a facility-list control block.
Before writing the location into the shadow SIE control block, convert it from a virtual address.
We currently do not run into this bug because the lower 31 bits are the same for virtual and physical addresses.
So it's not a bug (yet) :)
But certainly the right thing to do and more future-proof.
Signature · 3 lines
Cheers, David / dhildenb