vfio/mdev: consolidate all the description sysfs into the core code (685a1537) · Commits · jan.koester / Linux

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

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -104,7 +104,7 @@ structure to represent a mediated device's driver::
	int (probe) (struct mdev_device dev);		int (probe) (struct mdev_device dev);
	void (remove) (struct mdev_device dev);		void (remove) (struct mdev_device dev);
	unsigned int (get_available)(struct mdev_type mtype);		unsigned int (get_available)(struct mdev_type mtype);
	const struct attribute * const *types_attrs;		ssize_t (show_description)(struct mdev_type mtype, char *buf);
	struct device_driver driver;		struct device_driver driver;
	};		};

	@@ -222,7 +222,7 @@ Directories and files under the sysfs for Each Physical Device

	* description		* description

	This attribute should show brief features/description of the type. This is		This attribute can show brief features/description of the type. This is an
	optional attribute.		optional attribute.

	Directories and Files Under the sysfs for Each mdev Device		Directories and Files Under the sysfs for Each mdev Device

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

+5 −13

Original line number	Original line	Diff line number	Diff line
	@@ -113,8 +113,7 @@ static void kvmgt_page_track_flush_slot(struct kvm *kvm,
	struct kvm_memory_slot *slot,		struct kvm_memory_slot *slot,
	struct kvm_page_track_notifier_node *node);		struct kvm_page_track_notifier_node *node);

	static ssize_t description_show(struct mdev_type *mtype,		static ssize_t intel_vgpu_show_description(struct mdev_type mtype, char buf)
	struct mdev_type_attribute attr, char buf)
	{		{
	struct intel_vgpu_type *type =		struct intel_vgpu_type *type =
	container_of(mtype, struct intel_vgpu_type, type);		container_of(mtype, struct intel_vgpu_type, type);
	@@ -128,13 +127,6 @@ static ssize_t description_show(struct mdev_type *mtype,
	type->conf->weight);		type->conf->weight);
	}		}

	static MDEV_TYPE_ATTR_RO(description);

	static const struct attribute *gvt_type_attrs[] = {
	&mdev_type_attr_description.attr,
	NULL,
	};

	static void gvt_unpin_guest_page(struct intel_vgpu *vgpu, unsigned long gfn,		static void gvt_unpin_guest_page(struct intel_vgpu *vgpu, unsigned long gfn,
	unsigned long size)		unsigned long size)
	{		{
	@@ -1552,7 +1544,7 @@ static struct mdev_driver intel_vgpu_mdev_driver = {
	.probe = intel_vgpu_probe,		.probe = intel_vgpu_probe,
	.remove = intel_vgpu_remove,		.remove = intel_vgpu_remove,
	.get_available = intel_vgpu_get_available,		.get_available = intel_vgpu_get_available,
	.types_attrs = gvt_type_attrs,		.show_description = intel_vgpu_show_description,
	};		};

	int intel_gvt_page_track_add(struct intel_vgpu *info, u64 gfn)		int intel_gvt_page_track_add(struct intel_vgpu *info, u64 gfn)

drivers/vfio/mdev/mdev_driver.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -55,7 +55,7 @@ struct bus_type mdev_bus_type = {
	**/		**/
	int mdev_register_driver(struct mdev_driver *drv)		int mdev_register_driver(struct mdev_driver *drv)
	{		{
	if (!drv->types_attrs \|\| !drv->device_api)		if (!drv->device_api)
	return -EINVAL;		return -EINVAL;

	/* initialize common driver fields */		/* initialize common driver fields */

drivers/vfio/mdev/mdev_sysfs.c

+32 −8

Original line number	Original line	Diff line number	Diff line
	@@ -14,7 +14,19 @@

	#include "mdev_private.h"		#include "mdev_private.h"

	/* Static functions */		struct mdev_type_attribute {
			struct attribute attr;
			ssize_t (show)(struct mdev_type mtype,
			struct mdev_type_attribute attr, char buf);
			ssize_t (store)(struct mdev_type mtype,
			struct mdev_type_attribute attr, const char buf,
			size_t count);
			};

			#define MDEV_TYPE_ATTR_RO(_name) \
			struct mdev_type_attribute mdev_type_attr_##_name = __ATTR_RO(_name)
			#define MDEV_TYPE_ATTR_WO(_name) \
			struct mdev_type_attribute mdev_type_attr_##_name = __ATTR_WO(_name)

	static ssize_t mdev_type_attr_show(struct kobject *kobj,		static ssize_t mdev_type_attr_show(struct kobject *kobj,
	struct attribute __attr, char buf)		struct attribute __attr, char buf)
	@@ -100,16 +112,35 @@ static ssize_t available_instances_show(struct mdev_type *mtype,
	}		}
	static MDEV_TYPE_ATTR_RO(available_instances);		static MDEV_TYPE_ATTR_RO(available_instances);

			static ssize_t description_show(struct mdev_type *mtype,
			struct mdev_type_attribute *attr,
			char *buf)
			{
			return mtype->parent->mdev_driver->show_description(mtype, buf);
			}
			static MDEV_TYPE_ATTR_RO(description);

	static struct attribute *mdev_types_core_attrs[] = {		static struct attribute *mdev_types_core_attrs[] = {
	&mdev_type_attr_create.attr,		&mdev_type_attr_create.attr,
	&mdev_type_attr_device_api.attr,		&mdev_type_attr_device_api.attr,
	&mdev_type_attr_name.attr,		&mdev_type_attr_name.attr,
	&mdev_type_attr_available_instances.attr,		&mdev_type_attr_available_instances.attr,
			&mdev_type_attr_description.attr,
	NULL,		NULL,
	};		};

			static umode_t mdev_types_core_is_visible(struct kobject *kobj,
			struct attribute *attr, int n)
			{
			if (attr == &mdev_type_attr_description.attr &&
			!to_mdev_type(kobj)->parent->mdev_driver->show_description)
			return 0;
			return attr->mode;
			}

	static struct attribute_group mdev_type_core_group = {		static struct attribute_group mdev_type_core_group = {
	.attrs = mdev_types_core_attrs,		.attrs = mdev_types_core_attrs,
			.is_visible = mdev_types_core_is_visible,
	};		};

	static const struct attribute_group *mdev_type_groups[] = {		static const struct attribute_group *mdev_type_groups[] = {
	@@ -155,13 +186,8 @@ static int mdev_type_add(struct mdev_parent parent, struct mdev_type type)
	goto attr_devices_failed;		goto attr_devices_failed;
	}		}

	ret = sysfs_create_files(&type->kobj, parent->mdev_driver->types_attrs);
	if (ret)
	goto attrs_failed;
	return 0;		return 0;

	attrs_failed:
	kobject_put(type->devices_kobj);
	attr_devices_failed:		attr_devices_failed:
	kobject_del(&type->kobj);		kobject_del(&type->kobj);
	kobject_put(&type->kobj);		kobject_put(&type->kobj);
	@@ -170,8 +196,6 @@ static int mdev_type_add(struct mdev_parent parent, struct mdev_type type)

	static void mdev_type_remove(struct mdev_type *type)		static void mdev_type_remove(struct mdev_type *type)
	{		{
	sysfs_remove_files(&type->kobj, type->parent->mdev_driver->types_attrs);

	kobject_put(type->devices_kobj);		kobject_put(type->devices_kobj);
	kobject_del(&type->kobj);		kobject_del(&type->kobj);
	kobject_put(&type->kobj);		kobject_put(&type->kobj);

include/linux/mdev.h

+2 −17

Original line number	Original line	Diff line number	Diff line
	@@ -52,28 +52,13 @@ static inline struct mdev_device to_mdev_device(struct device dev)
	return container_of(dev, struct mdev_device, dev);		return container_of(dev, struct mdev_device, dev);
	}		}

	/* interface for exporting mdev supported type attributes */
	struct mdev_type_attribute {
	struct attribute attr;
	ssize_t (show)(struct mdev_type mtype,
	struct mdev_type_attribute attr, char buf);
	ssize_t (store)(struct mdev_type mtype,
	struct mdev_type_attribute attr, const char buf,
	size_t count);
	};

	#define MDEV_TYPE_ATTR_RO(_name) \
	struct mdev_type_attribute mdev_type_attr_##_name = __ATTR_RO(_name)
	#define MDEV_TYPE_ATTR_WO(_name) \
	struct mdev_type_attribute mdev_type_attr_##_name = __ATTR_WO(_name)

	/**		/**
	* struct mdev_driver - Mediated device driver		* struct mdev_driver - Mediated device driver
	* @device_api: string to return for the device_api sysfs		* @device_api: string to return for the device_api sysfs
	* @probe: called when new device created		* @probe: called when new device created
	* @remove: called when device removed		* @remove: called when device removed
	* @get_available: Return the max number of instances that can be created		* @get_available: Return the max number of instances that can be created
	* @types_attrs: attributes to the type kobjects.		* @show_description: Print a description of the mtype
	* @driver: device driver structure		* @driver: device driver structure
	**/		**/
	struct mdev_driver {		struct mdev_driver {
	@@ -81,7 +66,7 @@ struct mdev_driver {
	int (probe)(struct mdev_device dev);		int (probe)(struct mdev_device dev);
	void (remove)(struct mdev_device dev);		void (remove)(struct mdev_device dev);
	unsigned int (get_available)(struct mdev_type mtype);		unsigned int (get_available)(struct mdev_type mtype);
	const struct attribute * const *types_attrs;		ssize_t (show_description)(struct mdev_type mtype, char *buf);
	struct device_driver driver;		struct device_driver driver;
	};		};