Commit 8ec2fa52 authored by Christian Borntraeger's avatar Christian Borntraeger
Browse files

KVM: s390: enable MSA9 keywrapping functions depending on cpu model 



Instead of adding a new machine option to disable/enable the keywrapping
options of pckmo (like for AES and DEA) we can now use the CPU model to
decide. As ECC is also wrapped with the AES key we need that to be
enabled.

Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
parent 4f45b90e

arch/s390/include/asm/kvm_host.h

+1 −0
Original line number Diff line number Diff line
@@ -278,6 +278,7 @@ struct kvm_s390_sie_block { 
#define ECD_HOSTREGMGMT	0x20000000

#define ECD_MEF		0x08000000

#define ECD_ETOKENF	0x02000000

#define ECD_ECC		0x00200000

	__u32	ecd;			/* 0x01c8 */

	__u8	reserved1cc[18];	/* 0x01cc */

	__u64	pp;			/* 0x01de */

arch/s390/kvm/kvm-s390.c

+26 −1
Original line number Diff line number Diff line
@@ -2890,6 +2890,25 @@ void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu) 
	vcpu->arch.enabled_gmap = vcpu->arch.gmap;

}



static bool kvm_has_pckmo_subfunc(struct kvm *kvm, unsigned long nr)

{

	if (test_bit_inv(nr, (unsigned long *)&kvm->arch.model.subfuncs.pckmo) &&

	    test_bit_inv(nr, (unsigned long *)&kvm_s390_available_subfunc.pckmo))

		return true;

	return false;

}



static bool kvm_has_pckmo_ecc(struct kvm *kvm)

{

	/* At least one ECC subfunction must be present */

	return kvm_has_pckmo_subfunc(kvm, 32) ||

	       kvm_has_pckmo_subfunc(kvm, 33) ||

	       kvm_has_pckmo_subfunc(kvm, 34) ||

	       kvm_has_pckmo_subfunc(kvm, 40) ||

	       kvm_has_pckmo_subfunc(kvm, 41);



}



static void kvm_s390_vcpu_crypto_setup(struct kvm_vcpu *vcpu)

{

	/*
@@ -2902,13 +2921,19 @@ static void kvm_s390_vcpu_crypto_setup(struct kvm_vcpu *vcpu) 
	vcpu->arch.sie_block->crycbd = vcpu->kvm->arch.crypto.crycbd;

	vcpu->arch.sie_block->ecb3 &= ~(ECB3_AES | ECB3_DEA);

	vcpu->arch.sie_block->eca &= ~ECA_APIE;

	vcpu->arch.sie_block->ecd &= ~ECD_ECC;



	if (vcpu->kvm->arch.crypto.apie)

		vcpu->arch.sie_block->eca |= ECA_APIE;



	/* Set up protected key support */

	if (vcpu->kvm->arch.crypto.aes_kw)

	if (vcpu->kvm->arch.crypto.aes_kw) {

		vcpu->arch.sie_block->ecb3 |= ECB3_AES;

		/* ecc is also wrapped with AES key */

		if (kvm_has_pckmo_ecc(vcpu->kvm))

			vcpu->arch.sie_block->ecd |= ECD_ECC;

	}



	if (vcpu->kvm->arch.crypto.dea_kw)

		vcpu->arch.sie_block->ecb3 |= ECB3_DEA;

}

arch/s390/kvm/vsie.c

+4 −1
Original line number Diff line number Diff line
@@ -288,6 +288,7 @@ static int shadow_crycb(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page) 
	const u32 crycb_addr = crycbd_o & 0x7ffffff8U;

	unsigned long *b1, *b2;

	u8 ecb3_flags;

	u32 ecd_flags;

	int apie_h;

	int key_msk = test_kvm_facility(vcpu->kvm, 76);

	int fmt_o = crycbd_o & CRYCB_FORMAT_MASK;
@@ -320,7 +321,8 @@ static int shadow_crycb(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page) 
	/* we may only allow it if enabled for guest 2 */

	ecb3_flags = scb_o->ecb3 & vcpu->arch.sie_block->ecb3 &

		     (ECB3_AES | ECB3_DEA);

	if (!ecb3_flags)

	ecd_flags = scb_o->ecd & vcpu->arch.sie_block->ecd & ECD_ECC;

	if (!ecb3_flags && !ecd_flags)

		goto end;



	/* copy only the wrapping keys */
@@ -329,6 +331,7 @@ static int shadow_crycb(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page) 
		return set_validity_icpt(scb_s, 0x0035U);



	scb_s->ecb3 |= ecb3_flags;

	scb_s->ecd |= ecd_flags;



	/* xor both blocks in one run */

	b1 = (unsigned long *) vsie_page->crycb.dea_wrapping_key_mask;

CRA Git | Maintained and supported by SUSTech CRA and CCSE