Commit ce8c161c authored by Umesh Nerlige Ramappa's avatar Umesh Nerlige Ramappa Committed by Lucas De Marchi
Browse files

drm/xe: Add ref counting for xe_file 



Add ref counting for xe_file.

v2:
- Add kernel doc for exported functions (Matt)
- Instead of xe_file_destroy, export the get/put helpers (Lucas)

v3: Fixup the kernel-doc format and description (Matt, Lucas)

Signed-off-by: default avatarUmesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
Reviewed-by: default avatarMatthew Brost <matthew.brost@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240718210548.3580382-3-umesh.nerlige.ramappa@intel.com


Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
parent 3d0c4a62

drivers/gpu/drm/xe/xe_device.c

+31 −2
Original line number Diff line number Diff line
@@ -90,11 +90,14 @@ static int xe_file_open(struct drm_device *dev, struct drm_file *file) 
	spin_unlock(&xe->clients.lock);



	file->driver_priv = xef;

	kref_init(&xef->refcount);



	return 0;

}



static void xe_file_destroy(struct xe_file *xef)

static void xe_file_destroy(struct kref *ref)

{

	struct xe_file *xef = container_of(ref, struct xe_file, refcount);

	struct xe_device *xe = xef->xe;



	xa_destroy(&xef->exec_queue.xa);
@@ -110,6 +113,32 @@ static void xe_file_destroy(struct xe_file *xef) 
	kfree(xef);

}



/**

 * xe_file_get() - Take a reference to the xe file object

 * @xef: Pointer to the xe file

 *

 * Anyone with a pointer to xef must take a reference to the xe file

 * object using this call.

 *

 * Return: xe file pointer

 */

struct xe_file *xe_file_get(struct xe_file *xef)

{

	kref_get(&xef->refcount);

	return xef;

}



/**

 * xe_file_put() - Drop a reference to the xe file object

 * @xef: Pointer to the xe file

 *

 * Used to drop reference to the xef object

 */

void xe_file_put(struct xe_file *xef)

{

	kref_put(&xef->refcount, xe_file_destroy);

}



static void xe_file_close(struct drm_device *dev, struct drm_file *file)

{

	struct xe_file *xef = file->driver_priv;
@@ -132,7 +161,7 @@ static void xe_file_close(struct drm_device *dev, struct drm_file *file) 
		xe_vm_close_and_put(vm);

	mutex_unlock(&xef->vm.lock);



	xe_file_destroy(xef);

	xe_file_put(xef);

}



static const struct drm_ioctl_desc xe_ioctls[] = {

drivers/gpu/drm/xe/xe_device.h

+3 −0
Original line number Diff line number Diff line
@@ -171,4 +171,7 @@ static inline bool xe_device_wedged(struct xe_device *xe) 


void xe_device_declare_wedged(struct xe_device *xe);



struct xe_file *xe_file_get(struct xe_file *xef);

void xe_file_put(struct xe_file *xef);



#endif

drivers/gpu/drm/xe/xe_device_types.h

+3 −0
Original line number Diff line number Diff line
@@ -581,6 +581,9 @@ struct xe_file { 


	/** @client: drm client */

	struct xe_drm_client *client;



	/** @refcount: ref count of this xe file */

	struct kref refcount;

};



#endif