Commit 17a93473 authored by Nicolin Chen's avatar Nicolin Chen Committed by Jason Gunthorpe
Browse files

iommufd: Move _iommufd_object_alloc out of driver.c 

Now, all driver structures will be allocated by the core, i.e. no longer a
need of driver calling _iommufd_object_alloc. Thus, move it back.

Before:
   text	   data	    bss	    dec	    hex	filename
   3024	    180	      0	   3204	    c84	drivers/iommu/iommufd/driver.o
   9074	    610	     64	   9748	   2614	drivers/iommu/iommufd/main.o
After:
   text	   data	    bss	    dec	    hex	filename
   2665	    164	      0	   2829	    b0d	drivers/iommu/iommufd/driver.o
   9410	    618	     64	  10092	   276c	drivers/iommu/iommufd/main.o

Link: https://patch.msgid.link/r/79e630c7b911930cf36e3c8a775a04e66c528d65.1749882255.git.nicolinc@nvidia.com


Reviewed-by: default avatarKevin Tian <kevin.tian@intel.com>
Reviewed-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Signed-off-by: default avatarNicolin Chen <nicolinc@nvidia.com>
Reviewed-by: default avatarLu Baolu <baolu.lu@linux.intel.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent f842ea20

drivers/iommu/iommufd/driver.c

+0 −33
Original line number Diff line number Diff line
@@ -3,39 +3,6 @@ 
 */

#include "iommufd_private.h"



struct iommufd_object *_iommufd_object_alloc(struct iommufd_ctx *ictx,

					     size_t size,

					     enum iommufd_object_type type)

{

	struct iommufd_object *obj;

	int rc;



	obj = kzalloc(size, GFP_KERNEL_ACCOUNT);

	if (!obj)

		return ERR_PTR(-ENOMEM);

	obj->type = type;

	/* Starts out bias'd by 1 until it is removed from the xarray */

	refcount_set(&obj->shortterm_users, 1);

	refcount_set(&obj->users, 1);



	/*

	 * Reserve an ID in the xarray but do not publish the pointer yet since

	 * the caller hasn't initialized it yet. Once the pointer is published

	 * in the xarray and visible to other threads we can't reliably destroy

	 * it anymore, so the caller must complete all errorable operations

	 * before calling iommufd_object_finalize().

	 */

	rc = xa_alloc(&ictx->objects, &obj->id, XA_ZERO_ENTRY, xa_limit_31b,

		      GFP_KERNEL_ACCOUNT);

	if (rc)

		goto out_free;

	return obj;

out_free:

	kfree(obj);

	return ERR_PTR(rc);

}

EXPORT_SYMBOL_NS_GPL(_iommufd_object_alloc, "IOMMUFD");



/* Caller should xa_lock(&viommu->vdevs) to protect the return value */

struct device *iommufd_viommu_find_dev(struct iommufd_viommu *viommu,

				       unsigned long vdev_id)

drivers/iommu/iommufd/iommufd_private.h

+4 −0
Original line number Diff line number Diff line
@@ -230,6 +230,10 @@ iommufd_object_put_and_try_destroy(struct iommufd_ctx *ictx, 
	iommufd_object_remove(ictx, obj, obj->id, 0);

}



struct iommufd_object *_iommufd_object_alloc(struct iommufd_ctx *ictx,

					     size_t size,

					     enum iommufd_object_type type);



#define __iommufd_object_alloc(ictx, ptr, type, obj)                           \

	container_of(_iommufd_object_alloc(                                    \

			     ictx,                                             \

drivers/iommu/iommufd/main.c

+32 −0
Original line number Diff line number Diff line
@@ -29,6 +29,38 @@ struct iommufd_object_ops { 
static const struct iommufd_object_ops iommufd_object_ops[];

static struct miscdevice vfio_misc_dev;



struct iommufd_object *_iommufd_object_alloc(struct iommufd_ctx *ictx,

					     size_t size,

					     enum iommufd_object_type type)

{

	struct iommufd_object *obj;

	int rc;



	obj = kzalloc(size, GFP_KERNEL_ACCOUNT);

	if (!obj)

		return ERR_PTR(-ENOMEM);

	obj->type = type;

	/* Starts out bias'd by 1 until it is removed from the xarray */

	refcount_set(&obj->shortterm_users, 1);

	refcount_set(&obj->users, 1);



	/*

	 * Reserve an ID in the xarray but do not publish the pointer yet since

	 * the caller hasn't initialized it yet. Once the pointer is published

	 * in the xarray and visible to other threads we can't reliably destroy

	 * it anymore, so the caller must complete all errorable operations

	 * before calling iommufd_object_finalize().

	 */

	rc = xa_alloc(&ictx->objects, &obj->id, XA_ZERO_ENTRY, xa_limit_31b,

		      GFP_KERNEL_ACCOUNT);

	if (rc)

		goto out_free;

	return obj;

out_free:

	kfree(obj);

	return ERR_PTR(rc);

}



/*

 * Allow concurrent access to the object.

 *

include/linux/iommufd.h

+0 −10
Original line number Diff line number Diff line
@@ -190,9 +190,6 @@ static inline int iommufd_vfio_compat_set_no_iommu(struct iommufd_ctx *ictx) 
#endif /* CONFIG_IOMMUFD */



#if IS_ENABLED(CONFIG_IOMMUFD_DRIVER_CORE)

struct iommufd_object *_iommufd_object_alloc(struct iommufd_ctx *ictx,

					     size_t size,

					     enum iommufd_object_type type);

struct device *iommufd_viommu_find_dev(struct iommufd_viommu *viommu,

				       unsigned long vdev_id);

int iommufd_viommu_get_vdev_id(struct iommufd_viommu *viommu,
@@ -201,13 +198,6 @@ int iommufd_viommu_report_event(struct iommufd_viommu *viommu, 
				enum iommu_veventq_type type, void *event_data,

				size_t data_len);

#else /* !CONFIG_IOMMUFD_DRIVER_CORE */

static inline struct iommufd_object *

_iommufd_object_alloc(struct iommufd_ctx *ictx, size_t size,

		      enum iommufd_object_type type)

{

	return ERR_PTR(-EOPNOTSUPP);

}



static inline struct device *

iommufd_viommu_find_dev(struct iommufd_viommu *viommu, unsigned long vdev_id)

{