Commit 1e753732 authored by Tony Krowiak's avatar Tony Krowiak Committed by Alex Williamson
Browse files

s390/vfio-ap: r/w lock for PQAP interception handler function pointer 



The function pointer to the interception handler for the PQAP instruction
can get changed during the interception process. Let's add a
semaphore to struct kvm_s390_crypto to control read/write access to the
function pointer contained therein.

The semaphore must be locked for write access by the vfio_ap device driver
when notified that the KVM pointer has been set or cleared. It must be
locked for read access by the interception framework when the PQAP
instruction is intercepted.

Signed-off-by: default avatarTony Krowiak <akrowiak@linux.ibm.com>
Reviewed-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Reviewed-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Link: https://lore.kernel.org/r/20210823212047.1476436-2-akrowiak@linux.ibm.com


Signed-off-by: default avatarAlex Williamson <alex.williamson@redhat.com>
parent eb24c100

arch/s390/include/asm/kvm_host.h

+3 −5
Original line number Diff line number Diff line
@@ -798,14 +798,12 @@ struct kvm_s390_cpu_model { 
	unsigned short ibc;

};



struct kvm_s390_module_hook {

	int (*hook)(struct kvm_vcpu *vcpu);

	struct module *owner;

};

typedef int (*crypto_hook)(struct kvm_vcpu *vcpu);



struct kvm_s390_crypto {

	struct kvm_s390_crypto_cb *crycb;

	struct kvm_s390_module_hook *pqap_hook;

	struct rw_semaphore pqap_hook_rwsem;

	crypto_hook *pqap_hook;

	__u32 crycbd;

	__u8 aes_kw;

	__u8 dea_kw;

arch/s390/kvm/kvm-s390.c

+1 −0
Original line number Diff line number Diff line
@@ -2630,6 +2630,7 @@ static void kvm_s390_crypto_init(struct kvm *kvm) 
{

	kvm->arch.crypto.crycb = &kvm->arch.sie_page2->crycb;

	kvm_s390_set_crycb_format(kvm);

	init_rwsem(&kvm->arch.crypto.pqap_hook_rwsem);



	if (!test_kvm_facility(kvm, 76))

		return;

arch/s390/kvm/priv.c

+9 −6
Original line number Diff line number Diff line
@@ -610,6 +610,7 @@ static int handle_io_inst(struct kvm_vcpu *vcpu) 
static int handle_pqap(struct kvm_vcpu *vcpu)

{

	struct ap_queue_status status = {};

	crypto_hook pqap_hook;

	unsigned long reg0;

	int ret;

	uint8_t fc;
@@ -654,18 +655,20 @@ static int handle_pqap(struct kvm_vcpu *vcpu) 
		return kvm_s390_inject_program_int(vcpu, PGM_SPECIFICATION);



	/*

	 * Verify that the hook callback is registered, lock the owner

	 * and call the hook.

	 * If the hook callback is registered, there will be a pointer to the

	 * hook function pointer in the kvm_s390_crypto structure. Lock the

	 * owner, retrieve the hook function pointer and call the hook.

	 */

	down_read(&vcpu->kvm->arch.crypto.pqap_hook_rwsem);

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

		if (!try_module_get(vcpu->kvm->arch.crypto.pqap_hook->owner))

			return -EOPNOTSUPP;

		ret = vcpu->kvm->arch.crypto.pqap_hook->hook(vcpu);

		module_put(vcpu->kvm->arch.crypto.pqap_hook->owner);

		pqap_hook = *vcpu->kvm->arch.crypto.pqap_hook;

		ret = pqap_hook(vcpu);

		if (!ret && vcpu->run->s.regs.gprs[1] & 0x00ff0000)

			kvm_s390_set_psw_cc(vcpu, 3);

		up_read(&vcpu->kvm->arch.crypto.pqap_hook_rwsem);

		return ret;

	}

	up_read(&vcpu->kvm->arch.crypto.pqap_hook_rwsem);

	/*

	 * A vfio_driver must register a hook.

	 * No hook means no driver to enable the SIE CRYCB and no queues.

drivers/s390/crypto/vfio_ap_ops.c

+17 −6
Original line number Diff line number Diff line
@@ -352,8 +352,7 @@ static int vfio_ap_mdev_create(struct mdev_device *mdev) 
	vfio_ap_matrix_init(&matrix_dev->info, &matrix_mdev->matrix);

	init_waitqueue_head(&matrix_mdev->wait_for_kvm);

	mdev_set_drvdata(mdev, matrix_mdev);

	matrix_mdev->pqap_hook.hook = handle_pqap;

	matrix_mdev->pqap_hook.owner = THIS_MODULE;

	matrix_mdev->pqap_hook = handle_pqap;

	mutex_lock(&matrix_dev->lock);

	list_add(&matrix_mdev->node, &matrix_dev->mdev_list);

	mutex_unlock(&matrix_dev->lock);
@@ -1115,15 +1114,20 @@ static int vfio_ap_mdev_set_kvm(struct ap_matrix_mdev *matrix_mdev, 
		}



		kvm_get_kvm(kvm);

		matrix_mdev->kvm = kvm;

		matrix_mdev->kvm_busy = true;

		mutex_unlock(&matrix_dev->lock);



		down_write(&matrix_mdev->kvm->arch.crypto.pqap_hook_rwsem);

		kvm->arch.crypto.pqap_hook = &matrix_mdev->pqap_hook;

		up_write(&matrix_mdev->kvm->arch.crypto.pqap_hook_rwsem);



		kvm_arch_crypto_set_masks(kvm,

					  matrix_mdev->matrix.apm,

					  matrix_mdev->matrix.aqm,

					  matrix_mdev->matrix.adm);



		mutex_lock(&matrix_dev->lock);

		kvm->arch.crypto.pqap_hook = &matrix_mdev->pqap_hook;

		matrix_mdev->kvm = kvm;

		matrix_mdev->kvm_busy = false;

		wake_up_all(&matrix_mdev->wait_for_kvm);

	}
@@ -1189,10 +1193,17 @@ static void vfio_ap_mdev_unset_kvm(struct ap_matrix_mdev *matrix_mdev) 
	if (matrix_mdev->kvm) {

		matrix_mdev->kvm_busy = true;

		mutex_unlock(&matrix_dev->lock);



		if (matrix_mdev->kvm->arch.crypto.crycbd) {

			down_write(&matrix_mdev->kvm->arch.crypto.pqap_hook_rwsem);

			matrix_mdev->kvm->arch.crypto.pqap_hook = NULL;

			up_write(&matrix_mdev->kvm->arch.crypto.pqap_hook_rwsem);



			kvm_arch_crypto_clear_masks(matrix_mdev->kvm);

		}



		mutex_lock(&matrix_dev->lock);

		vfio_ap_mdev_reset_queues(matrix_mdev->mdev);

		matrix_mdev->kvm->arch.crypto.pqap_hook = NULL;

		kvm_put_kvm(matrix_mdev->kvm);

		matrix_mdev->kvm = NULL;

		matrix_mdev->kvm_busy = false;

drivers/s390/crypto/vfio_ap_private.h

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ struct ap_matrix_mdev { 
	bool kvm_busy;

	wait_queue_head_t wait_for_kvm;

	struct kvm *kvm;

	struct kvm_s390_module_hook pqap_hook;

	crypto_hook pqap_hook;

	struct mdev_device *mdev;

};