Commit 20c922f0 authored by Tony Krowiak's avatar Tony Krowiak Committed by Christian Borntraeger
Browse files

KVM: s390: reset crypto attributes for all vcpus 



Introduces a new function to reset the crypto attributes for all
vcpus whether they are running or not. Each vcpu in KVM will
be removed from SIE prior to resetting the crypto attributes in its
SIE state description. After all vcpus have had their crypto attributes
reset the vcpus will be restored to SIE.

This function is incorporated into the kvm_s390_vm_set_crypto(kvm)
function to fix a reported issue whereby the crypto key wrapping
attributes could potentially get out of synch for running vcpus.

Reviewed-by: default avatarCornelia Huck <cohuck@redhat.com>
Reported-by: default avatarHalil Pasic <pasic@linux.vnet.ibm.com>
Signed-off-by: default avatarTony Krowiak <akrowiak@linux.vnet.ibm.com>
Signed-off-by: default avatarJanosch Frank <frankja@linux.vnet.ibm.com>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
parent 55531b74

arch/s390/kvm/kvm-s390.c

+12 −5
Original line number Diff line number Diff line
@@ -791,11 +791,21 @@ static int kvm_s390_set_mem_control(struct kvm *kvm, struct kvm_device_attr *att 


static void kvm_s390_vcpu_crypto_setup(struct kvm_vcpu *vcpu);



static int kvm_s390_vm_set_crypto(struct kvm *kvm, struct kvm_device_attr *attr)

void kvm_s390_vcpu_crypto_reset_all(struct kvm *kvm)

{

	struct kvm_vcpu *vcpu;

	int i;



	kvm_s390_vcpu_block_all(kvm);



	kvm_for_each_vcpu(i, vcpu, kvm)

		kvm_s390_vcpu_crypto_setup(vcpu);



	kvm_s390_vcpu_unblock_all(kvm);

}



static int kvm_s390_vm_set_crypto(struct kvm *kvm, struct kvm_device_attr *attr)

{

	if (!test_kvm_facility(kvm, 76))

		return -EINVAL;
@@ -832,10 +842,7 @@ static int kvm_s390_vm_set_crypto(struct kvm *kvm, struct kvm_device_attr *attr) 
		return -ENXIO;

	}



	kvm_for_each_vcpu(i, vcpu, kvm) {

		kvm_s390_vcpu_crypto_setup(vcpu);

		exit_sie(vcpu);

	}

	kvm_s390_vcpu_crypto_reset_all(kvm);

	mutex_unlock(&kvm->lock);

	return 0;

}

arch/s390/kvm/kvm-s390.h

+13 −0
Original line number Diff line number Diff line
@@ -410,4 +410,17 @@ static inline int kvm_s390_use_sca_entries(void) 
}

void kvm_s390_reinject_machine_check(struct kvm_vcpu *vcpu,

				     struct mcck_volatile_info *mcck_info);



/**

 * kvm_s390_vcpu_crypto_reset_all

 *

 * Reset the crypto attributes for each vcpu. This can be done while the vcpus

 * are running as each vcpu will be removed from SIE before resetting the crypt

 * attributes and restored to SIE afterward.

 *

 * Note: The kvm->lock must be held while calling this function

 *

 * @kvm: the KVM guest

 */

void kvm_s390_vcpu_crypto_reset_all(struct kvm *kvm);

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE