On 2021.04.06 16:40:39 -0300, Jason Gunthorpe wrote:
> intel_gvt_init_vgpu_type_groups() makes gvt->types 1:1 with the
> supported_type_groups array, so the type_group_id is also the index into
> gvt->types. Use it directly and remove the string matching.
>
> Reviewed-by: Kevin Tian <kevin.tian@xxxxxxxxx>
> Reviewed-by: Christoph Hellwig <hch@xxxxxx>
> Signed-off-by: Jason Gunthorpe <jgg@xxxxxxxxxx>
> ---
Reviewed-by: Zhenyu Wang <zhenyuw@xxxxxxxxxxxxxxx>
For two gvt specific changes in this series, it's better to just merge through
vfio tree.
Thanks
> drivers/gpu/drm/i915/gvt/gvt.c | 24 +++++++-----------------
> drivers/gpu/drm/i915/gvt/gvt.h | 4 ++--
> drivers/gpu/drm/i915/gvt/kvmgt.c | 5 ++---
> 3 files changed, 11 insertions(+), 22 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gvt/gvt.c b/drivers/gpu/drm/i915/gvt/gvt.c
> index d1d8ee4a5f16a3..4b47a18e9dfa0f 100644
> --- a/drivers/gpu/drm/i915/gvt/gvt.c
> +++ b/drivers/gpu/drm/i915/gvt/gvt.c
> @@ -46,22 +46,12 @@ static const char * const supported_hypervisors[] = {
> [INTEL_GVT_HYPERVISOR_KVM] = "KVM",
> };
>
> -static struct intel_vgpu_type *intel_gvt_find_vgpu_type(struct intel_gvt *gvt,
> - const char *name)
> +static struct intel_vgpu_type *
> +intel_gvt_find_vgpu_type(struct intel_gvt *gvt, unsigned int type_group_id)
> {
> - const char *driver_name =
> - dev_driver_string(&gvt->gt->i915->drm.pdev->dev);
> - int i;
> -
> - name += strlen(driver_name) + 1;
> - for (i = 0; i < gvt->num_types; i++) {
> - struct intel_vgpu_type *t = &gvt->types[i];
> -
> - if (!strncmp(t->name, name, sizeof(t->name)))
> - return t;
> - }
> -
> - return NULL;
> + if (WARN_ON(type_group_id >= gvt->num_types))
> + return NULL;
> + return &gvt->types[type_group_id];
> }
>
> static ssize_t available_instances_show(struct kobject *kobj,
> @@ -71,7 +61,7 @@ static ssize_t available_instances_show(struct kobject *kobj,
> unsigned int num = 0;
> void *gvt = kdev_to_i915(dev)->gvt;
>
> - type = intel_gvt_find_vgpu_type(gvt, kobject_name(kobj));
> + type = intel_gvt_find_vgpu_type(gvt, mtype_get_type_group_id(kobj));
> if (!type)
> num = 0;
> else
> @@ -92,7 +82,7 @@ static ssize_t description_show(struct kobject *kobj, struct device *dev,
> struct intel_vgpu_type *type;
> void *gvt = kdev_to_i915(dev)->gvt;
>
> - type = intel_gvt_find_vgpu_type(gvt, kobject_name(kobj));
> + type = intel_gvt_find_vgpu_type(gvt, mtype_get_type_group_id(kobj));
> if (!type)
> return 0;
>
> diff --git a/drivers/gpu/drm/i915/gvt/gvt.h b/drivers/gpu/drm/i915/gvt/gvt.h
> index 03c993d68f105a..0cf480f42850d2 100644
> --- a/drivers/gpu/drm/i915/gvt/gvt.h
> +++ b/drivers/gpu/drm/i915/gvt/gvt.h
> @@ -569,8 +569,8 @@ struct intel_gvt_ops {
> void (*vgpu_reset)(struct intel_vgpu *);
> void (*vgpu_activate)(struct intel_vgpu *);
> void (*vgpu_deactivate)(struct intel_vgpu *);
> - struct intel_vgpu_type *(*gvt_find_vgpu_type)(struct intel_gvt *gvt,
> - const char *name);
> + struct intel_vgpu_type *(*gvt_find_vgpu_type)(
> + struct intel_gvt *gvt, unsigned int type_group_id);
> bool (*get_gvt_attrs)(struct attribute_group ***intel_vgpu_type_groups);
> int (*vgpu_query_plane)(struct intel_vgpu *vgpu, void *);
> int (*vgpu_get_dmabuf)(struct intel_vgpu *vgpu, unsigned int);
> diff --git a/drivers/gpu/drm/i915/gvt/kvmgt.c b/drivers/gpu/drm/i915/gvt/kvmgt.c
> index b4348256ae9591..16e1e4a38aa1f6 100644
> --- a/drivers/gpu/drm/i915/gvt/kvmgt.c
> +++ b/drivers/gpu/drm/i915/gvt/kvmgt.c
> @@ -700,10 +700,9 @@ static int intel_vgpu_create(struct kobject *kobj, struct mdev_device *mdev)
> pdev = mdev_parent_dev(mdev);
> gvt = kdev_to_i915(pdev)->gvt;
>
> - type = intel_gvt_ops->gvt_find_vgpu_type(gvt, kobject_name(kobj));
> + type = intel_gvt_ops->gvt_find_vgpu_type(gvt,
> + mdev_get_type_group_id(mdev));
> if (!type) {
> - gvt_vgpu_err("failed to find type %s to create\n",
> - kobject_name(kobj));
> ret = -EINVAL;
> goto out;
> }
> --
> 2.31.1
>
Attachment:
signature.asc
Description: PGP signature
_______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel
