提交 a748f9ea 编写于 作者: K Kunkun Jiang 提交者: Zheng Zengkai

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: NKunkun Jiang <jiangkunkun@huawei.com>
Reviewed-by: NKeqian Zhu <zhukeqian1@huawei.com>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
上级 80a7ad6e
...@@ -557,12 +557,8 @@ static int vfio_pci_dma_fault_init(struct vfio_pci_device *vdev) ...@@ -557,12 +557,8 @@ static int vfio_pci_dma_fault_init(struct vfio_pci_device *vdev)
return 0; return 0;
ret = iommu_domain_get_attr(domain, DOMAIN_ATTR_NESTING, &nested); ret = iommu_domain_get_attr(domain, DOMAIN_ATTR_NESTING, &nested);
if (ret || !nested) { if (ret || !nested)
if (ret) return ret;
pr_warn("%s: Get DOMAIN_ATTR_NESTING failed: %d.\n",
__func__, ret);
return 0;
}
mutex_init(&vdev->fault_queue_lock); mutex_init(&vdev->fault_queue_lock);
...@@ -651,12 +647,8 @@ static int vfio_pci_dma_fault_response_init(struct vfio_pci_device *vdev) ...@@ -651,12 +647,8 @@ static int vfio_pci_dma_fault_response_init(struct vfio_pci_device *vdev)
return 0; return 0;
ret = iommu_domain_get_attr(domain, DOMAIN_ATTR_NESTING, &nested); ret = iommu_domain_get_attr(domain, DOMAIN_ATTR_NESTING, &nested);
if (ret || !nested) { if (ret || !nested)
if (ret) return ret;
pr_warn("%s: Get DOMAIN_ATTR_NESTING failed: %d.\n",
__func__, ret);
return 0;
}
mutex_init(&vdev->fault_response_queue_lock); mutex_init(&vdev->fault_response_queue_lock);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册