From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 17 Mar 2016 20:05:09 +0000 (-0700)
Subject: Merge tag 'vfio-v4.6-rc1' of git://github.com/awilliam/linux-vfio
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=45cb5230f862d10209b83e488b20916555d70c55;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

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

Pull VFIO updates from Alex Williamson:
 "Various enablers for assignment of Intel graphics devices and future
  support of vGPU devices (Alex Williamson).  This includes

   - Handling the vfio type1 interface as an API rather than a specific
     implementation, allowing multiple type1 providers.

   - Capability chains, similar to PCI device capabilities, that allow
     extending ioctls.  Extensions here include device specific regions
     and sparse mmap descriptions.  The former is used to expose non-PCI
     regions for IGD, including the OpRegion (particularly the Video
     BIOS Table), and read only PCI config access to the host and LPC
     bridge as drivers often depend on identifying those devices.

     Sparse mmaps here are used to describe the MSIx vector table, which
     vfio has always protected from mmap, but never had an API to
     explicitly define that protection.  In future vGPU support this is
     expected to allow the description of PCI BARs that may mix direct
     access and emulated access within a single region.

   - The ability to expose the shadow ROM as an option ROM as IGD use
     cases may rely on the ROM even though the physical device does not
     make use of a PCI option ROM BAR"

* tag 'vfio-v4.6-rc1' of git://github.com/awilliam/linux-vfio:
  vfio/pci: return -EFAULT if copy_to_user fails
  vfio/pci: Expose shadow ROM as PCI option ROM
  vfio/pci: Intel IGD host and LCP bridge config space access
  vfio/pci: Intel IGD OpRegion support
  vfio/pci: Enable virtual register in PCI config space
  vfio/pci: Add infrastructure for additional device specific regions
  vfio: Define device specific region type capability
  vfio/pci: Include sparse mmap capability for MSI-X table regions
  vfio: Define sparse mmap capability for regions
  vfio: Add capability chain helpers
  vfio: Define capability chains
  vfio: If an IOMMU backend fails, keep looking
  vfio/pci: Fix unsigned comparison overflow
---

45cb5230f862d10209b83e488b20916555d70c55
diff --cc drivers/vfio/pci/vfio_pci.c
index 8c80a48e3233,98059df9cff6..712a84978e97
--- a/drivers/vfio/pci/vfio_pci.c
+++ b/drivers/vfio/pci/vfio_pci.c
@@@ -443,11 -551,10 +551,11 @@@ static long vfio_pci_ioctl(void *device
  		if (vdev->reset_works)
  			info.flags |= VFIO_DEVICE_FLAGS_RESET;
  
- 		info.num_regions = VFIO_PCI_NUM_REGIONS;
+ 		info.num_regions = VFIO_PCI_NUM_REGIONS + vdev->num_regions;
  		info.num_irqs = VFIO_PCI_NUM_IRQS;
  
 -		return copy_to_user((void __user *)arg, &info, minsz);
 +		return copy_to_user((void __user *)arg, &info, minsz) ?
 +			-EFAULT : 0;
  
  	} else if (cmd == VFIO_DEVICE_GET_REGION_INFO) {
  		struct pci_dev *pdev = vdev->pdev;
@@@ -518,11 -640,43 +641,44 @@@
  
  			break;
  		default:
- 			return -EINVAL;
+ 			if (info.index >=
+ 			    VFIO_PCI_NUM_REGIONS + vdev->num_regions)
+ 				return -EINVAL;
+ 
+ 			i = info.index - VFIO_PCI_NUM_REGIONS;
+ 
+ 			info.offset = VFIO_PCI_INDEX_TO_OFFSET(info.index);
+ 			info.size = vdev->region[i].size;
+ 			info.flags = vdev->region[i].flags;
+ 
+ 			ret = region_type_cap(vdev, &caps,
+ 					      vdev->region[i].type,
+ 					      vdev->region[i].subtype);
+ 			if (ret)
+ 				return ret;
+ 		}
+ 
+ 		if (caps.size) {
+ 			info.flags |= VFIO_REGION_INFO_FLAG_CAPS;
+ 			if (info.argsz < sizeof(info) + caps.size) {
+ 				info.argsz = sizeof(info) + caps.size;
+ 				info.cap_offset = 0;
+ 			} else {
+ 				vfio_info_cap_shift(&caps, sizeof(info));
+ 				if (copy_to_user((void __user *)arg +
+ 						  sizeof(info), caps.buf,
+ 						  caps.size)) {
+ 					kfree(caps.buf);
+ 					return -EFAULT;
+ 				}
+ 				info.cap_offset = sizeof(info);
+ 			}
+ 
+ 			kfree(caps.buf);
  		}
  
 -		return copy_to_user((void __user *)arg, &info, minsz);
 +		return copy_to_user((void __user *)arg, &info, minsz) ?
 +			-EFAULT : 0;
  
  	} else if (cmd == VFIO_DEVICE_GET_IRQ_INFO) {
  		struct vfio_irq_info info;