Commit d0786556 authored by Tony Krowiak's avatar Tony Krowiak Committed by Alexander Gordeev
Browse files

s390/vfio-ap: rename matrix_dev->lock mutex to matrix_dev->mdevs_lock 



The matrix_dev->lock mutex is being renamed to matrix_dev->mdevs_lock to
better reflect its purpose, which is to control access to the state of the
mediated devices under the control of the vfio_ap device driver.

Signed-off-by: default avatarTony Krowiak <akrowiak@linux.ibm.com>
Reviewed-by: default avatarJason J. Herne <jjherne@linux.ibm.com>
Signed-off-by: default avatarAlexander Gordeev <agordeev@linux.ibm.com>
parent e2126a73

drivers/s390/crypto/vfio_ap_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ static int vfio_ap_matrix_dev_create(void) 
			goto matrix_alloc_err;

	}



	mutex_init(&matrix_dev->lock);

	mutex_init(&matrix_dev->mdevs_lock);

	INIT_LIST_HEAD(&matrix_dev->mdev_list);



	dev_set_name(&matrix_dev->device, "%s", VFIO_AP_DEV_NAME);

drivers/s390/crypto/vfio_ap_ops.c

+39 −37
Original line number Diff line number Diff line
@@ -397,10 +397,12 @@ static int handle_pqap(struct kvm_vcpu *vcpu) 
		return -EOPNOTSUPP;

	}



	mutex_lock(&matrix_dev->lock);

	mutex_lock(&matrix_dev->mdevs_lock);



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

		VFIO_AP_DBF_WARN("%s: PQAP(AQIC) hook not registered with the vfio_ap driver: apqn=0x%04x\n",

				 __func__, apqn);



		goto out_unlock;

	}
@@ -435,7 +437,7 @@ static int handle_pqap(struct kvm_vcpu *vcpu) 
out_unlock:

	memcpy(&vcpu->run->s.regs.gprs[1], &qstatus, sizeof(qstatus));

	vcpu->run->s.regs.gprs[1] >>= 32;

	mutex_unlock(&matrix_dev->lock);

	mutex_unlock(&matrix_dev->mdevs_lock);

	return 0;

}
@@ -531,9 +533,9 @@ static int vfio_ap_mdev_probe(struct mdev_device *mdev) 
	vfio_ap_matrix_init(&matrix_dev->info, &matrix_mdev->shadow_apcb);

	hash_init(matrix_mdev->qtable.queues);

	dev_set_drvdata(&mdev->dev, matrix_mdev);

	mutex_lock(&matrix_dev->lock);

	mutex_lock(&matrix_dev->mdevs_lock);

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

	mutex_unlock(&matrix_dev->lock);

	mutex_unlock(&matrix_dev->mdevs_lock);



	ret = vfio_register_emulated_iommu_dev(&matrix_mdev->vdev);

	if (ret)
@@ -542,9 +544,9 @@ static int vfio_ap_mdev_probe(struct mdev_device *mdev) 
	return 0;



err_list:

	mutex_lock(&matrix_dev->lock);

	mutex_lock(&matrix_dev->mdevs_lock);

	list_del(&matrix_mdev->node);

	mutex_unlock(&matrix_dev->lock);

	mutex_unlock(&matrix_dev->mdevs_lock);

	vfio_uninit_group_dev(&matrix_mdev->vdev);

	kfree(matrix_mdev);

err_dec_available:
@@ -607,11 +609,11 @@ static void vfio_ap_mdev_remove(struct mdev_device *mdev) 


	vfio_unregister_group_dev(&matrix_mdev->vdev);



	mutex_lock(&matrix_dev->lock);

	mutex_lock(&matrix_dev->mdevs_lock);

	vfio_ap_mdev_reset_queues(matrix_mdev);

	vfio_ap_mdev_unlink_fr_queues(matrix_mdev);

	list_del(&matrix_mdev->node);

	mutex_unlock(&matrix_dev->lock);

	mutex_unlock(&matrix_dev->mdevs_lock);

	vfio_uninit_group_dev(&matrix_mdev->vdev);

	kfree(matrix_mdev);

	atomic_inc(&matrix_dev->available_instances);
@@ -787,7 +789,7 @@ static ssize_t assign_adapter_store(struct device *dev, 


	struct ap_matrix_mdev *matrix_mdev = dev_get_drvdata(dev);



	mutex_lock(&matrix_dev->lock);

	mutex_lock(&matrix_dev->mdevs_lock);



	/* If the KVM guest is running, disallow assignment of adapter */

	if (matrix_mdev->kvm) {
@@ -819,7 +821,7 @@ static ssize_t assign_adapter_store(struct device *dev, 
				   matrix_mdev->matrix.aqm, matrix_mdev);

	ret = count;

done:

	mutex_unlock(&matrix_dev->lock);

	mutex_unlock(&matrix_dev->mdevs_lock);



	return ret;

}
@@ -862,7 +864,7 @@ static ssize_t unassign_adapter_store(struct device *dev, 
	unsigned long apid;

	struct ap_matrix_mdev *matrix_mdev = dev_get_drvdata(dev);



	mutex_lock(&matrix_dev->lock);

	mutex_lock(&matrix_dev->mdevs_lock);



	/* If the KVM guest is running, disallow unassignment of adapter */

	if (matrix_mdev->kvm) {
@@ -887,7 +889,7 @@ static ssize_t unassign_adapter_store(struct device *dev, 


	ret = count;

done:

	mutex_unlock(&matrix_dev->lock);

	mutex_unlock(&matrix_dev->mdevs_lock);

	return ret;

}

static DEVICE_ATTR_WO(unassign_adapter);
@@ -942,7 +944,7 @@ static ssize_t assign_domain_store(struct device *dev, 
	struct ap_matrix_mdev *matrix_mdev = dev_get_drvdata(dev);

	unsigned long max_apqi = matrix_mdev->matrix.aqm_max;



	mutex_lock(&matrix_dev->lock);

	mutex_lock(&matrix_dev->mdevs_lock);



	/* If the KVM guest is running, disallow assignment of domain */

	if (matrix_mdev->kvm) {
@@ -973,7 +975,7 @@ static ssize_t assign_domain_store(struct device *dev, 
				   matrix_mdev);

	ret = count;

done:

	mutex_unlock(&matrix_dev->lock);

	mutex_unlock(&matrix_dev->mdevs_lock);



	return ret;

}
@@ -1016,7 +1018,7 @@ static ssize_t unassign_domain_store(struct device *dev, 
	unsigned long apqi;

	struct ap_matrix_mdev *matrix_mdev = dev_get_drvdata(dev);



	mutex_lock(&matrix_dev->lock);

	mutex_lock(&matrix_dev->mdevs_lock);



	/* If the KVM guest is running, disallow unassignment of domain */

	if (matrix_mdev->kvm) {
@@ -1042,7 +1044,7 @@ static ssize_t unassign_domain_store(struct device *dev, 
	ret = count;



done:

	mutex_unlock(&matrix_dev->lock);

	mutex_unlock(&matrix_dev->mdevs_lock);

	return ret;

}

static DEVICE_ATTR_WO(unassign_domain);
@@ -1069,7 +1071,7 @@ static ssize_t assign_control_domain_store(struct device *dev, 
	unsigned long id;

	struct ap_matrix_mdev *matrix_mdev = dev_get_drvdata(dev);



	mutex_lock(&matrix_dev->lock);

	mutex_lock(&matrix_dev->mdevs_lock);



	/* If the KVM guest is running, disallow assignment of control domain */

	if (matrix_mdev->kvm) {
@@ -1095,7 +1097,7 @@ static ssize_t assign_control_domain_store(struct device *dev, 
	vfio_ap_mdev_filter_cdoms(matrix_mdev);

	ret = count;

done:

	mutex_unlock(&matrix_dev->lock);

	mutex_unlock(&matrix_dev->mdevs_lock);

	return ret;

}

static DEVICE_ATTR_WO(assign_control_domain);
@@ -1123,7 +1125,7 @@ static ssize_t unassign_control_domain_store(struct device *dev, 
	struct ap_matrix_mdev *matrix_mdev = dev_get_drvdata(dev);

	unsigned long max_domid =  matrix_mdev->matrix.adm_max;



	mutex_lock(&matrix_dev->lock);

	mutex_lock(&matrix_dev->mdevs_lock);



	/* If a KVM guest is running, disallow unassignment of control domain */

	if (matrix_mdev->kvm) {
@@ -1146,7 +1148,7 @@ static ssize_t unassign_control_domain_store(struct device *dev, 


	ret = count;

done:

	mutex_unlock(&matrix_dev->lock);

	mutex_unlock(&matrix_dev->mdevs_lock);

	return ret;

}

static DEVICE_ATTR_WO(unassign_control_domain);
@@ -1162,13 +1164,13 @@ static ssize_t control_domains_show(struct device *dev, 
	struct ap_matrix_mdev *matrix_mdev = dev_get_drvdata(dev);

	unsigned long max_domid = matrix_mdev->matrix.adm_max;



	mutex_lock(&matrix_dev->lock);

	mutex_lock(&matrix_dev->mdevs_lock);

	for_each_set_bit_inv(id, matrix_mdev->matrix.adm, max_domid + 1) {

		n = sprintf(bufpos, "%04lx\n", id);

		bufpos += n;

		nchars += n;

	}

	mutex_unlock(&matrix_dev->lock);

	mutex_unlock(&matrix_dev->mdevs_lock);



	return nchars;

}
@@ -1191,7 +1193,7 @@ static ssize_t matrix_show(struct device *dev, struct device_attribute *attr, 
	apid1 = find_first_bit_inv(matrix_mdev->matrix.apm, napm_bits);

	apqi1 = find_first_bit_inv(matrix_mdev->matrix.aqm, naqm_bits);



	mutex_lock(&matrix_dev->lock);

	mutex_lock(&matrix_dev->mdevs_lock);



	if ((apid1 < napm_bits) && (apqi1 < naqm_bits)) {

		for_each_set_bit_inv(apid, matrix_mdev->matrix.apm, napm_bits) {
@@ -1217,7 +1219,7 @@ static ssize_t matrix_show(struct device *dev, struct device_attribute *attr, 
		}

	}



	mutex_unlock(&matrix_dev->lock);

	mutex_unlock(&matrix_dev->mdevs_lock);



	return nchars;

}
@@ -1265,12 +1267,12 @@ static int vfio_ap_mdev_set_kvm(struct ap_matrix_mdev *matrix_mdev, 
		up_write(&kvm->arch.crypto.pqap_hook_rwsem);



		mutex_lock(&kvm->lock);

		mutex_lock(&matrix_dev->lock);

		mutex_lock(&matrix_dev->mdevs_lock);



		list_for_each_entry(m, &matrix_dev->mdev_list, node) {

			if (m != matrix_mdev && m->kvm == kvm) {

				mutex_unlock(&kvm->lock);

				mutex_unlock(&matrix_dev->lock);

				mutex_unlock(&matrix_dev->mdevs_lock);

				return -EPERM;

			}

		}
@@ -1282,7 +1284,7 @@ static int vfio_ap_mdev_set_kvm(struct ap_matrix_mdev *matrix_mdev, 
					  matrix_mdev->shadow_apcb.adm);



		mutex_unlock(&kvm->lock);

		mutex_unlock(&matrix_dev->lock);

		mutex_unlock(&matrix_dev->mdevs_lock);

	}



	return 0;
@@ -1334,7 +1336,7 @@ static void vfio_ap_mdev_unset_kvm(struct ap_matrix_mdev *matrix_mdev) 
		up_write(&kvm->arch.crypto.pqap_hook_rwsem);



		mutex_lock(&kvm->lock);

		mutex_lock(&matrix_dev->lock);

		mutex_lock(&matrix_dev->mdevs_lock);



		kvm_arch_crypto_clear_masks(kvm);

		vfio_ap_mdev_reset_queues(matrix_mdev);
@@ -1342,7 +1344,7 @@ static void vfio_ap_mdev_unset_kvm(struct ap_matrix_mdev *matrix_mdev) 
		matrix_mdev->kvm = NULL;



		mutex_unlock(&kvm->lock);

		mutex_unlock(&matrix_dev->lock);

		mutex_unlock(&matrix_dev->mdevs_lock);

	}

}
@@ -1497,7 +1499,7 @@ static ssize_t vfio_ap_mdev_ioctl(struct vfio_device *vdev, 
		container_of(vdev, struct ap_matrix_mdev, vdev);

	int ret;



	mutex_lock(&matrix_dev->lock);

	mutex_lock(&matrix_dev->mdevs_lock);

	switch (cmd) {

	case VFIO_DEVICE_GET_INFO:

		ret = vfio_ap_mdev_get_device_info(arg);
@@ -1509,7 +1511,7 @@ static ssize_t vfio_ap_mdev_ioctl(struct vfio_device *vdev, 
		ret = -EOPNOTSUPP;

		break;

	}

	mutex_unlock(&matrix_dev->lock);

	mutex_unlock(&matrix_dev->mdevs_lock);



	return ret;

}
@@ -1538,7 +1540,7 @@ static ssize_t status_show(struct device *dev, 
	struct ap_matrix_mdev *matrix_mdev;

	struct ap_device *apdev = to_ap_dev(dev);



	mutex_lock(&matrix_dev->lock);

	mutex_lock(&matrix_dev->mdevs_lock);

	q = dev_get_drvdata(&apdev->device);

	matrix_mdev = vfio_ap_mdev_for_queue(q);
@@ -1554,7 +1556,7 @@ static ssize_t status_show(struct device *dev, 
				   AP_QUEUE_UNASSIGNED);

	}



	mutex_unlock(&matrix_dev->lock);

	mutex_unlock(&matrix_dev->mdevs_lock);



	return nchars;

}
@@ -1649,7 +1651,7 @@ int vfio_ap_mdev_probe_queue(struct ap_device *apdev) 
	if (!q)

		return -ENOMEM;



	mutex_lock(&matrix_dev->lock);

	mutex_lock(&matrix_dev->mdevs_lock);

	q->apqn = to_ap_queue(&apdev->device)->qid;

	q->saved_isc = VFIO_AP_ISC_INVALID;

	vfio_ap_queue_link_mdev(q);
@@ -1659,7 +1661,7 @@ int vfio_ap_mdev_probe_queue(struct ap_device *apdev) 
					   q->matrix_mdev);

	}

	dev_set_drvdata(&apdev->device, q);

	mutex_unlock(&matrix_dev->lock);

	mutex_unlock(&matrix_dev->mdevs_lock);



	return 0;

}
@@ -1669,7 +1671,7 @@ void vfio_ap_mdev_remove_queue(struct ap_device *apdev) 
	unsigned long apid;

	struct vfio_ap_queue *q;



	mutex_lock(&matrix_dev->lock);

	mutex_lock(&matrix_dev->mdevs_lock);

	sysfs_remove_group(&apdev->device.kobj, &vfio_queue_attr_group);

	q = dev_get_drvdata(&apdev->device);
@@ -1684,5 +1686,5 @@ void vfio_ap_mdev_remove_queue(struct ap_device *apdev) 
	vfio_ap_mdev_reset_queue(q, 1);

	dev_set_drvdata(&apdev->device, NULL);

	kfree(q);

	mutex_unlock(&matrix_dev->lock);

	mutex_unlock(&matrix_dev->mdevs_lock);

}

drivers/s390/crypto/vfio_ap_private.h

+2 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
 * @available_instances: number of mediated matrix devices that can be created

 * @info:	the struct containing the output from the PQAP(QCI) instruction

 * @mdev_list:	the list of mediated matrix devices created

 * @lock:	mutex for locking the AP matrix device. This lock will be

 * @mdevs_lock: mutex for locking the AP matrix device. This lock will be

 *		taken every time we fiddle with state managed by the vfio_ap

 *		driver, be it using @mdev_list or writing the state of a

 *		single ap_matrix_mdev device. It's quite coarse but we don't
@@ -45,7 +45,7 @@ struct ap_matrix_dev { 
	atomic_t available_instances;

	struct ap_config_info info;

	struct list_head mdev_list;

	struct mutex lock;

	struct mutex mdevs_lock; /* serializes access to each ap_matrix_mdev */

	struct ap_driver  *vfio_ap_drv;

};