Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2c6b9e4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'vfio-v4.7-rc2' of git://github.com/awilliam/linux-vfio 

Pull VFIO fixes from Alex Williamson:
 "Fix irqfd shutdown ordering, build warning, and VPD short read"

* tag 'vfio-v4.7-rc2' of git://github.com/awilliam/linux-vfio:
  vfio/pci: Allow VPD short read
  vfio/type1: Fix build warning
  vfio/pci: Fix ordering of eventfd vs virqfd shutdown
parents 95b46aeb ce7585f3

drivers/vfio/pci/vfio_pci_config.c

+2 −1
Original line number Diff line number Diff line
@@ -749,7 +749,8 @@ static int vfio_vpd_config_write(struct vfio_pci_device *vdev, int pos, 
		if (pci_write_vpd(pdev, addr & ~PCI_VPD_ADDR_F, 4, &data) != 4)

			return count;

	} else {

		if (pci_read_vpd(pdev, addr, 4, &data) != 4)

		data = 0;

		if (pci_read_vpd(pdev, addr, 4, &data) < 0)

			return count;

		*pdata = cpu_to_le32(data);

	}

drivers/vfio/pci/vfio_pci_intrs.c

+3 −3
Original line number Diff line number Diff line
@@ -228,9 +228,9 @@ static int vfio_intx_set_signal(struct vfio_pci_device *vdev, int fd) 


static void vfio_intx_disable(struct vfio_pci_device *vdev)

{

	vfio_intx_set_signal(vdev, -1);

	vfio_virqfd_disable(&vdev->ctx[0].unmask);

	vfio_virqfd_disable(&vdev->ctx[0].mask);

	vfio_intx_set_signal(vdev, -1);

	vdev->irq_type = VFIO_PCI_NUM_IRQS;

	vdev->num_ctx = 0;

	kfree(vdev->ctx);
@@ -401,13 +401,13 @@ static void vfio_msi_disable(struct vfio_pci_device *vdev, bool msix) 
	struct pci_dev *pdev = vdev->pdev;

	int i;



	vfio_msi_set_block(vdev, 0, vdev->num_ctx, NULL, msix);



	for (i = 0; i < vdev->num_ctx; i++) {

		vfio_virqfd_disable(&vdev->ctx[i].unmask);

		vfio_virqfd_disable(&vdev->ctx[i].mask);

	}



	vfio_msi_set_block(vdev, 0, vdev->num_ctx, NULL, msix);



	if (msix) {

		pci_disable_msix(vdev->pdev);

		kfree(vdev->msix);

drivers/vfio/vfio_iommu_type1.c

+1 −1
Original line number Diff line number Diff line
@@ -515,7 +515,7 @@ static int map_try_harder(struct vfio_domain *domain, dma_addr_t iova, 
			  unsigned long pfn, long npage, int prot)

{

	long i;

	int ret;

	int ret = 0;



	for (i = 0; i < npage; i++, pfn++, iova += PAGE_SIZE) {

		ret = iommu_map(domain->domain, iova,