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.3 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham 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 41E51CA9EB9 for ; Thu, 24 Oct 2019 03:28:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F0E662075C for ; Thu, 24 Oct 2019 03:28:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Mjwid+Lk" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2437145AbfJXD2N (ORCPT ); Wed, 23 Oct 2019 23:28:13 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:60179 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2403962AbfJXD2N (ORCPT ); Wed, 23 Oct 2019 23:28:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571887690; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=pzxpsBo2A0SE4SzHMG+CMsMR2xq7g+vvLzNI8mVEzFY=; b=Mjwid+LkOpDKmIYz7BUnvA+N/0UH2iCZlEM2D/DCYe+8nZ9tJOoX9bVzLmG/6ZRTXiF587 bqrcvN0xT9iT4Ly7TfS+9M10extjW7AZtChQkc/YM8ozND4GQkhuE397V50DQS7aH+GFHY t8mD+EA16WByOhqmf6jMmlTTJlZ67oI= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-44-1aj8KreoOMCZUqB0ExnMtQ-1; Wed, 23 Oct 2019 23:28:09 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7834C5E9; Thu, 24 Oct 2019 03:28:05 +0000 (UTC) Received: from [10.72.12.199] (ovpn-12-199.pek2.redhat.com [10.72.12.199]) by smtp.corp.redhat.com (Postfix) with ESMTP id A995A5C222; Thu, 24 Oct 2019 03:27:38 +0000 (UTC) Subject: Re: [PATCH V5 1/6] mdev: class id support To: Alex Williamson Cc: kvm@vger.kernel.org, linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, intel-gvt-dev@lists.freedesktop.org, kwankhede@nvidia.com, mst@redhat.com, tiwei.bie@intel.com, virtualization@lists.linux-foundation.org, netdev@vger.kernel.org, cohuck@redhat.com, maxime.coquelin@redhat.com, cunming.liang@intel.com, zhihong.wang@intel.com, rob.miller@broadcom.com, xiao.w.wang@intel.com, haotian.wang@sifive.com, zhenyuw@linux.intel.com, zhi.a.wang@intel.com, jani.nikula@linux.intel.com, joonas.lahtinen@linux.intel.com, rodrigo.vivi@intel.com, airlied@linux.ie, daniel@ffwll.ch, farman@linux.ibm.com, pasic@linux.ibm.com, sebott@linux.ibm.com, oberpar@linux.ibm.com, heiko.carstens@de.ibm.com, gor@linux.ibm.com, borntraeger@de.ibm.com, akrowiak@linux.ibm.com, freude@linux.ibm.com, lingshan.zhu@intel.com, idos@mellanox.com, eperezma@redhat.com, lulu@redhat.com, parav@mellanox.com, christophe.de.dinechin@gmail.com, kevin.tian@intel.com, stefanha@redhat.com References: <20191023130752.18980-1-jasowang@redhat.com> <20191023130752.18980-2-jasowang@redhat.com> <20191023154204.31d74866@x1.home> From: Jason Wang Message-ID: <38bdf762-524a-e0f1-6e9a-1102adfe8fb1@redhat.com> Date: Thu, 24 Oct 2019 11:27:36 +0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 In-Reply-To: <20191023154204.31d74866@x1.home> Content-Language: en-US X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: 1aj8KreoOMCZUqB0ExnMtQ-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2019/10/24 =E4=B8=8A=E5=8D=885:42, Alex Williamson wrote: > On Wed, 23 Oct 2019 21:07:47 +0800 > Jason Wang wrote: > >> Mdev bus only supports vfio driver right now, so it doesn't implement >> match method. But in the future, we may add drivers other than vfio, >> the first driver could be virtio-mdev. This means we need to add >> device class id support in bus match method to pair the mdev device >> and mdev driver correctly. >> >> So this patch adds id_table to mdev_driver and class_id for mdev >> device with the match method for mdev bus. >> >> Signed-off-by: Jason Wang >> --- >> .../driver-api/vfio-mediated-device.rst | 5 +++++ >> drivers/gpu/drm/i915/gvt/kvmgt.c | 1 + >> drivers/s390/cio/vfio_ccw_ops.c | 1 + >> drivers/s390/crypto/vfio_ap_ops.c | 1 + >> drivers/vfio/mdev/mdev_core.c | 18 +++++++++++++++ >> drivers/vfio/mdev/mdev_driver.c | 22 +++++++++++++++++++ >> drivers/vfio/mdev/mdev_private.h | 1 + >> drivers/vfio/mdev/vfio_mdev.c | 6 +++++ >> include/linux/mdev.h | 8 +++++++ >> include/linux/mod_devicetable.h | 8 +++++++ >> samples/vfio-mdev/mbochs.c | 1 + >> samples/vfio-mdev/mdpy.c | 1 + >> samples/vfio-mdev/mtty.c | 1 + >> 13 files changed, 74 insertions(+) >> >> diff --git a/Documentation/driver-api/vfio-mediated-device.rst b/Documen= tation/driver-api/vfio-mediated-device.rst >> index 25eb7d5b834b..6709413bee29 100644 >> --- a/Documentation/driver-api/vfio-mediated-device.rst >> +++ b/Documentation/driver-api/vfio-mediated-device.rst >> @@ -102,12 +102,14 @@ structure to represent a mediated device's driver:= : >> * @probe: called when new device created >> * @remove: called when device removed >> * @driver: device driver structure >> + * @id_table: the ids serviced by this driver >> */ >> struct mdev_driver { >> =09 const char *name; >> =09 int (*probe) (struct device *dev); >> =09 void (*remove) (struct device *dev); >> =09 struct device_driver driver; >> +=09 const struct mdev_class_id *id_table; >> }; >> =20 >> A mediated bus driver for mdev should use this structure in the functi= on calls >> @@ -170,6 +172,9 @@ that a driver should use to unregister itself with t= he mdev core driver:: >> =20 >> =09extern void mdev_unregister_device(struct device *dev); >> =20 >> +It is also required to specify the class_id in create() callback throug= h:: >> + >> +=09int mdev_set_class(struct mdev_device *mdev, u16 id); >> =20 >> Mediated Device Management Interface Through sysfs >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D >> diff --git a/drivers/gpu/drm/i915/gvt/kvmgt.c b/drivers/gpu/drm/i915/gvt= /kvmgt.c >> index 343d79c1cb7e..6420f0dbd31b 100644 >> --- a/drivers/gpu/drm/i915/gvt/kvmgt.c >> +++ b/drivers/gpu/drm/i915/gvt/kvmgt.c >> @@ -678,6 +678,7 @@ static int intel_vgpu_create(struct kobject *kobj, s= truct mdev_device *mdev) >> =09=09 dev_name(mdev_dev(mdev))); >> =09ret =3D 0; >> =20 >> +=09mdev_set_class(mdev, MDEV_CLASS_ID_VFIO); >> out: >> =09return ret; >> } >> diff --git a/drivers/s390/cio/vfio_ccw_ops.c b/drivers/s390/cio/vfio_ccw= _ops.c >> index f0d71ab77c50..cf2c013ae32f 100644 >> --- a/drivers/s390/cio/vfio_ccw_ops.c >> +++ b/drivers/s390/cio/vfio_ccw_ops.c >> @@ -129,6 +129,7 @@ static int vfio_ccw_mdev_create(struct kobject *kobj= , struct mdev_device *mdev) >> =09=09=09 private->sch->schid.ssid, >> =09=09=09 private->sch->schid.sch_no); >> =20 >> +=09mdev_set_class(mdev, MDEV_CLASS_ID_VFIO); >> =09return 0; >> } >> =20 >> diff --git a/drivers/s390/crypto/vfio_ap_ops.c b/drivers/s390/crypto/vfi= o_ap_ops.c >> index 5c0f53c6dde7..07c31070afeb 100644 >> --- a/drivers/s390/crypto/vfio_ap_ops.c >> +++ b/drivers/s390/crypto/vfio_ap_ops.c >> @@ -343,6 +343,7 @@ static int vfio_ap_mdev_create(struct kobject *kobj,= struct mdev_device *mdev) >> =09list_add(&matrix_mdev->node, &matrix_dev->mdev_list); >> =09mutex_unlock(&matrix_dev->lock); >> =20 >> +=09mdev_set_class(mdev, MDEV_CLASS_ID_VFIO); >> =09return 0; >> } >> =20 >> diff --git a/drivers/vfio/mdev/mdev_core.c b/drivers/vfio/mdev/mdev_core= .c >> index b558d4cfd082..3a9c52d71b4e 100644 >> --- a/drivers/vfio/mdev/mdev_core.c >> +++ b/drivers/vfio/mdev/mdev_core.c >> @@ -45,6 +45,16 @@ void mdev_set_drvdata(struct mdev_device *mdev, void = *data) >> } >> EXPORT_SYMBOL(mdev_set_drvdata); >> =20 >> +/* Specify the class for the mdev device, this must be called during >> + * create() callback. >> + */ >> +void mdev_set_class(struct mdev_device *mdev, u16 id) >> +{ >> +=09WARN_ON(mdev->class_id); >> +=09mdev->class_id =3D id; >> +} >> +EXPORT_SYMBOL(mdev_set_class); >> + >> struct device *mdev_dev(struct mdev_device *mdev) >> { >> =09return &mdev->dev; >> @@ -135,6 +145,7 @@ static int mdev_device_remove_cb(struct device *dev,= void *data) >> * mdev_register_device : Register a device >> * @dev: device structure representing parent device. >> * @ops: Parent device operation structure to be registered. >> + * @id: class id. >> * >> * Add device to list of registered parent devices. >> * Returns a negative value on error, otherwise 0. >> @@ -324,6 +335,13 @@ int mdev_device_create(struct kobject *kobj, >> =09if (ret) >> =09=09goto ops_create_fail; >> =20 >> +=09if (!mdev->class_id) { >> +=09=09ret =3D -EINVAL; >> +=09=09WARN(1, "class id must be specified for device %s\n", >> +=09=09 dev_name(dev)); > Nit, dev_warn(dev, "mdev vendor driver failed to specify device class\n")= ; Will fix. > >> +=09=09goto add_fail; >> +=09} >> + >> =09ret =3D device_add(&mdev->dev); >> =09if (ret) >> =09=09goto add_fail; >> diff --git a/drivers/vfio/mdev/mdev_driver.c b/drivers/vfio/mdev/mdev_dr= iver.c >> index 0d3223aee20b..319d886ffaf7 100644 >> --- a/drivers/vfio/mdev/mdev_driver.c >> +++ b/drivers/vfio/mdev/mdev_driver.c >> @@ -69,8 +69,30 @@ static int mdev_remove(struct device *dev) >> =09return 0; >> } >> =20 >> +static int mdev_match(struct device *dev, struct device_driver *drv) >> +{ >> +=09unsigned int i; >> +=09struct mdev_device *mdev =3D to_mdev_device(dev); >> +=09struct mdev_driver *mdrv =3D to_mdev_driver(drv); >> +=09const struct mdev_class_id *ids =3D mdrv->id_table; >> + > Nit, as we start to allow new mdev bus drivers, mdev-core might want to > protect itself from a NULL id_table, by either failing the > mdev_register_driver() or failing the match here. I think such a > condition would segfault as written here, but clearly we don't have > such external drivers yet. Thanks, I'm not sure I get the point here. My understanding is that mdev-core=20 won't try to be matched here since it was not a complete mdev device. Thanks > > Alex > >> +=09for (i =3D 0; ids[i].id; i++) >> +=09=09if (ids[i].id =3D=3D mdev->class_id) >> +=09=09=09return 1; >> +=09return 0; >> +} >> + >> +static int mdev_uevent(struct device *dev, struct kobj_uevent_env *env) >> +{ >> +=09struct mdev_device *mdev =3D to_mdev_device(dev); >> + >> +=09return add_uevent_var(env, "MODALIAS=3Dmdev:c%02X", mdev->class_id); >> +} >> + >> struct bus_type mdev_bus_type =3D { >> =09.name=09=09=3D "mdev", >> +=09.match=09=09=3D mdev_match, >> +=09.uevent=09=09=3D mdev_uevent, >> =09.probe=09=09=3D mdev_probe, >> =09.remove=09=09=3D mdev_remove, >> }; >> diff --git a/drivers/vfio/mdev/mdev_private.h b/drivers/vfio/mdev/mdev_p= rivate.h >> index 7d922950caaf..c65f436c1869 100644 >> --- a/drivers/vfio/mdev/mdev_private.h >> +++ b/drivers/vfio/mdev/mdev_private.h >> @@ -33,6 +33,7 @@ struct mdev_device { >> =09struct kobject *type_kobj; >> =09struct device *iommu_device; >> =09bool active; >> +=09u16 class_id; >> }; >> =20 >> #define to_mdev_device(dev)=09container_of(dev, struct mdev_device, de= v) >> diff --git a/drivers/vfio/mdev/vfio_mdev.c b/drivers/vfio/mdev/vfio_mdev= .c >> index 30964a4e0a28..7b24ee9cb8dd 100644 >> --- a/drivers/vfio/mdev/vfio_mdev.c >> +++ b/drivers/vfio/mdev/vfio_mdev.c >> @@ -120,10 +120,16 @@ static void vfio_mdev_remove(struct device *dev) >> =09vfio_del_group_dev(dev); >> } >> =20 >> +static const struct mdev_class_id id_table[] =3D { >> +=09{ MDEV_CLASS_ID_VFIO }, >> +=09{ 0 }, >> +}; >> + >> static struct mdev_driver vfio_mdev_driver =3D { >> =09.name=09=3D "vfio_mdev", >> =09.probe=09=3D vfio_mdev_probe, >> =09.remove=09=3D vfio_mdev_remove, >> +=09.id_table =3D id_table, >> }; >> =20 >> static int __init vfio_mdev_init(void) >> diff --git a/include/linux/mdev.h b/include/linux/mdev.h >> index 0ce30ca78db0..78b69d09eb54 100644 >> --- a/include/linux/mdev.h >> +++ b/include/linux/mdev.h >> @@ -118,6 +118,7 @@ struct mdev_type_attribute mdev_type_attr_##_name = =3D=09=09\ >> * @probe: called when new device created >> * @remove: called when device removed >> * @driver: device driver structure >> + * @id_table: the ids serviced by this driver >> * >> **/ >> struct mdev_driver { >> @@ -125,6 +126,7 @@ struct mdev_driver { >> =09int (*probe)(struct device *dev); >> =09void (*remove)(struct device *dev); >> =09struct device_driver driver; >> +=09const struct mdev_class_id *id_table; >> }; >> =20 >> #define to_mdev_driver(drv)=09container_of(drv, struct mdev_driver, dr= iver) >> @@ -132,6 +134,7 @@ struct mdev_driver { >> void *mdev_get_drvdata(struct mdev_device *mdev); >> void mdev_set_drvdata(struct mdev_device *mdev, void *data); >> const guid_t *mdev_uuid(struct mdev_device *mdev); >> +void mdev_set_class(struct mdev_device *mdev, u16 id); >> =20 >> extern struct bus_type mdev_bus_type; >> =20 >> @@ -145,4 +148,9 @@ struct device *mdev_parent_dev(struct mdev_device *m= dev); >> struct device *mdev_dev(struct mdev_device *mdev); >> struct mdev_device *mdev_from_dev(struct device *dev); >> =20 >> +enum { >> +=09MDEV_CLASS_ID_VFIO =3D 1, >> +=09/* New entries must be added here */ >> +}; >> + >> #endif /* MDEV_H */ >> diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicet= able.h >> index 5714fd35a83c..f32c6e44fb1a 100644 >> --- a/include/linux/mod_devicetable.h >> +++ b/include/linux/mod_devicetable.h >> @@ -821,4 +821,12 @@ struct wmi_device_id { >> =09const void *context; >> }; >> =20 >> +/** >> + * struct mdev_class_id - MDEV device class identifier >> + * @id: Used to identify a specific class of device, e.g vfio-mdev devi= ce. >> + */ >> +struct mdev_class_id { >> +=09__u16 id; >> +}; >> + >> #endif /* LINUX_MOD_DEVICETABLE_H */ >> diff --git a/samples/vfio-mdev/mbochs.c b/samples/vfio-mdev/mbochs.c >> index ac5c8c17b1ff..115bc5074656 100644 >> --- a/samples/vfio-mdev/mbochs.c >> +++ b/samples/vfio-mdev/mbochs.c >> @@ -561,6 +561,7 @@ static int mbochs_create(struct kobject *kobj, struc= t mdev_device *mdev) >> =09mbochs_reset(mdev); >> =20 >> =09mbochs_used_mbytes +=3D type->mbytes; >> +=09mdev_set_class(mdev, MDEV_CLASS_ID_VFIO); >> =09return 0; >> =20 >> err_mem: >> diff --git a/samples/vfio-mdev/mdpy.c b/samples/vfio-mdev/mdpy.c >> index cc86bf6566e4..665614574d50 100644 >> --- a/samples/vfio-mdev/mdpy.c >> +++ b/samples/vfio-mdev/mdpy.c >> @@ -269,6 +269,7 @@ static int mdpy_create(struct kobject *kobj, struct = mdev_device *mdev) >> =09mdpy_reset(mdev); >> =20 >> =09mdpy_count++; >> +=09mdev_set_class(mdev, MDEV_CLASS_ID_VFIO); >> =09return 0; >> } >> =20 >> diff --git a/samples/vfio-mdev/mtty.c b/samples/vfio-mdev/mtty.c >> index ce84a300a4da..90da12ff7fd9 100644 >> --- a/samples/vfio-mdev/mtty.c >> +++ b/samples/vfio-mdev/mtty.c >> @@ -755,6 +755,7 @@ static int mtty_create(struct kobject *kobj, struct = mdev_device *mdev) >> =09list_add(&mdev_state->next, &mdev_devices_list); >> =09mutex_unlock(&mdev_list_lock); >> =20 >> +=09mdev_set_class(mdev, MDEV_CLASS_ID_VFIO); >> =09return 0; >> } >> =20