Unverified Commit 9169abbb authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!5346 v2 s390/vfio-ap: always filter entire AP matrix 

Merge Pull Request from: @ci-robot 
 
PR sync from: Xiang Yang <xiangyang3@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/6CKWRLO2HZU6E2EMNJ7KPDUUPJI2SWD6/ 
 
https://gitee.com/src-openeuler/kernel/issues/I97NH7 
 
Link:https://gitee.com/openeuler/kernel/pulls/5346

 

Reviewed-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents 81650e9b 09626343

drivers/s390/crypto/vfio_ap_ops.c

+17 −40
Original line number Diff line number Diff line
@@ -670,8 +670,7 @@ static bool vfio_ap_mdev_filter_cdoms(struct ap_matrix_mdev *matrix_mdev) 
 * Return: a boolean value indicating whether the KVM guest's APCB was changed

 *	   by the filtering or not.

 */

static bool vfio_ap_mdev_filter_matrix(unsigned long *apm, unsigned long *aqm,

				       struct ap_matrix_mdev *matrix_mdev)

static bool vfio_ap_mdev_filter_matrix(struct ap_matrix_mdev *matrix_mdev)

{

	unsigned long apid, apqi, apqn;

	DECLARE_BITMAP(prev_shadow_apm, AP_DEVICES);
@@ -692,8 +691,8 @@ static bool vfio_ap_mdev_filter_matrix(unsigned long *apm, unsigned long *aqm, 
	bitmap_and(matrix_mdev->shadow_apcb.aqm, matrix_mdev->matrix.aqm,

		   (unsigned long *)matrix_dev->info.aqm, AP_DOMAINS);



	for_each_set_bit_inv(apid, apm, AP_DEVICES) {

		for_each_set_bit_inv(apqi, aqm, AP_DOMAINS) {

	for_each_set_bit_inv(apid, matrix_mdev->matrix.apm, AP_DEVICES) {

		for_each_set_bit_inv(apqi, matrix_mdev->matrix.aqm, AP_DOMAINS) {

			/*

			 * If the APQN is not bound to the vfio_ap device

			 * driver, then we can't assign it to the guest's
@@ -958,7 +957,6 @@ static ssize_t assign_adapter_store(struct device *dev, 
{

	int ret;

	unsigned long apid;

	DECLARE_BITMAP(apm_delta, AP_DEVICES);

	struct ap_matrix_mdev *matrix_mdev = dev_get_drvdata(dev);



	mutex_lock(&ap_perms_mutex);
@@ -987,11 +985,8 @@ static ssize_t assign_adapter_store(struct device *dev, 
	}



	vfio_ap_mdev_link_adapter(matrix_mdev, apid);

	memset(apm_delta, 0, sizeof(apm_delta));

	set_bit_inv(apid, apm_delta);



	if (vfio_ap_mdev_filter_matrix(apm_delta,

				       matrix_mdev->matrix.aqm, matrix_mdev))

	if (vfio_ap_mdev_filter_matrix(matrix_mdev))

		vfio_ap_mdev_update_guest_apcb(matrix_mdev);



	ret = count;
@@ -1167,7 +1162,6 @@ static ssize_t assign_domain_store(struct device *dev, 
{

	int ret;

	unsigned long apqi;

	DECLARE_BITMAP(aqm_delta, AP_DOMAINS);

	struct ap_matrix_mdev *matrix_mdev = dev_get_drvdata(dev);



	mutex_lock(&ap_perms_mutex);
@@ -1196,11 +1190,8 @@ static ssize_t assign_domain_store(struct device *dev, 
	}



	vfio_ap_mdev_link_domain(matrix_mdev, apqi);

	memset(aqm_delta, 0, sizeof(aqm_delta));

	set_bit_inv(apqi, aqm_delta);



	if (vfio_ap_mdev_filter_matrix(matrix_mdev->matrix.apm, aqm_delta,

				       matrix_mdev))

	if (vfio_ap_mdev_filter_matrix(matrix_mdev))

		vfio_ap_mdev_update_guest_apcb(matrix_mdev);



	ret = count;
@@ -2091,9 +2082,7 @@ int vfio_ap_mdev_probe_queue(struct ap_device *apdev) 
	if (matrix_mdev) {

		vfio_ap_mdev_link_queue(matrix_mdev, q);



		if (vfio_ap_mdev_filter_matrix(matrix_mdev->matrix.apm,

					       matrix_mdev->matrix.aqm,

					       matrix_mdev))

		if (vfio_ap_mdev_filter_matrix(matrix_mdev))

			vfio_ap_mdev_update_guest_apcb(matrix_mdev);

	}

	dev_set_drvdata(&apdev->device, q);
@@ -2443,34 +2432,22 @@ void vfio_ap_on_cfg_changed(struct ap_config_info *cur_cfg_info, 


static void vfio_ap_mdev_hot_plug_cfg(struct ap_matrix_mdev *matrix_mdev)

{

	bool do_hotplug = false;

	int filter_domains = 0;

	int filter_adapters = 0;

	DECLARE_BITMAP(apm, AP_DEVICES);

	DECLARE_BITMAP(aqm, AP_DOMAINS);

	bool filter_domains, filter_adapters, filter_cdoms, do_hotplug = false;



	mutex_lock(&matrix_mdev->kvm->lock);

	mutex_lock(&matrix_dev->mdevs_lock);



	filter_adapters = bitmap_and(apm, matrix_mdev->matrix.apm,

	filter_adapters = bitmap_intersects(matrix_mdev->matrix.apm,

					    matrix_mdev->apm_add, AP_DEVICES);

	filter_domains = bitmap_and(aqm, matrix_mdev->matrix.aqm,

	filter_domains = bitmap_intersects(matrix_mdev->matrix.aqm,

					   matrix_mdev->aqm_add, AP_DOMAINS);

	filter_cdoms = bitmap_intersects(matrix_mdev->matrix.adm,

					 matrix_mdev->adm_add, AP_DOMAINS);



	if (filter_adapters && filter_domains)

		do_hotplug |= vfio_ap_mdev_filter_matrix(apm, aqm, matrix_mdev);

	else if (filter_adapters)

		do_hotplug |=

			vfio_ap_mdev_filter_matrix(apm,

						   matrix_mdev->shadow_apcb.aqm,

						   matrix_mdev);

	else

		do_hotplug |=

			vfio_ap_mdev_filter_matrix(matrix_mdev->shadow_apcb.apm,

						   aqm, matrix_mdev);

	if (filter_adapters || filter_domains)

		do_hotplug = vfio_ap_mdev_filter_matrix(matrix_mdev);



	if (bitmap_intersects(matrix_mdev->matrix.adm, matrix_mdev->adm_add,

			      AP_DOMAINS))

	if (filter_cdoms)

		do_hotplug |= vfio_ap_mdev_filter_cdoms(matrix_mdev);



	if (do_hotplug)