Commit 5dd933e3 authored by Thomas Hellström's avatar Thomas Hellström
Browse files

drm/xe: Make the gem shrinker drm managed 



Make the xe drm shrinker drm managed like many other resources
created at device creation time.

Signed-off-by: default avatarThomas Hellström <thomas.hellstrom@linux.intel.com>
Reviewed-by: default avatarMatthew Auld <matthew.auld@intel.com>
Link: https://lore.kernel.org/r/20250508113015.3374-1-thomas.hellstrom@linux.intel.com
parent 243bf99e

drivers/gpu/drm/xe/xe_device.c

+3 −6
Original line number Diff line number Diff line
@@ -402,9 +402,6 @@ static void xe_device_destroy(struct drm_device *dev, void *dummy) 
	if (xe->unordered_wq)

		destroy_workqueue(xe->unordered_wq);



	if (!IS_ERR_OR_NULL(xe->mem.shrinker))

		xe_shrinker_destroy(xe->mem.shrinker);



	if (xe->destroy_wq)

		destroy_workqueue(xe->destroy_wq);
@@ -438,9 +435,9 @@ struct xe_device *xe_device_create(struct pci_dev *pdev, 
	if (err)

		goto err;



	xe->mem.shrinker = xe_shrinker_create(xe);

	if (IS_ERR(xe->mem.shrinker))

		return ERR_CAST(xe->mem.shrinker);

	err = xe_shrinker_create(xe);

	if (err)

		goto err;



	xe->info.devid = pdev->device;

	xe->info.revid = pdev->revision;

drivers/gpu/drm/xe/xe_shrinker.c

+18 −19
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 


#include <linux/shrinker.h>



#include <drm/drm_managed.h>

#include <drm/ttm/ttm_backup.h>

#include <drm/ttm/ttm_bo.h>

#include <drm/ttm/ttm_tt.h>
@@ -213,24 +214,34 @@ static void xe_shrinker_pm(struct work_struct *work) 
	xe_pm_runtime_put(shrinker->xe);

}



static void xe_shrinker_fini(struct drm_device *drm, void *arg)

{

	struct xe_shrinker *shrinker = arg;



	xe_assert(shrinker->xe, !shrinker->shrinkable_pages);

	xe_assert(shrinker->xe, !shrinker->purgeable_pages);

	shrinker_free(shrinker->shrink);

	flush_work(&shrinker->pm_worker);

	kfree(shrinker);

}



/**

 * xe_shrinker_create() - Create an xe per-device shrinker

 * @xe: Pointer to the xe device.

 *

 * Returns: A pointer to the created shrinker on success,

 * Negative error code on failure.

 * Return: %0 on success. Negative error code on failure.

 */

struct xe_shrinker *xe_shrinker_create(struct xe_device *xe)

int xe_shrinker_create(struct xe_device *xe)

{

	struct xe_shrinker *shrinker = kzalloc(sizeof(*shrinker), GFP_KERNEL);



	if (!shrinker)

		return ERR_PTR(-ENOMEM);

		return -ENOMEM;



	shrinker->shrink = shrinker_alloc(0, "drm-xe_gem:%s", xe->drm.unique);

	if (!shrinker->shrink) {

		kfree(shrinker);

		return ERR_PTR(-ENOMEM);

		return -ENOMEM;

	}



	INIT_WORK(&shrinker->pm_worker, xe_shrinker_pm);
@@ -240,19 +251,7 @@ struct xe_shrinker *xe_shrinker_create(struct xe_device *xe) 
	shrinker->shrink->scan_objects = xe_shrinker_scan;

	shrinker->shrink->private_data = shrinker;

	shrinker_register(shrinker->shrink);

	xe->mem.shrinker = shrinker;



	return shrinker;

}



/**

 * xe_shrinker_destroy() - Destroy an xe per-device shrinker

 * @shrinker: Pointer to the shrinker to destroy.

 */

void xe_shrinker_destroy(struct xe_shrinker *shrinker)

{

	xe_assert(shrinker->xe, !shrinker->shrinkable_pages);

	xe_assert(shrinker->xe, !shrinker->purgeable_pages);

	shrinker_free(shrinker->shrink);

	flush_work(&shrinker->pm_worker);

	kfree(shrinker);

	return drmm_add_action_or_reset(&xe->drm, xe_shrinker_fini, shrinker);

}

drivers/gpu/drm/xe/xe_shrinker.h

+1 −3
Original line number Diff line number Diff line
@@ -11,8 +11,6 @@ struct xe_device; 


void xe_shrinker_mod_pages(struct xe_shrinker *shrinker, long shrinkable, long purgeable);



struct xe_shrinker *xe_shrinker_create(struct xe_device *xe);



void xe_shrinker_destroy(struct xe_shrinker *shrinker);

int xe_shrinker_create(struct xe_device *xe);



#endif