Commit efeff7b3 authored by Matthew Brost's avatar Matthew Brost Committed by Thomas Hellström
Browse files

drm/xe: Only allow 1 ufence per exec / bind IOCTL 



The way exec ufences are coded only 1 ufence per IOCTL will be signaled.
It is possible to fix this but for current use cases 1 ufence per IOCTL
is sufficient. Enforce a limit of 1 ufence per IOCTL (both exec and bind
to be uniform).

v2:
- Add fixes tag (Thomas)

Fixes: dd08ebf6 ("drm/xe: Introduce a new DRM driver for Intel GPUs")
Cc: Mika Kahola <mika.kahola@intel.com>
Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Signed-off-by: default avatarMatthew Brost <matthew.brost@intel.com>
Reviewed-by: default avatarBrian Welty <brian.welty@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240124234413.1640825-1-matthew.brost@intel.com


(cherry picked from commit d1df9bfb)
Signed-off-by: default avatarThomas Hellström <thomas.hellstrom@linux.intel.com>
parent 6d209623

drivers/gpu/drm/xe/xe_exec.c

+9 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ int xe_exec_ioctl(struct drm_device *dev, void *data, struct drm_file *file) 
	u64 addresses[XE_HW_ENGINE_MAX_INSTANCE];

	struct drm_gpuvm_exec vm_exec = {.extra.fn = xe_exec_fn};

	struct drm_exec *exec = &vm_exec.exec;

	u32 i, num_syncs = 0;

	u32 i, num_syncs = 0, num_ufence = 0;

	struct xe_sched_job *job;

	struct dma_fence *rebind_fence;

	struct xe_vm *vm;
@@ -157,6 +157,14 @@ int xe_exec_ioctl(struct drm_device *dev, void *data, struct drm_file *file) 
					   SYNC_PARSE_FLAG_LR_MODE : 0));

		if (err)

			goto err_syncs;



		if (xe_sync_is_ufence(&syncs[i]))

			num_ufence++;

	}



	if (XE_IOCTL_DBG(xe, num_ufence > 1)) {

		err = -EINVAL;

		goto err_syncs;

	}



	if (xe_exec_queue_is_parallel(q)) {

drivers/gpu/drm/xe/xe_sync.h

+5 −0
Original line number Diff line number Diff line
@@ -33,4 +33,9 @@ struct dma_fence * 
xe_sync_in_fence_get(struct xe_sync_entry *sync, int num_sync,

		     struct xe_exec_queue *q, struct xe_vm *vm);



static inline bool xe_sync_is_ufence(struct xe_sync_entry *sync)

{

	return !!sync->ufence;

}



#endif

drivers/gpu/drm/xe/xe_vm.c

+9 −1
Original line number Diff line number Diff line
@@ -2851,7 +2851,7 @@ int xe_vm_bind_ioctl(struct drm_device *dev, void *data, struct drm_file *file) 
	struct drm_gpuva_ops **ops = NULL;

	struct xe_vm *vm;

	struct xe_exec_queue *q = NULL;

	u32 num_syncs;

	u32 num_syncs, num_ufence = 0;

	struct xe_sync_entry *syncs = NULL;

	struct drm_xe_vm_bind_op *bind_ops;

	LIST_HEAD(ops_list);
@@ -2988,6 +2988,14 @@ int xe_vm_bind_ioctl(struct drm_device *dev, void *data, struct drm_file *file) 
					   SYNC_PARSE_FLAG_DISALLOW_USER_FENCE : 0));

		if (err)

			goto free_syncs;



		if (xe_sync_is_ufence(&syncs[num_syncs]))

			num_ufence++;

	}



	if (XE_IOCTL_DBG(xe, num_ufence > 1)) {

		err = -EINVAL;

		goto free_syncs;

	}



	if (!args->num_binds) {