tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds f2c6b9e4 95b46aeb

+6 -5
+2 -1
drivers/vfio/pci/vfio_pci_config.c
··· 749 749 if (pci_write_vpd(pdev, addr & ~PCI_VPD_ADDR_F, 4, &data) != 4) 750 750 return count; 751 751 } else { 752 - if (pci_read_vpd(pdev, addr, 4, &data) != 4) 752 + data = 0; 753 + if (pci_read_vpd(pdev, addr, 4, &data) < 0) 753 754 return count; 754 755 *pdata = cpu_to_le32(data); 755 756 }
+3 -3
drivers/vfio/pci/vfio_pci_intrs.c
··· 228 228 229 229 static void vfio_intx_disable(struct vfio_pci_device *vdev) 230 230 { 231 - vfio_intx_set_signal(vdev, -1); 232 231 vfio_virqfd_disable(&vdev->ctx[0].unmask); 233 232 vfio_virqfd_disable(&vdev->ctx[0].mask); 233 + vfio_intx_set_signal(vdev, -1); 234 234 vdev->irq_type = VFIO_PCI_NUM_IRQS; 235 235 vdev->num_ctx = 0; 236 236 kfree(vdev->ctx); ··· 401 401 struct pci_dev *pdev = vdev->pdev; 402 402 int i; 403 403 404 - vfio_msi_set_block(vdev, 0, vdev->num_ctx, NULL, msix); 405 - 406 404 for (i = 0; i < vdev->num_ctx; i++) { 407 405 vfio_virqfd_disable(&vdev->ctx[i].unmask); 408 406 vfio_virqfd_disable(&vdev->ctx[i].mask); 409 407 } 408 + 409 + vfio_msi_set_block(vdev, 0, vdev->num_ctx, NULL, msix); 410 410 411 411 if (msix) { 412 412 pci_disable_msix(vdev->pdev);
+1 -1
drivers/vfio/vfio_iommu_type1.c
··· 515 515 unsigned long pfn, long npage, int prot) 516 516 { 517 517 long i; 518 - int ret; 518 + int ret = 0; 519 519 520 520 for (i = 0; i < npage; i++, pfn++, iova += PAGE_SIZE) { 521 521 ret = iommu_map(domain->domain, iova,