Commit 0bc79069 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Alex Williamson
Browse files

vfio/mdev: consolidate all the name sysfs into the core code 



Every driver just emits a static string, simply add a field to the
mdev_type for the driver to fill out or fall back to the sysfs name and
provide a standard sysfs show function.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Reviewed-by: default avatarKevin Tian <kevin.tian@intel.com>
Reviewed-by: default avatarKirti Wankhede <kwankhede@nvidia.com>
Reviewed-by: default avatarEric Farman <farman@linux.ibm.com>
Link: https://lore.kernel.org/r/20220923092652.100656-12-hch@lst.de


Signed-off-by: default avatarAlex Williamson <alex.williamson@redhat.com>
parent 290aac5d

Documentation/driver-api/vfio-mediated-device.rst

+1 −1
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ Directories and files under the sysfs for Each Physical Device 


* name



  This attribute should show human readable name. This is optional attribute.

  This attribute shows a human readable name.



* description

drivers/gpu/drm/i915/gvt/kvmgt.c

+0 −8
Original line number Diff line number Diff line
@@ -138,20 +138,12 @@ static ssize_t description_show(struct mdev_type *mtype, 
		       type->conf->weight);

}



static ssize_t name_show(struct mdev_type *mtype,

			 struct mdev_type_attribute *attr, char *buf)

{

	return sprintf(buf, "%s\n", mtype->sysfs_name);

}



static MDEV_TYPE_ATTR_RO(available_instances);

static MDEV_TYPE_ATTR_RO(description);

static MDEV_TYPE_ATTR_RO(name);



static const struct attribute *gvt_type_attrs[] = {

	&mdev_type_attr_available_instances.attr,

	&mdev_type_attr_description.attr,

	&mdev_type_attr_name.attr,

	NULL,

};

drivers/s390/cio/vfio_ccw_drv.c

+1 −0
Original line number Diff line number Diff line
@@ -221,6 +221,7 @@ static int vfio_ccw_sch_probe(struct subchannel *sch) 
	dev_set_drvdata(&sch->dev, private);



	private->mdev_type.sysfs_name = "io";

	private->mdev_type.pretty_name = "I/O subchannel (Non-QDIO)";

	private->mdev_types[0] = &private->mdev_type;

	ret = mdev_register_parent(&private->parent, &sch->dev,

				   &vfio_ccw_mdev_driver,

drivers/s390/cio/vfio_ccw_ops.c

+0 −8
Original line number Diff line number Diff line
@@ -44,13 +44,6 @@ static void vfio_ccw_dma_unmap(struct vfio_device *vdev, u64 iova, u64 length) 
	vfio_ccw_mdev_reset(private);

}



static ssize_t name_show(struct mdev_type *mtype,

			 struct mdev_type_attribute *attr, char *buf)

{

	return sprintf(buf, "I/O subchannel (Non-QDIO)\n");

}

static MDEV_TYPE_ATTR_RO(name);



static ssize_t available_instances_show(struct mdev_type *mtype,

					struct mdev_type_attribute *attr,

					char *buf)
@@ -62,7 +55,6 @@ static ssize_t available_instances_show(struct mdev_type *mtype, 
static MDEV_TYPE_ATTR_RO(available_instances);



static const struct attribute *mdev_types_attrs[] = {

	&mdev_type_attr_name.attr,

	&mdev_type_attr_available_instances.attr,

	NULL,

};

drivers/s390/crypto/vfio_ap_ops.c

+1 −9
Original line number Diff line number Diff line
@@ -790,14 +790,6 @@ static void vfio_ap_mdev_remove(struct mdev_device *mdev) 
	vfio_put_device(&matrix_mdev->vdev);

}



static ssize_t name_show(struct mdev_type *mtype,

			 struct mdev_type_attribute *attr, char *buf)

{

	return sprintf(buf, "%s\n", VFIO_AP_MDEV_NAME_HWVIRT);

}



static MDEV_TYPE_ATTR_RO(name);



static ssize_t available_instances_show(struct mdev_type *mtype,

					struct mdev_type_attribute *attr,

					char *buf)
@@ -809,7 +801,6 @@ static ssize_t available_instances_show(struct mdev_type *mtype, 
static MDEV_TYPE_ATTR_RO(available_instances);



static const struct attribute *vfio_ap_mdev_type_attrs[] = {

	&mdev_type_attr_name.attr,

	&mdev_type_attr_available_instances.attr,

	NULL,

};
@@ -1813,6 +1804,7 @@ int vfio_ap_mdev_register(void) 
		return ret;



	matrix_dev->mdev_type.sysfs_name = VFIO_AP_MDEV_TYPE_HWVIRT;

	matrix_dev->mdev_type.pretty_name = VFIO_AP_MDEV_NAME_HWVIRT;

	matrix_dev->mdev_types[0] = &matrix_dev->mdev_type;

	ret = mdev_register_parent(&matrix_dev->parent, &matrix_dev->device,

				   &vfio_ap_matrix_driver,