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

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



Every driver just print a number, simply add a method to the mdev_driver
to return it 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-13-hch@lst.de


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

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

+2 −1
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ structure to represent a mediated device's driver:: 
     struct mdev_driver {

	     int  (*probe)  (struct mdev_device *dev);

	     void (*remove) (struct mdev_device *dev);

	     unsigned int (*get_available)(struct mdev_type *mtype);

	     const struct attribute * const *types_attrs;

	     struct device_driver    driver;

     };
@@ -207,7 +208,7 @@ Directories and files under the sysfs for Each Physical Device 


* available_instances



  This attribute should show the number of devices of type <type-id> that can be

  This attribute shows the number of devices of type <type-id> that can be

  created.



* [device]

drivers/gpu/drm/i915/gvt/gvt.h

+0 −1
Original line number Diff line number Diff line
@@ -314,7 +314,6 @@ struct intel_vgpu_type { 
	struct mdev_type type;

	char name[16];

	const struct intel_vgpu_config *conf;

	unsigned int avail_instance;

};



struct intel_gvt {

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

+22 −12
Original line number Diff line number Diff line
@@ -113,16 +113,6 @@ static void kvmgt_page_track_flush_slot(struct kvm *kvm, 
		struct kvm_memory_slot *slot,

		struct kvm_page_track_notifier_node *node);



static ssize_t available_instances_show(struct mdev_type *mtype,

					struct mdev_type_attribute *attr,

					char *buf)

{

	struct intel_vgpu_type *type =

		container_of(mtype, struct intel_vgpu_type, type);



	return sprintf(buf, "%u\n", type->avail_instance);

}



static ssize_t description_show(struct mdev_type *mtype,

				struct mdev_type_attribute *attr, char *buf)

{
@@ -138,11 +128,9 @@ static ssize_t description_show(struct mdev_type *mtype, 
		       type->conf->weight);

}



static MDEV_TYPE_ATTR_RO(available_instances);

static MDEV_TYPE_ATTR_RO(description);



static const struct attribute *gvt_type_attrs[] = {

	&mdev_type_attr_available_instances.attr,

	&mdev_type_attr_description.attr,

	NULL,

};
@@ -1533,6 +1521,27 @@ static void intel_vgpu_remove(struct mdev_device *mdev) 
	vfio_put_device(&vgpu->vfio_device);

}



static unsigned int intel_vgpu_get_available(struct mdev_type *mtype)

{

	struct intel_vgpu_type *type =

		container_of(mtype, struct intel_vgpu_type, type);

	struct intel_gvt *gvt = kdev_to_i915(mtype->parent->dev)->gvt;

	unsigned int low_gm_avail, high_gm_avail, fence_avail;



	mutex_lock(&gvt->lock);

	low_gm_avail = gvt_aperture_sz(gvt) - HOST_LOW_GM_SIZE -

		gvt->gm.vgpu_allocated_low_gm_size;

	high_gm_avail = gvt_hidden_sz(gvt) - HOST_HIGH_GM_SIZE -

		gvt->gm.vgpu_allocated_high_gm_size;

	fence_avail = gvt_fence_sz(gvt) - HOST_FENCE -

		gvt->fence.vgpu_allocated_fence_num;

	mutex_unlock(&gvt->lock);



	return min3(low_gm_avail / type->conf->low_mm,

		    high_gm_avail / type->conf->high_mm,

		    fence_avail / type->conf->fence);

}



static struct mdev_driver intel_vgpu_mdev_driver = {

	.device_api	= VFIO_DEVICE_API_PCI_STRING,

	.driver = {
@@ -1542,6 +1551,7 @@ static struct mdev_driver intel_vgpu_mdev_driver = { 
	},

	.probe		= intel_vgpu_probe,

	.remove		= intel_vgpu_remove,

	.get_available	= intel_vgpu_get_available,

	.types_attrs	= gvt_type_attrs,

};

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

+3 −38
Original line number Diff line number Diff line
@@ -129,11 +129,11 @@ int intel_gvt_init_vgpu_types(struct intel_gvt *gvt) 
		sprintf(gvt->types[i].name, "GVTg_V%u_%s",

			GRAPHICS_VER(gvt->gt->i915) == 8 ? 4 : 5, conf->name);

		gvt->types[i].conf = conf;

		gvt->types[i].avail_instance = min(low_avail / conf->low_mm,

						   high_avail / conf->high_mm);



		gvt_dbg_core("type[%d]: %s avail %u low %u high %u fence %u weight %u res %s\n",

			     i, gvt->types[i].name, gvt->types[i].avail_instance,

			     i, gvt->types[i].name,

			     min(low_avail / conf->low_mm,

				 high_avail / conf->high_mm),

			     conf->low_mm, conf->high_mm, conf->fence,

			     conf->weight, vgpu_edid_str(conf->edid));
@@ -157,36 +157,6 @@ void intel_gvt_clean_vgpu_types(struct intel_gvt *gvt) 
	kfree(gvt->types);

}



static void intel_gvt_update_vgpu_types(struct intel_gvt *gvt)

{

	int i;

	unsigned int low_gm_avail, high_gm_avail, fence_avail;

	unsigned int low_gm_min, high_gm_min, fence_min;



	/* Need to depend on maxium hw resource size but keep on

	 * static config for now.

	 */

	low_gm_avail = gvt_aperture_sz(gvt) - HOST_LOW_GM_SIZE -

		gvt->gm.vgpu_allocated_low_gm_size;

	high_gm_avail = gvt_hidden_sz(gvt) - HOST_HIGH_GM_SIZE -

		gvt->gm.vgpu_allocated_high_gm_size;

	fence_avail = gvt_fence_sz(gvt) - HOST_FENCE -

		gvt->fence.vgpu_allocated_fence_num;



	for (i = 0; i < gvt->num_types; i++) {

		low_gm_min = low_gm_avail / gvt->types[i].conf->low_mm;

		high_gm_min = high_gm_avail / gvt->types[i].conf->high_mm;

		fence_min = fence_avail / gvt->types[i].conf->fence;

		gvt->types[i].avail_instance = min(min(low_gm_min, high_gm_min),

						   fence_min);



		gvt_dbg_core("update type[%d]: %s avail %u low %u high %u fence %u\n",

		       i, gvt->types[i].name,

		       gvt->types[i].avail_instance, gvt->types[i].conf->low_mm,

		       gvt->types[i].conf->high_mm, gvt->types[i].conf->fence);

	}

}



/**

 * intel_gvt_active_vgpu - activate a virtual GPU

 * @vgpu: virtual GPU
@@ -281,10 +251,6 @@ void intel_gvt_destroy_vgpu(struct intel_vgpu *vgpu) 
	intel_vgpu_clean_mmio(vgpu);

	intel_vgpu_dmabuf_cleanup(vgpu);

	mutex_unlock(&vgpu->vgpu_lock);



	mutex_lock(&gvt->lock);

	intel_gvt_update_vgpu_types(gvt);

	mutex_unlock(&gvt->lock);

}



#define IDLE_VGPU_IDR 0
@@ -414,7 +380,6 @@ int intel_gvt_create_vgpu(struct intel_vgpu *vgpu, 
	if (ret)

		goto out_clean_sched_policy;



	intel_gvt_update_vgpu_types(gvt);

	intel_gvt_update_reg_whitelist(vgpu);

	mutex_unlock(&gvt->lock);

	return 0;

drivers/s390/cio/vfio_ccw_ops.c

+3 −11
Original line number Diff line number Diff line
@@ -44,20 +44,12 @@ static void vfio_ccw_dma_unmap(struct vfio_device *vdev, u64 iova, u64 length) 
	vfio_ccw_mdev_reset(private);

}



static ssize_t available_instances_show(struct mdev_type *mtype,

					struct mdev_type_attribute *attr,

					char *buf)

static unsigned int vfio_ccw_get_available(struct mdev_type *mtype)

{

	struct vfio_ccw_private *private = dev_get_drvdata(mtype->parent->dev);



	return sprintf(buf, "%d\n", atomic_read(&private->avail));

	return atomic_read(&private->avail);

}

static MDEV_TYPE_ATTR_RO(available_instances);



static const struct attribute *mdev_types_attrs[] = {

	&mdev_type_attr_available_instances.attr,

	NULL,

};



static int vfio_ccw_mdev_init_dev(struct vfio_device *vdev)

{
@@ -620,5 +612,5 @@ struct mdev_driver vfio_ccw_mdev_driver = { 
	},

	.probe = vfio_ccw_mdev_probe,

	.remove = vfio_ccw_mdev_remove,

	.types_attrs = mdev_types_attrs,

	.get_available = vfio_ccw_get_available,

};