Commit e670f0b4 authored by Bommu Krishnaiah's avatar Bommu Krishnaiah Committed by Rodrigo Vivi
Browse files

drm/xe/uapi: Return correct error code for xe_wait_user_fence_ioctl 



Currently xe_wait_user_fence_ioctl is not checking exec_queue state
and blocking until timeout, with this patch wakeup the blocking wait
if exec_queue reset happen and returning proper error code

Signed-off-by: default avatarBommu Krishnaiah <krishnaiah.bommu@intel.com>
Cc: Oak Zeng <oak.zeng@intel.com>
Cc: Kempczynski Zbigniew <Zbigniew.Kempczynski@intel.com>
Cc: Matthew Brost <matthew.brost@intel.com>
Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: default avatarMatthew Brost <matthew.brost@intel.com>
Acked-by: default avatarJosé Roberto de Souza <jose.souza@intel.com>
Acked-by: default avatarMateusz Naklicki <mateusz.naklicki@intel.com>
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent 9212da07

drivers/gpu/drm/xe/xe_exec_queue_types.h

+2 −0
Original line number Diff line number Diff line
@@ -217,6 +217,8 @@ struct xe_exec_queue_ops { 
	 * signalled when this function is called.

	 */

	void (*resume)(struct xe_exec_queue *q);

	/** @reset_status: check exec queue reset status */

	bool (*reset_status)(struct xe_exec_queue *q);

};



#endif

drivers/gpu/drm/xe/xe_execlist.c

+7 −0
Original line number Diff line number Diff line
@@ -442,6 +442,12 @@ static void execlist_exec_queue_resume(struct xe_exec_queue *q) 
	/* NIY */

}



static bool execlist_exec_queue_reset_status(struct xe_exec_queue *q)

{

	/* NIY */

	return false;

}



static const struct xe_exec_queue_ops execlist_exec_queue_ops = {

	.init = execlist_exec_queue_init,

	.kill = execlist_exec_queue_kill,
@@ -453,6 +459,7 @@ static const struct xe_exec_queue_ops execlist_exec_queue_ops = { 
	.suspend = execlist_exec_queue_suspend,

	.suspend_wait = execlist_exec_queue_suspend_wait,

	.resume = execlist_exec_queue_resume,

	.reset_status = execlist_exec_queue_reset_status,

};



int xe_execlist_init(struct xe_gt *gt)

drivers/gpu/drm/xe/xe_guc_submit.c

+10 −0
Original line number Diff line number Diff line
@@ -854,6 +854,10 @@ static void simple_error_capture(struct xe_exec_queue *q) 
static void xe_guc_exec_queue_trigger_cleanup(struct xe_exec_queue *q)

{

	struct xe_guc *guc = exec_queue_to_guc(q);

	struct xe_device *xe = guc_to_xe(guc);



	/** to wakeup xe_wait_user_fence ioctl if exec queue is reset */

	wake_up_all(&xe->ufence_wq);



	if (xe_exec_queue_is_lr(q))

		queue_work(guc_to_gt(guc)->ordered_wq, &q->guc->lr_tdr);
@@ -1394,6 +1398,11 @@ static void guc_exec_queue_resume(struct xe_exec_queue *q) 
	guc_exec_queue_add_msg(q, msg, RESUME);

}



static bool guc_exec_queue_reset_status(struct xe_exec_queue *q)

{

	return exec_queue_reset(q);

}



/*

 * All of these functions are an abstraction layer which other parts of XE can

 * use to trap into the GuC backend. All of these functions, aside from init,
@@ -1411,6 +1420,7 @@ static const struct xe_exec_queue_ops guc_exec_queue_ops = { 
	.suspend = guc_exec_queue_suspend,

	.suspend_wait = guc_exec_queue_suspend_wait,

	.resume = guc_exec_queue_resume,

	.reset_status = guc_exec_queue_reset_status,

};



static void guc_exec_queue_stop(struct xe_guc *guc, struct xe_exec_queue *q)

drivers/gpu/drm/xe/xe_wait_user_fence.c

+24 −6
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include "xe_device.h"

#include "xe_gt.h"

#include "xe_macros.h"

#include "xe_exec_queue.h"



static int do_compare(u64 addr, u64 value, u64 mask, u16 op)

{
@@ -100,10 +101,12 @@ int xe_wait_user_fence_ioctl(struct drm_device *dev, void *data, 
			     struct drm_file *file)

{

	struct xe_device *xe = to_xe_device(dev);

	struct xe_file *xef = to_xe_file(file);

	DEFINE_WAIT_FUNC(w_wait, woken_wake_function);

	struct drm_xe_wait_user_fence *args = data;

	struct xe_exec_queue *q = NULL;

	u64 addr = args->addr;

	int err;

	int err = 0;

	long timeout;

	ktime_t start;
@@ -121,6 +124,12 @@ int xe_wait_user_fence_ioctl(struct drm_device *dev, void *data, 
	if (XE_IOCTL_DBG(xe, addr & 0x7))

		return -EINVAL;



	if (args->exec_queue_id) {

		q = xe_exec_queue_lookup(xef, args->exec_queue_id);

		if (XE_IOCTL_DBG(xe, !q))

			return -ENOENT;

	}



	timeout = to_jiffies_timeout(xe, args);



	start = ktime_get();
@@ -136,6 +145,14 @@ int xe_wait_user_fence_ioctl(struct drm_device *dev, void *data, 
			break;

		}



		if (q) {

			if (q->ops->reset_status(q)) {

				drm_info(&xe->drm, "exec gueue reset detected\n");

				err = -EIO;

				break;

			}

		}



		if (!timeout) {

			err = -ETIME;

			break;
@@ -151,10 +168,11 @@ int xe_wait_user_fence_ioctl(struct drm_device *dev, void *data, 
			args->timeout = 0;

	}



	if (XE_IOCTL_DBG(xe, err < 0))

		return err;

	else if (XE_IOCTL_DBG(xe, !timeout))

		return -ETIME;

	if (!timeout && !(err < 0))

		err = -ETIME;



	return 0;

	if (q)

		xe_exec_queue_put(q);



	return err;

}