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

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

KVM: s390: interface to clear CRYCB masks 



Introduces a new KVM function to clear the APCB0 and APCB1 in the guest's
CRYCB. This effectively clears all bits of the APM, AQM and ADM masks
configured for the guest. The VCPUs are taken out of SIE to ensure the
VCPUs do not get out of sync.

Signed-off-by: default avatarTony Krowiak <akrowiak@linux.ibm.com>
Acked-by: default avatarHalil Pasic <pasic@linux.ibm.com>
Tested-by: default avatarMichael Mueller <mimu@linux.ibm.com>
Tested-by: default avatarFarhan Ali <alifm@linux.ibm.com>
Tested-by: default avatarPierre Morel <pmorel@linux.ibm.com>
Reviewed-by: default avatarCornelia Huck <cohuck@redhat.com>
Message-Id: <20180925231641.4954-11-akrowiak@linux.vnet.ibm.com>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
parent 81b2b4b7

arch/s390/include/asm/kvm_host.h

+2 −0
Original line number Diff line number Diff line
@@ -859,6 +859,8 @@ void kvm_arch_async_page_not_present(struct kvm_vcpu *vcpu, 
void kvm_arch_async_page_present(struct kvm_vcpu *vcpu,

				 struct kvm_async_pf *work);



void kvm_arch_crypto_clear_masks(struct kvm *kvm);



extern int sie64a(struct kvm_s390_sie_block *, u64 *);

extern char sie_exit;

arch/s390/kvm/kvm-s390.c

+15 −0
Original line number Diff line number Diff line
@@ -2033,6 +2033,21 @@ static void kvm_s390_set_crycb_format(struct kvm *kvm) 
		kvm->arch.crypto.crycbd |= CRYCB_FORMAT1;

}



void kvm_arch_crypto_clear_masks(struct kvm *kvm)

{

	mutex_lock(&kvm->lock);

	kvm_s390_vcpu_block_all(kvm);



	memset(&kvm->arch.crypto.crycb->apcb0, 0,

	       sizeof(kvm->arch.crypto.crycb->apcb0));

	memset(&kvm->arch.crypto.crycb->apcb1, 0,

	       sizeof(kvm->arch.crypto.crycb->apcb1));



	kvm_s390_vcpu_unblock_all(kvm);

	mutex_unlock(&kvm->lock);

}

EXPORT_SYMBOL_GPL(kvm_arch_crypto_clear_masks);



static u64 kvm_s390_get_initial_cpuid(void)

{

	struct cpuid cpuid;