Commit 3491aa04 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'vfio-v6.15-rc1' of https://github.com/awilliam/linux-vfio 

Pull VFIO updates from Alex Williamson:

 - Relax IGD support code to match display class device rather than
   specifically requiring a VGA device (Tomita Moeko)

 - Accelerate DMA mapping of device MMIO by iterating at PMD and PUD
   levels to take advantage of huge pfnmap support added in v6.12
   (Alex Williamson)

 - Extend virtio vfio-pci variant driver to include migration support
   for block devices where enabled by the PF (Yishai Hadas)

 - Virtualize INTx PIN register for devices where the platform does not
   route legacy PCI interrupts for the device and the interrupt is
   reported as IRQ_NOTCONNECTED (Alex Williamson)

* tag 'vfio-v6.15-rc1' of https://github.com/awilliam/linux-vfio:
  vfio/pci: Handle INTx IRQ_NOTCONNECTED
  vfio/virtio: Enable support for virtio-block live migration
  vfio/type1: Use mapping page mask for pfnmaps
  mm: Provide address mask in struct follow_pfnmap_args
  vfio/type1: Use consistent types for page counts
  vfio/type1: Use vfio_batch for vaddr_get_pfns()
  vfio/type1: Convert all vaddr_get_pfns() callers to use vfio_batch
  vfio/type1: Catch zero from pin_user_pages_remote()
  vfio/pci: match IGD devices in display controller class
parents 4b98d5dc 860be250

drivers/vfio/pci/vfio_pci.c

+1 −3
Original line number Diff line number Diff line
@@ -111,9 +111,7 @@ static int vfio_pci_open_device(struct vfio_device *core_vdev) 
	if (ret)

		return ret;



	if (vfio_pci_is_vga(pdev) &&

	    pdev->vendor == PCI_VENDOR_ID_INTEL &&

	    IS_ENABLED(CONFIG_VFIO_PCI_IGD)) {

	if (vfio_pci_is_intel_display(pdev)) {

		ret = vfio_pci_igd_init(vdev);

		if (ret && ret != -ENODEV) {

			pci_warn(pdev, "Failed to setup Intel IGD regions\n");

drivers/vfio/pci/vfio_pci_config.c

+2 −1
Original line number Diff line number Diff line
@@ -1814,7 +1814,8 @@ int vfio_config_init(struct vfio_pci_core_device *vdev) 
					cpu_to_le16(PCI_COMMAND_MEMORY);

	}



	if (!IS_ENABLED(CONFIG_VFIO_PCI_INTX) || vdev->nointx)

	if (!IS_ENABLED(CONFIG_VFIO_PCI_INTX) || vdev->nointx ||

	    vdev->pdev->irq == IRQ_NOTCONNECTED)

		vconfig[PCI_INTERRUPT_PIN] = 0;



	ret = vfio_cap_init(vdev);

drivers/vfio/pci/vfio_pci_core.c

+1 −9
Original line number Diff line number Diff line
@@ -727,15 +727,7 @@ EXPORT_SYMBOL_GPL(vfio_pci_core_finish_enable); 
static int vfio_pci_get_irq_count(struct vfio_pci_core_device *vdev, int irq_type)

{

	if (irq_type == VFIO_PCI_INTX_IRQ_INDEX) {

		u8 pin;



		if (!IS_ENABLED(CONFIG_VFIO_PCI_INTX) ||

		    vdev->nointx || vdev->pdev->is_virtfn)

			return 0;



		pci_read_config_byte(vdev->pdev, PCI_INTERRUPT_PIN, &pin);



		return pin ? 1 : 0;

		return vdev->vconfig[PCI_INTERRUPT_PIN] ? 1 : 0;

	} else if (irq_type == VFIO_PCI_MSI_IRQ_INDEX) {

		u8 pos;

		u16 flags;

drivers/vfio/pci/vfio_pci_igd.c

+6 −0
Original line number Diff line number Diff line
@@ -435,6 +435,12 @@ static int vfio_pci_igd_cfg_init(struct vfio_pci_core_device *vdev) 
	return 0;

}



bool vfio_pci_is_intel_display(struct pci_dev *pdev)

{

	return (pdev->vendor == PCI_VENDOR_ID_INTEL) &&

	       ((pdev->class >> 16) == PCI_BASE_CLASS_DISPLAY);

}



int vfio_pci_igd_init(struct vfio_pci_core_device *vdev)

{

	int ret;

drivers/vfio/pci/vfio_pci_intrs.c

+1 −1
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ static int vfio_intx_enable(struct vfio_pci_core_device *vdev, 
	if (!is_irq_none(vdev))

		return -EINVAL;



	if (!pdev->irq)

	if (!pdev->irq || pdev->irq == IRQ_NOTCONNECTED)

		return -ENODEV;



	name = kasprintf(GFP_KERNEL_ACCOUNT, "vfio-intx(%s)", pci_name(pdev));