Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 730cd632 authored by Farhan Ali's avatar Farhan Ali Committed by Christian Borntraeger
Browse files

KVM: s390: Support keyless subset guest mode 



If the KSS facility is available on the machine, we also make it
available for our KVM guests.

The KSS facility bypasses storage key management as long as the guest
does not issue a related instruction. When that happens, the control is
returned to the host, which has to turn off KSS for a guest vcpu
before retrying the instruction.

Signed-off-by: default avatarCorey S. McQuay <csmcquay@linux.vnet.ibm.com>
Signed-off-by: default avatarFarhan Ali <alifm@linux.vnet.ibm.com>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
parent 71cb1bf6

arch/s390/include/asm/kvm_host.h

+2 −0
Original line number Diff line number Diff line
@@ -122,6 +122,7 @@ struct esca_block { 
#define CPUSTAT_SLSR       0x00002000

#define CPUSTAT_ZARCH      0x00000800

#define CPUSTAT_MCDS       0x00000100

#define CPUSTAT_KSS        0x00000200

#define CPUSTAT_SM         0x00000080

#define CPUSTAT_IBS        0x00000040

#define CPUSTAT_GED2       0x00000010
@@ -185,6 +186,7 @@ struct kvm_s390_sie_block { 
#define ICPT_OPEREXC	0x2C

#define ICPT_PARTEXEC	0x38

#define ICPT_IOINST	0x40

#define ICPT_KSS	0x5c

	__u8	icptcode;		/* 0x0050 */

	__u8	icptstatus;		/* 0x0051 */

	__u16	ihcpu;			/* 0x0052 */

arch/s390/include/uapi/asm/kvm.h

+1 −0
Original line number Diff line number Diff line
@@ -119,6 +119,7 @@ struct kvm_s390_vm_cpu_machine { 
#define KVM_S390_VM_CPU_FEAT_CMMA	10

#define KVM_S390_VM_CPU_FEAT_PFMFI	11

#define KVM_S390_VM_CPU_FEAT_SIGPIF	12

#define KVM_S390_VM_CPU_FEAT_KSS	13

struct kvm_s390_vm_cpu_feat {

	__u64 feat[16];

};

arch/s390/kvm/intercept.c

+3 −0
Original line number Diff line number Diff line
@@ -426,6 +426,9 @@ int kvm_handle_sie_intercept(struct kvm_vcpu *vcpu) 
	case ICPT_PARTEXEC:

		rc = handle_partial_execution(vcpu);

		break;

	case ICPT_KSS:

		rc = kvm_s390_skey_check_enable(vcpu);

		break;

	default:

		return -EOPNOTSUPP;

	}

arch/s390/kvm/kvm-s390.c

+7 −1
Original line number Diff line number Diff line
@@ -300,6 +300,8 @@ static void kvm_s390_cpu_feat_init(void) 
		allow_cpu_feat(KVM_S390_VM_CPU_FEAT_CEI);

	if (sclp.has_ibs)

		allow_cpu_feat(KVM_S390_VM_CPU_FEAT_IBS);

	if (sclp.has_kss)

		allow_cpu_feat(KVM_S390_VM_CPU_FEAT_KSS);

	/*

	 * KVM_S390_VM_CPU_FEAT_SKEY: Wrong shadow of PTE.I bits will make

	 * all skey handling functions read/set the skey from the PGSTE
@@ -2034,6 +2036,10 @@ int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu) 
	vcpu->arch.sie_block->sdnxo = ((unsigned long) &vcpu->run->s.regs.sdnx)

					| SDNXC;

	vcpu->arch.sie_block->riccbd = (unsigned long) &vcpu->run->s.regs.riccb;



	if (sclp.has_kss)

		atomic_or(CPUSTAT_KSS, &vcpu->arch.sie_block->cpuflags);

	else

		vcpu->arch.sie_block->ictl |= ICTL_ISKE | ICTL_SSKE | ICTL_RRBE;



	if (vcpu->kvm->arch.use_cmma) {

arch/s390/kvm/kvm-s390.h

+1 −0
Original line number Diff line number Diff line
@@ -254,6 +254,7 @@ int kvm_s390_handle_lpsw(struct kvm_vcpu *vcpu); 
int kvm_s390_handle_stctl(struct kvm_vcpu *vcpu);

int kvm_s390_handle_lctl(struct kvm_vcpu *vcpu);

int kvm_s390_handle_eb(struct kvm_vcpu *vcpu);

int kvm_s390_skey_check_enable(struct kvm_vcpu *vcpu);



/* implemented in vsie.c */

int kvm_s390_handle_vsie(struct kvm_vcpu *vcpu);