From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.4 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED, USER_AGENT_MUTT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CAA21C04AAD for ; Mon, 6 May 2019 07:43:31 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 90705206A3 for ; Mon, 6 May 2019 07:43:31 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 90705206A3 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([127.0.0.1]:51879 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hNYHa-00043F-Ov for qemu-devel@archiver.kernel.org; Mon, 06 May 2019 03:43:30 -0400 Received: from eggs.gnu.org ([209.51.188.92]:41811) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hNYGl-0003lP-DH for qemu-devel@nongnu.org; Mon, 06 May 2019 03:42:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hNYGj-0004jD-6B for qemu-devel@nongnu.org; Mon, 06 May 2019 03:42:39 -0400 Received: from mga09.intel.com ([134.134.136.24]:39000) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hNYGh-0004fX-BL for qemu-devel@nongnu.org; Mon, 06 May 2019 03:42:35 -0400 X-Amp-Result: UNSCANNABLE X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 06 May 2019 00:42:31 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,437,1549958400"; d="asc'?scan'208";a="297412604" Received: from zhen-hp.sh.intel.com (HELO zhen-hp) ([10.239.13.116]) by orsmga004.jf.intel.com with ESMTP; 06 May 2019 00:42:26 -0700 Date: Mon, 6 May 2019 15:41:58 +0800 From: Zhenyu Wang To: "Zhao, Yan Y" Message-ID: <20190506074158.GU12913@zhen-hp.sh.intel.com> References: <20190506014514.3555-1-yan.y.zhao@intel.com> <20190506015102.3691-1-yan.y.zhao@intel.com> <20190506032032.GP12913@zhen-hp.sh.intel.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="88pBQ1/6ie/nQzMF" Content-Disposition: inline In-Reply-To: <20190506032032.GP12913@zhen-hp.sh.intel.com> User-Agent: Mutt/1.10.0 (2018-05-17) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.24 Subject: Re: [Qemu-devel] [PATCH v2 2/2] drm/i915/gvt: export mdev device version to sysfs for Intel vGPU X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Zhenyu Wang Cc: cjia@nvidia.com, kvm@vger.kernel.org, aik@ozlabs.ru, Zhengxiao.zx@alibaba-inc.com, shuangtai.tst@alibaba-inc.com, qemu-devel@nongnu.org, kwankhede@nvidia.com, eauger@redhat.com, yi.l.liu@intel.com, eskultet@redhat.com, ziye.yang@intel.com, mlevitsk@redhat.com, pasic@linux.ibm.com, libvir-list@redhat.com, arei.gonglei@huawei.com, felipe@nutanix.com, Ken.Xue@amd.com, kevin.tian@intel.com, dgilbert@redhat.com, dinechin@redhat.com, alex.williamson@redhat.com, intel-gvt-dev@lists.freedesktop.org, changpeng.liu@intel.com, cohuck@redhat.com, linux-kernel@vger.kernel.org, zhi.a.wang@intel.com, jonathan.davies@nutanix.com, shaopeng.he@intel.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" --88pBQ1/6ie/nQzMF Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On 2019.05.06 11:20:32 +0800, Zhenyu Wang wrote: > On 2019.05.05 21:51:02 -0400, Yan Zhao wrote: > > This feature implements the version attribute for Intel's vGPU mdev > > devices. > >=20 > > version attribute is rw. > > It's used to check device compatibility for two mdev devices. > > version string format and length are private for vendor driver. vendor > > driver is able to define them freely. > >=20 > > For Intel vGPU of gen8 and gen9, the mdev device version > > consists of 3 fields: "vendor id" + "device id" + "mdev type". > >=20 > > Reading from a vGPU's version attribute, a string is returned in below > > format: --. e.g. > > 8086-193b-i915-GVTg_V5_2. > >=20 > > Writing a string to a vGPU's version attribute will trigger GVT to check > > whether a vGPU identified by the written string is compatible with > > current vGPU owning this version attribute. errno is returned if the two > > vGPUs are incompatible. The length of written string is returned in > > compatible case. > >=20 > > For other platforms, and for GVT not supporting vGPU live migration > > feature, errnos are returned when read/write of mdev devices' version > > attributes. > >=20 > > For old GVT versions where no version attributes exposed in sysfs, it is > > regarded as not supporting vGPU live migration. > >=20 > > For future platforms, besides the current 2 fields in vendor proprietary > > part, more fields may be added to identify Intel vGPU well for live > > migration purpose. > >=20 > > v2: > > 1. removed 32 common part of version string > > (Alex Williamson) > > 2. do not register version attribute for GVT not supporting live > > migration.(Cornelia Huck) > > 3. for platforms out of gen8, gen9, return -EINVAL --> -ENODEV for > > incompatible. (Cornelia Huck) > >=20 > > Cc: Alex Williamson > > Cc: Erik Skultety > > Cc: "Dr. David Alan Gilbert" > > Cc: Cornelia Huck > > Cc: "Tian, Kevin" > > Cc: Zhenyu Wang > > Cc: "Wang, Zhi A" > > c: Neo Jia > > Cc: Kirti Wankhede > >=20 > > Signed-off-by: Yan Zhao > > --- > > drivers/gpu/drm/i915/gvt/Makefile | 2 +- > > drivers/gpu/drm/i915/gvt/device_version.c | 87 +++++++++++++++++++++++ > > drivers/gpu/drm/i915/gvt/gvt.c | 51 +++++++++++++ > > drivers/gpu/drm/i915/gvt/gvt.h | 6 ++ > > 4 files changed, 145 insertions(+), 1 deletion(-) > > create mode 100644 drivers/gpu/drm/i915/gvt/device_version.c > >=20 > > diff --git a/drivers/gpu/drm/i915/gvt/Makefile b/drivers/gpu/drm/i915/g= vt/Makefile > > index 271fb46d4dd0..54e209a23899 100644 > > --- a/drivers/gpu/drm/i915/gvt/Makefile > > +++ b/drivers/gpu/drm/i915/gvt/Makefile > > @@ -3,7 +3,7 @@ GVT_DIR :=3D gvt > > GVT_SOURCE :=3D gvt.o aperture_gm.o handlers.o vgpu.o trace_points.o f= irmware.o \ > > interrupt.o gtt.o cfg_space.o opregion.o mmio.o display.o edid.o \ > > execlist.o scheduler.o sched_policy.o mmio_context.o cmd_parser.o deb= ugfs.o \ > > - fb_decoder.o dmabuf.o page_track.o > > + fb_decoder.o dmabuf.o page_track.o device_version.o > > =20 > > ccflags-y +=3D -I$(src) -I$(src)/$(GVT_DIR) > > i915-y +=3D $(addprefix $(GVT_DIR)/, $(GVT_SOURCE)) > > diff --git a/drivers/gpu/drm/i915/gvt/device_version.c b/drivers/gpu/dr= m/i915/gvt/device_version.c > > new file mode 100644 > > index 000000000000..bd4cdcbdba95 > > --- /dev/null > > +++ b/drivers/gpu/drm/i915/gvt/device_version.c > > @@ -0,0 +1,87 @@ > > +/* > > + * Copyright(c) 2011-2017 Intel Corporation. All rights reserved. > > + * > > + * Permission is hereby granted, free of charge, to any person obtaini= ng a > > + * copy of this software and associated documentation files (the "Soft= ware"), > > + * to deal in the Software without restriction, including without limi= tation > > + * the rights to use, copy, modify, merge, publish, distribute, sublic= ense, > > + * and/or sell copies of the Software, and to permit persons to whom t= he > > + * Software is furnished to do so, subject to the following conditions: > > + * > > + * The above copyright notice and this permission notice (including th= e next > > + * paragraph) shall be included in all copies or substantial portions = of the > > + * Software. > > + * > > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXP= RESS OR > > + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABI= LITY, > > + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT = SHALL > > + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES O= R OTHER > > + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARI= SING FROM, > > + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALI= NGS IN THE > > + * SOFTWARE. > > + * > > + * Authors: > > + * Yan Zhao > > + */ > > +#include > > +#include "i915_drv.h" > > + > > +static bool is_compatible(const char *self, const char *remote) > > +{ > > + if (strlen(remote) !=3D strlen(self)) > > + return false; > > + > > + return (strncmp(self, remote, strlen(self))) ? false : true; > > +} > > + > > +ssize_t intel_gvt_get_vfio_device_version_len(struct drm_i915_private = *dev_priv) > > +{ > > + if (!IS_GEN(dev_priv, 8) && !IS_GEN(dev_priv, 9)) > > + return -ENODEV; > > + > > + return PAGE_SIZE; > > +} > > + > > +ssize_t intel_gvt_get_vfio_device_version(struct drm_i915_private *dev= _priv, > > + char *buf, const char *mdev_type) > > +{ > > + int cnt =3D 0, ret =3D 0; > > + const char *str =3D NULL; > > + >=20 > > + /* currently only gen8 & gen9 are supported */ > > + if (!IS_GEN(dev_priv, 8) && !IS_GEN(dev_priv, 9)) > > + return -ENODEV; > > + > > + /* vendor id + device id + mdev type */ > > + /* vendor id */ > > + cnt =3D snprintf(buf, 5, "%04x", PCI_VENDOR_ID_INTEL); > > + buf +=3D cnt; > > + ret +=3D cnt; > > + > > + /* device id */ > > + cnt =3D snprintf(buf, 6, "-%04x", INTEL_DEVID(dev_priv)); > > + buf +=3D cnt; > > + ret +=3D cnt; > > + > > + /* mdev type */ > > + str =3D mdev_type; > > + cnt =3D snprintf(buf, strlen(str) + 3, "-%s\n", mdev_type); > > + buf +=3D cnt; > > + ret +=3D cnt; > > + > > + return ret; > > +} > > + > > +ssize_t intel_gvt_check_vfio_device_version(struct drm_i915_private *d= ev_priv, > > + const char *self, const char *remote) > > +{ > > + > > + /* currently only gen8 & gen9 are supported */ > > + if (!IS_GEN(dev_priv, 8) && !IS_GEN(dev_priv, 9)) > > + return -ENODEV; > > + > > + if (!is_compatible(self, remote)) > > + return -EINVAL; > > + > > + return 0; > > +} > > diff --git a/drivers/gpu/drm/i915/gvt/gvt.c b/drivers/gpu/drm/i915/gvt/= gvt.c > > index 43f4242062dd..19f16eec5a4c 100644 > > --- a/drivers/gpu/drm/i915/gvt/gvt.c > > +++ b/drivers/gpu/drm/i915/gvt/gvt.c > > @@ -105,14 +105,65 @@ static ssize_t description_show(struct kobject *k= obj, struct device *dev, > > type->weight); > > } > > =20 > > +#ifdef GVT_MIGRATION_VERSION >=20 > No extra define. >=20 > > +static ssize_t version_show(struct kobject *kobj, struct device *dev, > > + char *buf) > > +{ > > + struct drm_i915_private *i915 =3D kdev_to_i915(dev); > > + const char *mdev_type =3D kobject_name(kobj); > > + > > + return intel_gvt_get_vfio_device_version(i915, buf, mdev_type); > > +} > > + > > +static ssize_t version_store(struct kobject *kobj, struct device *dev, > > + const char *buf, size_t count) > > +{ > > + char *remote =3D NULL, *self =3D NULL; > > + int len, ret =3D 0; > > + struct drm_i915_private *i915 =3D kdev_to_i915(dev); > > + const char *mdev_type =3D kobject_name(kobj); > > + > > + len =3D intel_gvt_get_vfio_device_version_len(i915); > > + if (len < 0) > > + return len; > > + > > + self =3D kmalloc(len, GFP_KERNEL); > > + if (!self) > > + return -ENOMEM; > > + > > + ret =3D intel_gvt_get_vfio_device_version(i915, self, mdev_type); > > + if (ret < 0) > > + goto out; > > + > > + remote =3D kstrndup(buf, count, GFP_KERNEL); > > + if (!remote) { > > + ret =3D -ENOMEM; > > + goto out; > > + } >=20 > Please make device version as attribute for vgpu instead of allocating me= mory > everytime to generate it. > Seems this is attribute for mdev type instead of instance, I was wrong to take it as vgpu instance attribute, so we could add it for vgpu type definition for device with migration. > > + > > + ret =3D intel_gvt_check_vfio_device_version(i915, self, remote); > > + > > +out: > > + kfree(self); > > + kfree(remote); > > + return (ret < 0 ? ret : count); > > +} > > +#endif > > + > > static MDEV_TYPE_ATTR_RO(available_instances); > > static MDEV_TYPE_ATTR_RO(device_api); > > static MDEV_TYPE_ATTR_RO(description); > > +#ifdef GVT_MIGRATION_VERSION > > +static MDEV_TYPE_ATTR_RW(version); > > +#endif >=20 > Don't need extra define. >=20 > > =20 > > static struct attribute *gvt_type_attrs[] =3D { > > &mdev_type_attr_available_instances.attr, > > &mdev_type_attr_device_api.attr, > > &mdev_type_attr_description.attr, > > +#ifdef GVT_MIGRATION_VERSION > > + &mdev_type_attr_version.attr, > > +#endif > > NULL, > > }; >=20 > I think you need another group of attrs for type that could support > migration, it will be assigned during host init for current platform > with driver support. So just add new group of attrs for like > gvt_migration_type_attrs[] with version. >=20 > > =20 > > diff --git a/drivers/gpu/drm/i915/gvt/gvt.h b/drivers/gpu/drm/i915/gvt/= gvt.h > > index f5a328b5290a..4062f6b26acf 100644 > > --- a/drivers/gpu/drm/i915/gvt/gvt.h > > +++ b/drivers/gpu/drm/i915/gvt/gvt.h > > @@ -687,6 +687,12 @@ void intel_gvt_debugfs_remove_vgpu(struct intel_vg= pu *vgpu); > > int intel_gvt_debugfs_init(struct intel_gvt *gvt); > > void intel_gvt_debugfs_clean(struct intel_gvt *gvt); > > =20 > > +ssize_t intel_gvt_get_vfio_device_version(struct drm_i915_private *i91= 5, > > + char *buf, const char *mdev_type); > > +ssize_t intel_gvt_check_vfio_device_version(struct drm_i915_private *d= ev_priv, > > + const char *self, const char *remote); > > +ssize_t > > +intel_gvt_get_vfio_device_version_len(struct drm_i915_private *dev_pri= v); > > =20 > > #include "trace.h" > > #include "mpt.h" > > --=20 > > 2.17.1 > >=20 >=20 > --=20 > Open Source Technology Center, Intel ltd. >=20 > $gpg --keyserver wwwkeys.pgp.net --recv-keys 4D781827 --=20 Open Source Technology Center, Intel ltd. $gpg --keyserver wwwkeys.pgp.net --recv-keys 4D781827 --88pBQ1/6ie/nQzMF Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iF0EARECAB0WIQTXuabgHDW6LPt9CICxBBozTXgYJwUCXM/lRgAKCRCxBBozTXgY J3mgAJ9uaM8nSoJ+1omd5e5I3D1cnYvX8QCgnY9Ykxd8jrvcrOFLXU7FoBiZgA0= =1h40 -----END PGP SIGNATURE----- --88pBQ1/6ie/nQzMF--