Commit 4aebd7d5 authored by Hendrik Brueckner's avatar Hendrik Brueckner Committed by Janosch Frank
Browse files

KVM: s390: Add KVM capability for ESA mode guests 



Now that all the bits are properly addressed, provide a mechanism
for testing ESA mode guests in nested configurations.

Signed-off-by: default avatarHendrik Brueckner <brueckner@linux.ibm.com>
[farman@us.ibm.com: Updated commit message]
Reviewed-by: default avatarJanosch Frank <frankja@linux.ibm.com>
Signed-off-by: default avatarEric Farman <farman@linux.ibm.com>
Signed-off-by: default avatarJanosch Frank <frankja@linux.ibm.com>
parent c0dcada0

Documentation/virt/kvm/api.rst

+8 −0
Original line number Diff line number Diff line
@@ -9428,6 +9428,14 @@ KVM exits with the register state of either the L1 or L2 guest 
depending on which executed at the time of an exit. Userspace must

take care to differentiate between these cases.



8.47 KVM_CAP_S390_VSIE_ESAMODE

------------------------------



:Architectures: s390



The presence of this capability indicates that the nested KVM guest can

start in ESA mode.



9. Known KVM API problems

=========================

arch/s390/kvm/kvm-s390.c

+6 −0
Original line number Diff line number Diff line
@@ -629,6 +629,7 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext) 
	case KVM_CAP_IRQFD_RESAMPLE:

	case KVM_CAP_S390_USER_OPEREXEC:

	case KVM_CAP_S390_KEYOP:

	case KVM_CAP_S390_VSIE_ESAMODE:

		r = 1;

		break;

	case KVM_CAP_SET_GUEST_DEBUG2:
@@ -926,6 +927,11 @@ int kvm_vm_ioctl_enable_cap(struct kvm *kvm, struct kvm_enable_cap *cap) 
		icpt_operexc_on_all_vcpus(kvm);

		r = 0;

		break;

	case KVM_CAP_S390_VSIE_ESAMODE:

		VM_EVENT(kvm, 3, "%s", "ENABLE: CAP_S390_VSIE_ESAMODE");

		kvm->arch.allow_vsie_esamode = 1;

		r = 0;

		break;

	default:

		r = -EINVAL;

		break;

include/uapi/linux/kvm.h

+1 −0
Original line number Diff line number Diff line
@@ -985,6 +985,7 @@ struct kvm_enable_cap { 
#define KVM_CAP_ARM_SEA_TO_USER 245

#define KVM_CAP_S390_USER_OPEREXEC 246

#define KVM_CAP_S390_KEYOP 247

#define KVM_CAP_S390_VSIE_ESAMODE 248



struct kvm_irq_routing_irqchip {

	__u32 irqchip;