Commit b6d6a307 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'vfio-v4.19-rc1' of git://github.com/awilliam/linux-vfio

Pull VFIO updates from Alex Williamson:

 - mark switch fall-through cases (Gustavo A. R. Silva)

 - disable binding SR-IOV enabled PFs (Alex Williamson)

* tag 'vfio-v4.19-rc1' of git://github.com/awilliam/linux-vfio:
  vfio-pci: Disable binding to PFs with SR-IOV enabled
  vfio: Mark expected switch fall-throughs
parents d01e12dd 0dd0e297
...@@ -789,7 +789,7 @@ static long vfio_pci_ioctl(void *device_data, ...@@ -789,7 +789,7 @@ static long vfio_pci_ioctl(void *device_data,
case VFIO_PCI_ERR_IRQ_INDEX: case VFIO_PCI_ERR_IRQ_INDEX:
if (pci_is_pcie(vdev->pdev)) if (pci_is_pcie(vdev->pdev))
break; break;
/* pass thru to return error */ /* fall through */
default: default:
return -EINVAL; return -EINVAL;
} }
...@@ -1192,6 +1192,19 @@ static int vfio_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) ...@@ -1192,6 +1192,19 @@ static int vfio_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
if (pdev->hdr_type != PCI_HEADER_TYPE_NORMAL) if (pdev->hdr_type != PCI_HEADER_TYPE_NORMAL)
return -EINVAL; return -EINVAL;
/*
* Prevent binding to PFs with VFs enabled, this too easily allows
* userspace instance with VFs and PFs from the same device, which
* cannot work. Disabling SR-IOV here would initiate removing the
* VFs, which would unbind the driver, which is prone to blocking
* if that VF is also in use by vfio-pci. Just reject these PFs
* and let the user sort it out.
*/
if (pci_num_vf(pdev)) {
pci_warn(pdev, "Cannot bind to PF with SR-IOV enabled\n");
return -EBUSY;
}
group = vfio_iommu_group_get(&pdev->dev); group = vfio_iommu_group_get(&pdev->dev);
if (!group) if (!group)
return -EINVAL; return -EINVAL;
......
...@@ -1601,6 +1601,7 @@ static void *vfio_iommu_type1_open(unsigned long arg) ...@@ -1601,6 +1601,7 @@ static void *vfio_iommu_type1_open(unsigned long arg)
break; break;
case VFIO_TYPE1_NESTING_IOMMU: case VFIO_TYPE1_NESTING_IOMMU:
iommu->nesting = true; iommu->nesting = true;
/* fall through */
case VFIO_TYPE1v2_IOMMU: case VFIO_TYPE1v2_IOMMU:
iommu->v2 = true; iommu->v2 = true;
break; break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment