Commit fe67d39d authored by Kunkun Jiang's avatar Kunkun Jiang Committed by Zheng Zengkai
Browse files

Revert "vfio/pci: Fix wrong return value when get iommu attribute DOMAIN_ATTR_NESTING" 

virt inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I61SPO


CVE: NA

--------------------------------

This reverts commit 22f7a4bf.

Signed-off-by: default avatarKunkun Jiang <jiangkunkun@huawei.com>
Reviewed-by: default avatarKeqian Zhu <zhukeqian1@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 8218cb5d

drivers/vfio/pci/vfio_pci.c

+4 −12
Original line number Diff line number Diff line
@@ -557,12 +557,8 @@ static int vfio_pci_dma_fault_init(struct vfio_pci_device *vdev) 
		return 0;



	ret = iommu_domain_get_attr(domain, DOMAIN_ATTR_NESTING, &nested);

	if (ret || !nested) {

		if (ret)

			pr_warn("%s: Get DOMAIN_ATTR_NESTING failed: %d.\n",

				__func__, ret);

		return 0;

	}

	if (ret || !nested)

		return ret;



	mutex_init(&vdev->fault_queue_lock);
@@ -651,12 +647,8 @@ static int vfio_pci_dma_fault_response_init(struct vfio_pci_device *vdev) 
		return 0;



	ret = iommu_domain_get_attr(domain, DOMAIN_ATTR_NESTING, &nested);

	if (ret || !nested) {

		if (ret)

			pr_warn("%s: Get DOMAIN_ATTR_NESTING failed: %d.\n",

				__func__, ret);

		return 0;

	}

	if (ret || !nested)

		return ret;



	mutex_init(&vdev->fault_response_queue_lock);