From: Xiaoguang Chen <xiaoguang.chen@intel.com>
To: kraxel@redhat.com, alex.williamson@redhat.com,
intel-gfx@lists.freedesktop.org,
intel-gvt-dev@lists.freedesktop.org, zhi.a.wang@intel.com,
zhenyuw@linux.intel.com, linux-kernel@vger.kernel.org,
zhiyuan.lv@intel.com, kevin.tian@intel.com
Cc: Xiaoguang Chen <xiaoguang.chen@intel.com>
Subject: [RFC PATCH 1/6] drm/i915/gvt: extend the GVT-g architecture to support vfio device region
Date: Fri, 28 Apr 2017 17:35:25 +0800 [thread overview]
Message-ID: <1493372130-27727-2-git-send-email-xiaoguang.chen@intel.com> (raw)
In-Reply-To: <1493372130-27727-1-git-send-email-xiaoguang.chen@intel.com>
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 @@
#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;
--
1.9.1
next prev parent reply other threads:[~2017-04-28 9:40 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-28 9:35 [RFC PATCH 0/6] drm/i915/gvt: dma-buf support for GVT-g Xiaoguang Chen
2017-04-28 9:35 ` Xiaoguang Chen [this message]
2017-04-28 9:35 ` [RFC PATCH 2/6] drm/i915/gvt: OpRegion " Xiaoguang Chen
2017-04-28 9:35 ` [RFC PATCH 3/6] drm/i915/gvt: framebuffer decoder " Xiaoguang Chen
2017-04-28 9:35 ` [RFC PATCH 4/6] drm/i915: export i915 dmabuf_ops Xiaoguang Chen
2017-04-28 9:35 ` [RFC PATCH 5/6] drm/i915/gvt: dmabuf support for GVT-g Xiaoguang Chen
2017-04-28 10:08 ` [Intel-gfx] " Chris Wilson
2017-05-02 7:40 ` Chen, Xiaoguang
2017-05-04 3:12 ` Chen, Xiaoguang
2017-05-02 9:37 ` Gerd Hoffmann
2017-04-28 9:35 ` [RFC PATCH 6/6] drm/i915/gvt: support QEMU getting the dmabuf Xiaoguang Chen
2017-05-02 9:50 ` Gerd Hoffmann
2017-05-03 1:39 ` Chen, Xiaoguang
2017-05-04 3:09 ` Chen, Xiaoguang
2017-05-04 16:08 ` Alex Williamson
2017-05-05 6:55 ` Gerd Hoffmann
2017-05-05 15:11 ` Alex Williamson
2017-05-11 8:45 ` Chen, Xiaoguang
2017-05-11 13:27 ` Gerd Hoffmann
2017-05-11 15:45 ` Alex Williamson
2017-05-12 2:12 ` Chen, Xiaoguang
2017-05-12 2:58 ` Alex Williamson
2017-05-12 3:52 ` Chen, Xiaoguang
2017-05-12 9:12 ` Gerd Hoffmann
2017-05-12 16:38 ` Alex Williamson
2017-05-15 3:36 ` Chen, Xiaoguang
2017-05-15 17:44 ` Alex Williamson
2017-05-16 10:16 ` Chen, Xiaoguang
2017-05-17 21:43 ` Alex Williamson
2017-05-18 1:51 ` Chen, Xiaoguang
2017-05-18 14:56 ` Alex Williamson
2017-05-19 6:23 ` Chen, Xiaoguang
2017-05-19 8:04 ` Gerd Hoffmann
2017-05-19 8:17 ` Chen, Xiaoguang
2017-05-19 8:57 ` Gerd Hoffmann
2017-05-19 9:14 ` Chen, Xiaoguang
2017-05-19 10:51 ` Gerd Hoffmann
2017-05-18 6:22 ` Gerd Hoffmann
2017-05-12 6:56 ` Chen, Xiaoguang
2017-05-12 17:04 ` Alex Williamson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1493372130-27727-2-git-send-email-xiaoguang.chen@intel.com \
--to=xiaoguang.chen@intel.com \
--cc=alex.williamson@redhat.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=intel-gvt-dev@lists.freedesktop.org \
--cc=kevin.tian@intel.com \
--cc=kraxel@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=zhenyuw@linux.intel.com \
--cc=zhi.a.wang@intel.com \
--cc=zhiyuan.lv@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).