[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20200413055532.27363-1-yan.y.zhao@intel.com>
Date: Mon, 13 Apr 2020 01:55:32 -0400
From: Yan Zhao <yan.y.zhao@...el.com>
To: intel-gvt-dev@...ts.freedesktop.org
Cc: libvir-list@...hat.com, kvm@...r.kernel.org,
linux-doc@...r.kernel.org, linux-kernel@...r.kernel.org,
aik@...abs.ru, Zhengxiao.zx@...baba-inc.com,
shuangtai.tst@...baba-inc.com, qemu-devel@...gnu.org,
eauger@...hat.com, yi.l.liu@...el.com, xin.zeng@...el.com,
ziye.yang@...el.com, mlevitsk@...hat.com, pasic@...ux.ibm.com,
felipe@...anix.com, changpeng.liu@...el.com, Ken.Xue@....com,
jonathan.davies@...anix.com, shaopeng.he@...el.com,
alex.williamson@...hat.com, eskultet@...hat.com,
dgilbert@...hat.com, cohuck@...hat.com, kevin.tian@...el.com,
zhenyuw@...ux.intel.com, zhi.a.wang@...el.com, cjia@...dia.com,
kwankhede@...dia.com, berrange@...hat.com, dinechin@...hat.com,
corbet@....net, Yan Zhao <yan.y.zhao@...el.com>
Subject: [PATCH v5 4/4] drm/i915/gvt: export migration_version to mdev sysfs (under mdev device node)
mdev device par of migration_version attribute for Intel vGPU is rw.
It is located at
/sys/bus/pci/devices/0000\:00\:02.0/$mdev_UUID/migration_version,
or /sys/bus/mdev/devices/$mdev_UUID/migration_version
It's used to check migration compatibility for two vGPUs.
migration_version string is defined by vendor driver and opaque to
userspace.
For Intel vGPU of gen8 and gen9, the format of migration_version string
is:
<vendor id>-<device id>-<vgpu type>-<software version>.
For future software versions, e.g. when vGPUs have aggregations, it may
also include aggregation count into migration_version string of a vGPU.
For future platforms, the format of migration_version string is to be
expanded to include more meta data to identify Intel vGPUs for live
migration compatibility check
For old platforms, and for GVT not supporting vGPU live migration
feature, -ENODEV is returned on read(2)/write(2) of migration_version
attribute.
For vGPUs running old GVT who do not expose migration_version
attribute, live migration is regarded as not supported for those vGPUs.
Cc: Alex Williamson <alex.williamson@...hat.com>
Cc: Erik Skultety <eskultet@...hat.com>
Cc: "Dr. David Alan Gilbert" <dgilbert@...hat.com>
Cc: Cornelia Huck <cohuck@...hat.com>
Cc: "Tian, Kevin" <kevin.tian@...el.com>
Cc: Zhenyu Wang <zhenyuw@...ux.intel.com>
Cc: "Wang, Zhi A" <zhi.a.wang@...el.com>
c: Neo Jia <cjia@...dia.com>
Cc: Kirti Wankhede <kwankhede@...dia.com>
Signed-off-by: Yan Zhao <yan.y.zhao@...el.com>
---
drivers/gpu/drm/i915/gvt/gvt.h | 2 ++
drivers/gpu/drm/i915/gvt/kvmgt.c | 55 ++++++++++++++++++++++++++++++++
2 files changed, 57 insertions(+)
diff --git a/drivers/gpu/drm/i915/gvt/gvt.h b/drivers/gpu/drm/i915/gvt/gvt.h
index b26e42596565..664efc83f82e 100644
--- a/drivers/gpu/drm/i915/gvt/gvt.h
+++ b/drivers/gpu/drm/i915/gvt/gvt.h
@@ -205,6 +205,8 @@ struct intel_vgpu {
struct idr object_idr;
u32 scan_nonprivbb;
+
+ char *migration_version;
};
static inline void *intel_vgpu_vdev(struct intel_vgpu *vgpu)
diff --git a/drivers/gpu/drm/i915/gvt/kvmgt.c b/drivers/gpu/drm/i915/gvt/kvmgt.c
index 2f2d4c40f966..4903599cb0ef 100644
--- a/drivers/gpu/drm/i915/gvt/kvmgt.c
+++ b/drivers/gpu/drm/i915/gvt/kvmgt.c
@@ -728,8 +728,13 @@ static int intel_vgpu_create(struct kobject *kobj, struct mdev_device *mdev)
kvmgt_vdev(vgpu)->mdev = mdev;
mdev_set_drvdata(mdev, vgpu);
+ vgpu->migration_version =
+ intel_gvt_get_vfio_migration_version(gvt, type->name);
+
gvt_dbg_core("intel_vgpu_create succeeded for mdev: %s\n",
dev_name(mdev_dev(mdev)));
+
+
ret = 0;
out:
@@ -744,6 +749,7 @@ static int intel_vgpu_remove(struct mdev_device *mdev)
return -EBUSY;
intel_gvt_ops->vgpu_destroy(vgpu);
+ kfree(vgpu->migration_version);
return 0;
}
@@ -1964,8 +1970,57 @@ static const struct attribute_group intel_vgpu_group = {
.attrs = intel_vgpu_attrs,
};
+static ssize_t migration_version_show(struct device *dev,
+ struct device_attribute *attr, char *buf)
+{
+ struct mdev_device *mdev = mdev_from_dev(dev);
+ struct intel_vgpu *vgpu = mdev_get_drvdata(mdev);
+
+ if (!vgpu->migration_version) {
+ gvt_vgpu_err("Migration not supported on this vgpu. Please search previous detailed log\n");
+ return -ENODEV;
+ }
+
+ return snprintf(buf, strlen(vgpu->migration_version) + 2,
+ "%s\n", vgpu->migration_version);
+
+}
+
+static ssize_t migration_version_store(struct device *dev,
+ struct device_attribute *attr,
+ const char *buf, size_t count)
+{
+ struct mdev_device *mdev = mdev_from_dev(dev);
+ struct intel_vgpu *vgpu = mdev_get_drvdata(mdev);
+ struct intel_gvt *gvt = vgpu->gvt;
+ int ret = 0;
+
+ if (!vgpu->migration_version) {
+ gvt_vgpu_err("Migration not supported on this vgpu. Please search previous detailed log\n");
+ return -ENODEV;
+ }
+
+ ret = intel_gvt_check_vfio_migration_version(gvt,
+ vgpu->migration_version, buf);
+ return (ret < 0 ? ret : count);
+}
+
+static DEVICE_ATTR_RW(migration_version);
+
+static struct attribute *intel_vgpu_migration_attrs[] = {
+ &dev_attr_migration_version.attr,
+ NULL,
+};
+/* this group has no name, so will be displayed
+ * immediately under sysfs node of the mdev device
+ */
+static const struct attribute_group intel_vgpu_group_empty_name = {
+ .attrs = intel_vgpu_migration_attrs,
+};
+
static const struct attribute_group *intel_vgpu_groups[] = {
&intel_vgpu_group,
+ &intel_vgpu_group_empty_name,
NULL,
};
--
2.17.1
Powered by blists - more mailing lists