Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1651816
| From | Xiaoguang Chen <xiaoguang.chen@intel.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH v6 1/6] drm/i915/gvt: Extend the GVT-g architecture to support vfio device region |
| Date | 2017-05-27 10:50 +0200 |
| Message-ID | <tLFA6-QN-17@gated-at.bofh.it> (permalink) |
| References | <tLFA5-QN-3@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
Signed-off-by: Xiaoguang Chen <xiaoguang.chen@intel.com>
---
drivers/gpu/drm/i915/gvt/kvmgt.c | 21 ++++++++++++++++++---
1 file changed, 18 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/i915/gvt/kvmgt.c b/drivers/gpu/drm/i915/gvt/kvmgt.c
index 1ae0b40..3c6a02b 100644
--- a/drivers/gpu/drm/i915/gvt/kvmgt.c
+++ b/drivers/gpu/drm/i915/gvt/kvmgt.c
@@ -53,11 +53,21 @@ static const struct intel_gvt_ops *intel_gvt_ops;
#define VFIO_PCI_INDEX_TO_OFFSET(index) ((u64)(index) << VFIO_PCI_OFFSET_SHIFT)
#define VFIO_PCI_OFFSET_MASK (((u64)(1) << VFIO_PCI_OFFSET_SHIFT) - 1)
+struct vfio_region;
+struct intel_vgpu_regops {
+ size_t (*rw)(struct intel_vgpu *vgpu, char *buf,
+ size_t count, loff_t *ppos, bool iswrite);
+ void (*release)(struct intel_vgpu *vgpu,
+ struct vfio_region *region);
+};
+
struct vfio_region {
u32 type;
u32 subtype;
size_t size;
u32 flags;
+ const struct intel_vgpu_regops *ops;
+ void *data;
};
struct kvmgt_pgfn {
@@ -642,7 +652,7 @@ static ssize_t intel_vgpu_rw(struct mdev_device *mdev, char *buf,
int ret = -EINVAL;
- if (index >= VFIO_PCI_NUM_REGIONS) {
+ if (index >= VFIO_PCI_NUM_REGIONS + vgpu->vdev.num_regions) {
gvt_vgpu_err("invalid index: %u\n", index);
return -EINVAL;
}
@@ -676,8 +686,11 @@ static ssize_t intel_vgpu_rw(struct mdev_device *mdev, char *buf,
case VFIO_PCI_BAR5_REGION_INDEX:
case VFIO_PCI_VGA_REGION_INDEX:
case VFIO_PCI_ROM_REGION_INDEX:
+ break;
default:
- gvt_vgpu_err("unsupported region: %u\n", index);
+ index -= VFIO_PCI_NUM_REGIONS;
+ return vgpu->vdev.region[index].ops->rw(vgpu, buf, count,
+ ppos, is_write);
}
return ret == 0 ? count : ret;
@@ -940,7 +953,8 @@ static long intel_vgpu_ioctl(struct mdev_device *mdev, unsigned int cmd,
info.flags = VFIO_DEVICE_FLAGS_PCI;
info.flags |= VFIO_DEVICE_FLAGS_RESET;
- info.num_regions = VFIO_PCI_NUM_REGIONS;
+ info.num_regions = VFIO_PCI_NUM_REGIONS +
+ vgpu->vdev.num_regions;
info.num_irqs = VFIO_PCI_NUM_IRQS;
return copy_to_user((void __user *)arg, &info, minsz) ?
@@ -1061,6 +1075,7 @@ static long intel_vgpu_ioctl(struct mdev_device *mdev, unsigned int cmd,
}
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;
--
2.7.4
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH v6 0/6] drm/i915/gvt: Dma-buf support for GVT-g Xiaoguang Chen <xiaoguang.chen@intel.com> - 2017-05-27 10:50 +0200
[PATCH v6 2/6] drm/i915/gvt: OpRegion support for GVT-g Xiaoguang Chen <xiaoguang.chen@intel.com> - 2017-05-27 10:50 +0200
Re: [PATCH v6 2/6] drm/i915/gvt: OpRegion support for GVT-g Zhenyu Wang <zhenyuw@linux.intel.com> - 2017-05-31 07:00 +0200
RE: [PATCH v6 2/6] drm/i915/gvt: OpRegion support for GVT-g "Chen, Xiaoguang" <xiaoguang.chen@intel.com> - 2017-05-31 08:30 +0200
Re: [PATCH v6 2/6] drm/i915/gvt: OpRegion support for GVT-g Zhenyu Wang <zhenyuw@linux.intel.com> - 2017-05-31 08:40 +0200
RE: [PATCH v6 2/6] drm/i915/gvt: OpRegion support for GVT-g "Chen, Xiaoguang" <xiaoguang.chen@intel.com> - 2017-05-31 08:50 +0200
[PATCH v6 5/6] drm/i915/gvt: Dmabuf support for GVT-g Xiaoguang Chen <xiaoguang.chen@intel.com> - 2017-05-27 10:50 +0200
Re: [PATCH v6 5/6] drm/i915/gvt: Dmabuf support for GVT-g Gerd Hoffmann <kraxel@redhat.com> - 2017-05-31 14:10 +0200
RE: [PATCH v6 5/6] drm/i915/gvt: Dmabuf support for GVT-g "Chen, Xiaoguang" <xiaoguang.chen@intel.com> - 2017-06-01 05:10 +0200
Re: [PATCH v6 5/6] drm/i915/gvt: Dmabuf support for GVT-g Chris Wilson <chris@chris-wilson.co.uk> - 2017-06-01 11:20 +0200
[PATCH v6 1/6] drm/i915/gvt: Extend the GVT-g architecture to support vfio device region Xiaoguang Chen <xiaoguang.chen@intel.com> - 2017-05-27 10:50 +0200
[PATCH v6 4/6] vfio: Define vfio based vgpu's dma-buf operations Xiaoguang Chen <xiaoguang.chen@intel.com> - 2017-05-27 10:50 +0200
Re: [PATCH v6 4/6] vfio: Define vfio based vgpu's dma-buf operations Gerd Hoffmann <kraxel@redhat.com> - 2017-05-29 09:30 +0200
RE: [PATCH v6 4/6] vfio: Define vfio based vgpu's dma-buf operations "Chen, Xiaoguang" <xiaoguang.chen@intel.com> - 2017-05-31 08:20 +0200
Re: [PATCH v6 4/6] vfio: Define vfio based vgpu's dma-buf operations Kirti Wankhede <kwankhede@nvidia.com> - 2017-05-31 19:30 +0200
RE: [PATCH v6 4/6] vfio: Define vfio based vgpu's dma-buf operations "Chen, Xiaoguang" <xiaoguang.chen@intel.com> - 2017-06-01 05:10 +0200
Re: [PATCH v6 4/6] vfio: Define vfio based vgpu's dma-buf operations Alex Williamson <alex.williamson@redhat.com> - 2017-06-01 18:40 +0200
Re: [PATCH v6 4/6] vfio: Define vfio based vgpu's dma-buf operations Kirti Wankhede <kwankhede@nvidia.com> - 2017-06-01 20:50 +0200
Re: [PATCH v6 4/6] vfio: Define vfio based vgpu's dma-buf operations Gerd Hoffmann <kraxel@redhat.com> - 2017-06-02 10:40 +0200
Re: [PATCH v6 4/6] vfio: Define vfio based vgpu's dma-buf operations Kirti Wankhede <kwankhede@nvidia.com> - 2017-06-05 10:30 +0200
Re: [PATCH v6 4/6] vfio: Define vfio based vgpu's dma-buf operations Gerd Hoffmann <kraxel@redhat.com> - 2017-06-06 10:00 +0200
Re: [PATCH v6 0/6] drm/i915/gvt: Dma-buf support for GVT-g Gerd Hoffmann <kraxel@redhat.com> - 2017-05-30 12:30 +0200
RE: [PATCH v6 0/6] drm/i915/gvt: Dma-buf support for GVT-g "Chen, Xiaoguang" <xiaoguang.chen@intel.com> - 2017-05-31 04:30 +0200
Re: [PATCH v6 0/6] drm/i915/gvt: Dma-buf support for GVT-g Gerd Hoffmann <kraxel@redhat.com> - 2017-05-31 11:00 +0200
RE: [PATCH v6 0/6] drm/i915/gvt: Dma-buf support for GVT-g "Chen, Xiaoguang" <xiaoguang.chen@intel.com> - 2017-05-31 11:10 +0200
csiph-web