[04/26] drm/xe/eudebug: Introduce exec_queue events

Message ID	20241209133318.1806472-5-mika.kuoppala@linux.intel.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <dri-devel-bounces@lists.freedesktop.org> From: Mika Kuoppala <mika.kuoppala@linux.intel.com> To: intel-xe@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org, christian.koenig@amd.com, Dominik Grzegorzek <dominik.grzegorzek@intel.com>, Maciej Patelczyk <maciej.patelczyk@intel.com>, Mika Kuoppala <mika.kuoppala@linux.intel.com> Subject: [PATCH 04/26] drm/xe/eudebug: Introduce exec_queue events Date: Mon, 9 Dec 2024 15:32:55 +0200 Message-ID: <20241209133318.1806472-5-mika.kuoppala@linux.intel.com> In-Reply-To: <20241209133318.1806472-1-mika.kuoppala@linux.intel.com> References: <20241209133318.1806472-1-mika.kuoppala@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: list Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" <dri-devel-bounces@lists.freedesktop.org>
Series	Intel Xe GPU debug support (eudebug) v3 \| expand [00/26] Intel Xe GPU debug support (eudebug) v3 [01/26] ptrace: export ptrace_may_access [02/26] drm/xe/eudebug: Introduce eudebug support [03/26] drm/xe/eudebug: Introduce discovery for resources [04/26] drm/xe/eudebug: Introduce exec_queue events [05/26] drm/xe/eudebug: Introduce exec queue placements event [06/26] drm/xe/eudebug: hw enablement for eudebug [07/26] drm/xe: Add EUDEBUG_ENABLE exec queue property [08/26] drm/xe/eudebug: Introduce per device attention scan worker [09/26] drm/xe/eudebug: Introduce EU control interface [10/26] drm/xe/eudebug: Add vm bind and vm bind ops [11/26] drm/xe/eudebug: Add UFENCE events with acks [12/26] drm/xe/eudebug: vm open/pread/pwrite [13/26] drm/xe: add system memory page iterator support to xe_res_cursor [14/26] drm/xe/eudebug: implement userptr_vma access [15/26] drm/xe: Debug metadata create/destroy ioctls [16/26] drm/xe: Attach debug metadata to vma [17/26] drm/xe/eudebug: Add debug metadata support for xe_eudebug [18/26] drm/xe/eudebug: Implement vm_bind_op discovery [19/26] drm/xe/eudebug: Dynamically toggle debugger functionality [20/26] drm/xe/eudebug_test: Introduce xe_eudebug wa kunit test [21/26] drm/xe/eudebug/ptl: Add support for extra attention register [22/26] drm/xe/eudebug/ptl: Add RCU_DEBUG_1 register support for xe3 [23/26] drm/xe/eudebug: Add read/count/compare helper for eu attention [24/26] drm/xe/eudebug: Introduce EU pagefault handling interface [25/26] drm/xe/vm: Support for adding null page VMA to VM on request [26/26] drm/xe/eudebug: Enable EU pagefault handling

diff --git a/drivers/gpu/drm/xe/xe_eudebug.c b/drivers/gpu/drm/xe/xe_eudebug.c index 228bc36342ba..3ca46ec838b9 100644 --- a/drivers/gpu/drm/xe/xe_eudebug.c +++ b/drivers/gpu/drm/xe/xe_eudebug.c @@ -14,6 +14,7 @@ #include "xe_device.h" #include "xe_eudebug.h" #include "xe_eudebug_types.h" +#include "xe_exec_queue.h" #include "xe_macros.h" #include "xe_vm.h" @@ -716,7 +717,7 @@ static struct xe_eudebug_event * xe_eudebug_create_event(struct xe_eudebug *d, u16 type, u64 seqno, u16 flags, u32 len) { - const u16 max_event = DRM_XE_EUDEBUG_EVENT_VM; + const u16 max_event = DRM_XE_EUDEBUG_EVENT_EXEC_QUEUE; const u16 known_flags = DRM_XE_EUDEBUG_EVENT_CREATE | DRM_XE_EUDEBUG_EVENT_DESTROY | @@ -751,7 +752,7 @@ static long xe_eudebug_read_event(struct xe_eudebug *d, u64_to_user_ptr(arg); struct drm_xe_eudebug_event user_event; struct xe_eudebug_event *event; - const unsigned int max_event = DRM_XE_EUDEBUG_EVENT_VM; + const unsigned int max_event = DRM_XE_EUDEBUG_EVENT_EXEC_QUEUE; long ret = 0; if (XE_IOCTL_DBG(xe, copy_from_user(&user_event, user_orig, sizeof(user_event)))) @@ -1159,8 +1160,183 @@ void xe_eudebug_vm_destroy(struct xe_file *xef, struct xe_vm *vm) xe_eudebug_event_put(d, vm_destroy_event(d, xef, vm)); } +static bool exec_queue_class_is_tracked(enum xe_engine_class class) +{ + return class == XE_ENGINE_CLASS_COMPUTE || + class == XE_ENGINE_CLASS_RENDER; +} + +static const u16 xe_to_user_engine_class[] = { + [XE_ENGINE_CLASS_RENDER] = DRM_XE_ENGINE_CLASS_RENDER, + [XE_ENGINE_CLASS_COPY] = DRM_XE_ENGINE_CLASS_COPY, + [XE_ENGINE_CLASS_VIDEO_DECODE] = DRM_XE_ENGINE_CLASS_VIDEO_DECODE, + [XE_ENGINE_CLASS_VIDEO_ENHANCE] = DRM_XE_ENGINE_CLASS_VIDEO_ENHANCE, + [XE_ENGINE_CLASS_COMPUTE] = DRM_XE_ENGINE_CLASS_COMPUTE, +}; + +static int send_exec_queue_event(struct xe_eudebug *d, u32 flags, + u64 client_handle, u64 vm_handle, + u64 exec_queue_handle, enum xe_engine_class class, + u32 width, u64 *lrc_handles, u64 seqno) +{ + struct xe_eudebug_event *event; + struct xe_eudebug_event_exec_queue *e; + const u32 sz = struct_size(e, lrc_handle, width); + const u32 xe_engine_class = xe_to_user_engine_class[class]; + + if (!exec_queue_class_is_tracked(class)) + return -EINVAL; + + event = xe_eudebug_create_event(d, DRM_XE_EUDEBUG_EVENT_EXEC_QUEUE, + seqno, flags, sz); + if (!event) + return -ENOMEM; + + e = cast_event(e, event); + + write_member(struct drm_xe_eudebug_event_exec_queue, e, client_handle, client_handle); + write_member(struct drm_xe_eudebug_event_exec_queue, e, vm_handle, vm_handle); + write_member(struct drm_xe_eudebug_event_exec_queue, e, exec_queue_handle, + exec_queue_handle); + write_member(struct drm_xe_eudebug_event_exec_queue, e, engine_class, xe_engine_class); + write_member(struct drm_xe_eudebug_event_exec_queue, e, width, width); + + memcpy(e->lrc_handle, lrc_handles, width); + + return xe_eudebug_queue_event(d, event); +} + +static int exec_queue_create_event(struct xe_eudebug *d, + struct xe_file *xef, struct xe_exec_queue *q) +{ + int h_c, h_vm, h_queue; + u64 h_lrc[XE_HW_ENGINE_MAX_INSTANCE], seqno; + int i; + + if (!xe_exec_queue_is_lr(q)) + return 0; + + h_c = find_handle(d->res, XE_EUDEBUG_RES_TYPE_CLIENT, xef); + if (h_c < 0) + return h_c; + + h_vm = find_handle(d->res, XE_EUDEBUG_RES_TYPE_VM, q->vm); + if (h_vm < 0) + return h_vm; + + if (XE_WARN_ON(q->width >= XE_HW_ENGINE_MAX_INSTANCE)) + return -EINVAL; + + for (i = 0; i < q->width; i++) { + int h, ret; + + ret = _xe_eudebug_add_handle(d, + XE_EUDEBUG_RES_TYPE_LRC, + q->lrc[i], + NULL, + &h); + + if (ret < 0 && ret != -EEXIST) + return ret; + + XE_WARN_ON(!h); + + h_lrc[i] = h; + } + + h_queue = xe_eudebug_add_handle(d, XE_EUDEBUG_RES_TYPE_EXEC_QUEUE, q, &seqno); + if (h_queue <= 0) + return h_queue; + + /* No need to cleanup for added handles on error as if we fail + * we disconnect + */ + + return send_exec_queue_event(d, DRM_XE_EUDEBUG_EVENT_CREATE, + h_c, h_vm, h_queue, q->class, + q->width, h_lrc, seqno); +} + +static int exec_queue_destroy_event(struct xe_eudebug *d, + struct xe_file *xef, + struct xe_exec_queue *q) +{ + int h_c, h_vm, h_queue; + u64 h_lrc[XE_HW_ENGINE_MAX_INSTANCE], seqno; + int i; + + if (!xe_exec_queue_is_lr(q)) + return 0; + + h_c = find_handle(d->res, XE_EUDEBUG_RES_TYPE_CLIENT, xef); + if (h_c < 0) + return h_c; + + h_vm = find_handle(d->res, XE_EUDEBUG_RES_TYPE_VM, q->vm); + if (h_vm < 0) + return h_vm; + + if (XE_WARN_ON(q->width >= XE_HW_ENGINE_MAX_INSTANCE)) + return -EINVAL; + + h_queue = xe_eudebug_remove_handle(d, + XE_EUDEBUG_RES_TYPE_EXEC_QUEUE, + q, + &seqno); + if (h_queue <= 0) + return h_queue; + + for (i = 0; i < q->width; i++) { + int ret; + + ret = _xe_eudebug_remove_handle(d, + XE_EUDEBUG_RES_TYPE_LRC, + q->lrc[i], + NULL); + if (ret < 0 && ret != -ENOENT) + return ret; + + XE_WARN_ON(!ret); + + h_lrc[i] = ret; + } + + return send_exec_queue_event(d, DRM_XE_EUDEBUG_EVENT_DESTROY, + h_c, h_vm, h_queue, q->class, + q->width, h_lrc, seqno); +} + +void xe_eudebug_exec_queue_create(struct xe_file *xef, struct xe_exec_queue *q) +{ + struct xe_eudebug *d; + + if (!exec_queue_class_is_tracked(q->class)) + return; + + d = xe_eudebug_get(xef); + if (!d) + return; + + xe_eudebug_event_put(d, exec_queue_create_event(d, xef, q)); +} + +void xe_eudebug_exec_queue_destroy(struct xe_file *xef, struct xe_exec_queue *q) +{ + struct xe_eudebug *d; + + if (!exec_queue_class_is_tracked(q->class)) + return; + + d = xe_eudebug_get(xef); + if (!d) + return; + + xe_eudebug_event_put(d, exec_queue_destroy_event(d, xef, q)); +} + static int discover_client(struct xe_eudebug *d, struct xe_file *xef) { + struct xe_exec_queue *q; struct xe_vm *vm; unsigned long i; int err; @@ -1175,6 +1351,15 @@ static int discover_client(struct xe_eudebug *d, struct xe_file *xef) break; } + xa_for_each(&xef->exec_queue.xa, i, q) { + if (!exec_queue_class_is_tracked(q->class)) + continue; + + err = exec_queue_create_event(d, xef, q); + if (err) + break; + } + return err; } diff --git a/drivers/gpu/drm/xe/xe_eudebug.h b/drivers/gpu/drm/xe/xe_eudebug.h index e3247365f72f..326ddbd50651 100644 --- a/drivers/gpu/drm/xe/xe_eudebug.h +++ b/drivers/gpu/drm/xe/xe_eudebug.h @@ -10,6 +10,7 @@ struct drm_file; struct xe_device; struct xe_file; struct xe_vm; +struct xe_exec_queue; #if IS_ENABLED(CONFIG_DRM_XE_EUDEBUG) @@ -26,6 +27,9 @@ void xe_eudebug_file_close(struct xe_file *xef); void xe_eudebug_vm_create(struct xe_file *xef, struct xe_vm *vm); void xe_eudebug_vm_destroy(struct xe_file *xef, struct xe_vm *vm); +void xe_eudebug_exec_queue_create(struct xe_file *xef, struct xe_exec_queue *q); +void xe_eudebug_exec_queue_destroy(struct xe_file *xef, struct xe_exec_queue *q); + #else static inline int xe_eudebug_connect_ioctl(struct drm_device *dev, @@ -41,6 +45,9 @@ static inline void xe_eudebug_file_close(struct xe_file *xef) { } static inline void xe_eudebug_vm_create(struct xe_file *xef, struct xe_vm *vm) { } static inline void xe_eudebug_vm_destroy(struct xe_file *xef, struct xe_vm *vm) { } +static inline void xe_eudebug_exec_queue_create(struct xe_file *xef, struct xe_exec_queue *q) { } +static inline void xe_eudebug_exec_queue_destroy(struct xe_file *xef, struct xe_exec_queue *q) { } + #endif /* CONFIG_DRM_XE_EUDEBUG */ #endif diff --git a/drivers/gpu/drm/xe/xe_eudebug_types.h b/drivers/gpu/drm/xe/xe_eudebug_types.h index 080a821db3e4..4824c4159036 100644 --- a/drivers/gpu/drm/xe/xe_eudebug_types.h +++ b/drivers/gpu/drm/xe/xe_eudebug_types.h @@ -50,7 +50,9 @@ struct xe_eudebug_resource { #define XE_EUDEBUG_RES_TYPE_CLIENT 0 #define XE_EUDEBUG_RES_TYPE_VM 1 -#define XE_EUDEBUG_RES_TYPE_COUNT (XE_EUDEBUG_RES_TYPE_VM + 1) +#define XE_EUDEBUG_RES_TYPE_EXEC_QUEUE 2 +#define XE_EUDEBUG_RES_TYPE_LRC 3 +#define XE_EUDEBUG_RES_TYPE_COUNT (XE_EUDEBUG_RES_TYPE_LRC + 1) /** * struct xe_eudebug_resources - eudebug resources for all types @@ -173,4 +175,31 @@ struct xe_eudebug_event_vm { u64 vm_handle; }; +/** + * struct xe_eudebug_event_exec_queue - Internal event for + * exec_queue create/destroy + */ +struct xe_eudebug_event_exec_queue { + /** @base: base event */ + struct xe_eudebug_event base; + + /** @client_handle: client for the engine create/destroy */ + u64 client_handle; + + /** @vm_handle: vm handle for the engine create/destroy */ + u64 vm_handle; + + /** @exec_queue_handle: engine handle */ + u64 exec_queue_handle; + + /** @engine_handle: engine class */ + u32 engine_class; + + /** @width: submission width (number BB per exec) for this exec queue */ + u32 width; + + /** @lrc_handles: handles for each logical ring context created with this exec queue */ + u64 lrc_handle[] __counted_by(width); +}; + #endif diff --git a/drivers/gpu/drm/xe/xe_exec_queue.c b/drivers/gpu/drm/xe/xe_exec_queue.c index aab9e561153d..7f5d8af778be 100644 --- a/drivers/gpu/drm/xe/xe_exec_queue.c +++ b/drivers/gpu/drm/xe/xe_exec_queue.c @@ -23,6 +23,7 @@ #include "xe_ring_ops_types.h" #include "xe_trace.h" #include "xe_vm.h" +#include "xe_eudebug.h" enum xe_exec_queue_sched_prop { XE_EXEC_QUEUE_JOB_TIMEOUT = 0, @@ -654,6 +655,8 @@ int xe_exec_queue_create_ioctl(struct drm_device *dev, void *data, args->exec_queue_id = id; + xe_eudebug_exec_queue_create(xef, q); + return 0; kill_exec_queue: @@ -840,6 +843,8 @@ int xe_exec_queue_destroy_ioctl(struct drm_device *dev, void *data, if (q->vm && q->hwe->hw_engine_group) xe_hw_engine_group_del_exec_queue(q->hwe->hw_engine_group, q); + xe_eudebug_exec_queue_destroy(xef, q); + xe_exec_queue_kill(q); trace_xe_exec_queue_close(q); diff --git a/include/uapi/drm/xe_drm_eudebug.h b/include/uapi/drm/xe_drm_eudebug.h index acf6071c82bf..ac44e890152a 100644 --- a/include/uapi/drm/xe_drm_eudebug.h +++ b/include/uapi/drm/xe_drm_eudebug.h @@ -26,6 +26,7 @@ struct drm_xe_eudebug_event { #define DRM_XE_EUDEBUG_EVENT_READ 1 #define DRM_XE_EUDEBUG_EVENT_OPEN 2 #define DRM_XE_EUDEBUG_EVENT_VM 3 +#define DRM_XE_EUDEBUG_EVENT_EXEC_QUEUE 4 __u16 flags; #define DRM_XE_EUDEBUG_EVENT_CREATE (1 << 0) @@ -49,6 +50,17 @@ struct drm_xe_eudebug_event_vm { __u64 vm_handle; }; +struct drm_xe_eudebug_event_exec_queue { + struct drm_xe_eudebug_event base; + + __u64 client_handle; + __u64 vm_handle; + __u64 exec_queue_handle; + __u32 engine_class; + __u32 width; + __u64 lrc_handle[]; +}; + #if defined(__cplusplus) } #endif

[04/26] drm/xe/eudebug: Introduce exec_queue events

Commit Message

Patch