Commit 1f154172 authored by Thomas Hellström's avatar Thomas Hellström
Browse files

drm/xe: Rework instances of variants of xe_bo_create_locked() 



A common pattern is to create a locked bo, pin it without mapping
and then unlock it. Add a function to do that, which internally
uses xe_validation_guard().
With that we can remove xe_bo_create_locked_range() and add
exhaustive eviction to stolen, pf_provision_vf_lmem and
psmi_alloc_object.

v4:
- New patch after reorganization.
v5:
- Replace DRM_XE_GEM_CPU_CACHING_WB with 0. (CI)

Signed-off-by: default avatarThomas Hellström <thomas.hellstrom@linux.intel.com>
Reviewed-by: default avatarMatthew Brost <matthew.brost@intel.com>
Link: https://lore.kernel.org/r/20250908101246.65025-13-thomas.hellstrom@linux.intel.com
parent 59eabff2

drivers/gpu/drm/xe/compat-i915-headers/gem/i915_gem_stolen.h

+2 −11
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ static inline int i915_gem_stolen_insert_node_in_range(struct xe_device *xe, 
						       u32 size, u32 align,

						       u32 start, u32 end)

{

	struct drm_exec *exec = XE_VALIDATION_UNIMPLEMENTED;

	struct xe_bo *bo;

	int err;

	u32 flags = XE_BO_FLAG_PINNED | XE_BO_FLAG_STOLEN;
@@ -34,21 +33,13 @@ static inline int i915_gem_stolen_insert_node_in_range(struct xe_device *xe, 
		start = ALIGN(start, align);

	}



	bo = xe_bo_create_locked_range(xe, xe_device_get_root_tile(xe),

				       NULL, size, start, end,

				       ttm_bo_type_kernel, flags, 0, exec);

	bo = xe_bo_create_pin_range_novm(xe, xe_device_get_root_tile(xe),

					 size, start, end, ttm_bo_type_kernel, flags);

	if (IS_ERR(bo)) {

		err = PTR_ERR(bo);

		bo = NULL;

		return err;

	}

	err = xe_bo_pin(bo, exec);

	xe_bo_unlock_vm_held(bo);



	if (err) {

		xe_bo_put(fb->bo);

		bo = NULL;

	}



	fb->bo = bo;

drivers/gpu/drm/xe/xe_bo.c

+52 −34
Original line number Diff line number Diff line
@@ -2309,37 +2309,6 @@ __xe_bo_create_locked(struct xe_device *xe, 
	return ERR_PTR(err);

}



/**

 * xe_bo_create_locked_range() - Create a BO with range- and alignment options

 * @xe: The xe device.

 * @tile: The tile to select for migration of this bo, and the tile used for

 * GGTT binding if any. Only to be non-NULL for ttm_bo_type_kernel bos.

 * @vm: The local vm or NULL for external objects.

 * @size: The storage size to use for the bo.

 * @start: Start of fixed VRAM range or 0.

 * @end: End of fixed VRAM range or ~0ULL.

 * @type: The TTM buffer object type.

 * @flags: XE_BO_FLAG_ flags.

 * @alignment: For GGTT buffer objects, the minimum GGTT alignment.

 * @exec: The drm_exec transaction to use for exhaustive eviction.

 *

 * Create an Xe BO with range- and alignment options. If @start and @end indicate

 * a fixed VRAM range, this must be a ttm_bo_type_kernel bo with VRAM placement

 * only. The @alignment parameter can be used for GGTT alignment.

 *

 * Return: The buffer object on success. Negative error pointer on failure.

 */

struct xe_bo *

xe_bo_create_locked_range(struct xe_device *xe,

			  struct xe_tile *tile, struct xe_vm *vm,

			  size_t size, u64 start, u64 end,

			  enum ttm_bo_type type, u32 flags, u64 alignment,

			  struct drm_exec *exec)

{

	return __xe_bo_create_locked(xe, tile, vm, size, start, end, 0, type,

				     flags, alignment, exec);

}



/**

 * xe_bo_create_locked() - Create a BO

 * @xe: The xe device.
@@ -2428,6 +2397,55 @@ struct xe_bo *xe_bo_create_user(struct xe_device *xe, 
	return bo;

}



/**

 * xe_bo_create_pin_range_novm() - Create and pin a BO with range options.

 * @xe: The xe device.

 * @tile: The tile to select for migration of this bo, and the tile used for

 * GGTT binding if any. Only to be non-NULL for ttm_bo_type_kernel bos.

 * @size: The storage size to use for the bo.

 * @start: Start of fixed VRAM range or 0.

 * @end: End of fixed VRAM range or ~0ULL.

 * @type: The TTM buffer object type.

 * @flags: XE_BO_FLAG_ flags.

 *

 * Create an Xe BO with range- and options. If @start and @end indicate

 * a fixed VRAM range, this must be a ttm_bo_type_kernel bo with VRAM placement

 * only.

 *

 * Return: The buffer object on success. Negative error pointer on failure.

 */

struct xe_bo *xe_bo_create_pin_range_novm(struct xe_device *xe, struct xe_tile *tile,

					  size_t size, u64 start, u64 end,

					  enum ttm_bo_type type, u32 flags)

{

	struct xe_validation_ctx ctx;

	struct drm_exec exec;

	struct xe_bo *bo;

	int err = 0;



	xe_validation_guard(&ctx, &xe->val, &exec, (struct xe_val_flags) {}, err) {

		bo = __xe_bo_create_locked(xe, tile, NULL, size, start, end,

					   0, type, flags, 0, &exec);

		if (IS_ERR(bo)) {

			drm_exec_retry_on_contention(&exec);

			err = PTR_ERR(bo);

			xe_validation_retry_on_oom(&ctx, &err);

			break;

		}



		err = xe_bo_pin(bo, &exec);

		xe_bo_unlock(bo);

		if (err) {

			xe_bo_put(bo);

			drm_exec_retry_on_contention(&exec);

			xe_validation_retry_on_oom(&ctx, &err);

			break;

		}

	}



	return err ? ERR_PTR(err) : bo;

}



static struct xe_bo *xe_bo_create_pin_map_at_aligned(struct xe_device *xe,

						     struct xe_tile *tile,

						     struct xe_vm *vm,
@@ -2444,7 +2462,7 @@ static struct xe_bo *xe_bo_create_pin_map_at_aligned(struct xe_device *xe, 
	    xe_ttm_stolen_cpu_access_needs_ggtt(xe))

		flags |= XE_BO_FLAG_GGTT;



	bo = xe_bo_create_locked_range(xe, tile, vm, size, start, end, type,

	bo = __xe_bo_create_locked(xe, tile, vm, size, start, end, 0, type,

				   flags | XE_BO_FLAG_NEEDS_CPU_ACCESS | XE_BO_FLAG_PINNED,

				   alignment, exec);

	if (IS_ERR(bo))

drivers/gpu/drm/xe/xe_bo.h

+3 −6
Original line number Diff line number Diff line
@@ -94,12 +94,6 @@ struct xe_bo *xe_bo_init_locked(struct xe_device *xe, struct xe_bo *bo, 
				struct ttm_lru_bulk_move *bulk, size_t size,

				u16 cpu_caching, enum ttm_bo_type type,

				u32 flags, struct drm_exec *exec);

struct xe_bo *

xe_bo_create_locked_range(struct xe_device *xe,

			  struct xe_tile *tile, struct xe_vm *vm,

			  size_t size, u64 start, u64 end,

			  enum ttm_bo_type type, u32 flags, u64 alignment,

			  struct drm_exec *exec);

struct xe_bo *xe_bo_create_locked(struct xe_device *xe, struct xe_tile *tile,

				  struct xe_vm *vm, size_t size,

				  enum ttm_bo_type type, u32 flags,
@@ -113,6 +107,9 @@ struct xe_bo *xe_bo_create_pin_map(struct xe_device *xe, struct xe_tile *tile, 
struct xe_bo *xe_bo_create_pin_map_novm(struct xe_device *xe, struct xe_tile *tile,

					size_t size, enum ttm_bo_type type, u32 flags,

					bool intr);

struct xe_bo *xe_bo_create_pin_range_novm(struct xe_device *xe, struct xe_tile *tile,

					  size_t size, u64 start, u64 end,

					  enum ttm_bo_type type, u32 flags);

struct xe_bo *

xe_bo_create_pin_map_at_novm(struct xe_device *xe, struct xe_tile *tile,

			     size_t size, u64 offset, enum ttm_bo_type type,

drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c

+7 −16
Original line number Diff line number Diff line
@@ -1452,7 +1452,6 @@ static bool pf_release_vf_config_lmem(struct xe_gt *gt, struct xe_gt_sriov_confi 
static int pf_provision_vf_lmem(struct xe_gt *gt, unsigned int vfid, u64 size)

{

	struct xe_gt_sriov_config *config = pf_pick_vf_config(gt, vfid);

	struct drm_exec *exec = XE_VALIDATION_UNIMPLEMENTED;

	struct xe_device *xe = gt_to_xe(gt);

	struct xe_tile *tile = gt_to_tile(gt);

	struct xe_bo *bo;
@@ -1479,24 +1478,16 @@ static int pf_provision_vf_lmem(struct xe_gt *gt, unsigned int vfid, u64 size) 
		return 0;



	xe_gt_assert(gt, pf_get_lmem_alignment(gt) == SZ_2M);

	bo = xe_bo_create_locked(xe, tile, NULL,

				 ALIGN(size, PAGE_SIZE),

	bo = xe_bo_create_pin_range_novm(xe, tile,

					 ALIGN(size, PAGE_SIZE), 0, ~0ull,

					 ttm_bo_type_kernel,

					 XE_BO_FLAG_VRAM_IF_DGFX(tile) |

					 XE_BO_FLAG_NEEDS_2M |

					 XE_BO_FLAG_PINNED |

				 XE_BO_FLAG_PINNED_LATE_RESTORE,

				 exec);

					 XE_BO_FLAG_PINNED_LATE_RESTORE);

	if (IS_ERR(bo))

		return PTR_ERR(bo);



	err = xe_bo_pin(bo, exec);

	xe_bo_unlock(bo);

	if (unlikely(err)) {

		xe_bo_put(bo);

		return err;

	}



	config->lmem_obj = bo;



	if (xe_device_has_lmtt(xe)) {

drivers/gpu/drm/xe/xe_psmi.c

+6 −20
Original line number Diff line number Diff line
@@ -68,10 +68,7 @@ static void psmi_cleanup(struct xe_device *xe) 
static struct xe_bo *psmi_alloc_object(struct xe_device *xe,

				       unsigned int id, size_t bo_size)

{

	struct drm_exec *exec = XE_VALIDATION_UNIMPLEMENTED;

	struct xe_bo *bo = NULL;

	struct xe_tile *tile;

	int err;



	if (!id || !bo_size)

		return NULL;
@@ -79,23 +76,12 @@ static struct xe_bo *psmi_alloc_object(struct xe_device *xe, 
	tile = &xe->tiles[id - 1];



	/* VRAM: Allocate GEM object for the capture buffer */

	bo = xe_bo_create_locked(xe, tile, NULL, bo_size,

	return xe_bo_create_pin_range_novm(xe, tile, bo_size, 0, ~0ull,

					   ttm_bo_type_kernel,

					   XE_BO_FLAG_VRAM_IF_DGFX(tile) |

					   XE_BO_FLAG_PINNED |

					   XE_BO_FLAG_PINNED_LATE_RESTORE |

				 XE_BO_FLAG_NEEDS_CPU_ACCESS,

				 exec);



	if (!IS_ERR(bo)) {

		/* Buffer written by HW, ensure stays resident */

		err = xe_bo_pin(bo, exec);

		if (err)

			bo = ERR_PTR(err);

		xe_bo_unlock(bo);

	}



	return bo;

					   XE_BO_FLAG_NEEDS_CPU_ACCESS);

}



/*