drm/xe/trace: Extract bo, vm, vma traces

xe_trace.h is starting to get over crowded. Move the traces
related to bo, vm, vma's to its own file.

v2: Update year in License(Gustavo)

Reviewed-by: Gustavo Sousa <gustavo.sousa@intel.com>
Suggested-by: Jani Nikula <jani.nikula@intel.com>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com>
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240607182943.3572524-2-radhakrishna.sripada@intel.com

diff --git a/drivers/gpu/drm/xe/Makefile b/drivers/gpu/drm/xe/Makefile
index 70738d1f85e9cd3c7f3831ecdb0fa514ed51403b..59c8513cb130359de9e3a2d1b626e032ca1d84b0 100644 (file)
--- a/drivers/gpu/drm/xe/Makefile
+++ b/drivers/gpu/drm/xe/Makefile
@@ -112,6 +112,7 @@ xe-y += xe_bb.o \
        xe_tile.o \
        xe_tile_sysfs.o \
        xe_trace.o \
+       xe_trace_bo.o \
        xe_ttm_sys_mgr.o \
        xe_ttm_stolen_mgr.o \
        xe_ttm_vram_mgr.o \

diff --git a/drivers/gpu/drm/xe/xe_bo.c b/drivers/gpu/drm/xe/xe_bo.c
index 2bae01ce4e5b915c45834ecd28910a20916d14fa..74294f1b05bc3222e83f02e7d51733ece4673393 100644 (file)
--- a/drivers/gpu/drm/xe/xe_bo.c
+++ b/drivers/gpu/drm/xe/xe_bo.c
@@ -25,7 +25,7 @@
 #include "xe_pm.h"
 #include "xe_preempt_fence.h"
 #include "xe_res_cursor.h"
-#include "xe_trace.h"
+#include "xe_trace_bo.h"
 #include "xe_ttm_stolen_mgr.h"
 #include "xe_vm.h"
 

diff --git a/drivers/gpu/drm/xe/xe_gt_pagefault.c b/drivers/gpu/drm/xe/xe_gt_pagefault.c
index eaf68f0135c19afab4ccf6472c13d61b994f3e48..9292d54688684eb93aee178e07c29dbccce340a9 100644 (file)
--- a/drivers/gpu/drm/xe/xe_gt_pagefault.c
+++ b/drivers/gpu/drm/xe/xe_gt_pagefault.c
@@ -19,7 +19,7 @@
 #include "xe_guc.h"
 #include "xe_guc_ct.h"
 #include "xe_migrate.h"
-#include "xe_trace.h"
+#include "xe_trace_bo.h"
 #include "xe_vm.h"
 
 struct pagefault {

diff --git a/drivers/gpu/drm/xe/xe_migrate.c b/drivers/gpu/drm/xe/xe_migrate.c
index 7e3fb33110d9f05f2ce63dfe315cdebb569f88ee..ddd50c3f7208004d423f37c87d36a01b24738b79 100644 (file)
--- a/drivers/gpu/drm/xe/xe_migrate.c
+++ b/drivers/gpu/drm/xe/xe_migrate.c
@@ -32,7 +32,7 @@
 #include "xe_res_cursor.h"
 #include "xe_sched_job.h"
 #include "xe_sync.h"
-#include "xe_trace.h"
+#include "xe_trace_bo.h"
 #include "xe_vm.h"
 
 /**

diff --git a/drivers/gpu/drm/xe/xe_trace.h b/drivers/gpu/drm/xe/xe_trace.h
index e4cba64474e6d9592773a5c9f506fba4bd359d29..ba9cee9e146607970b53571fcb1c785045551307 100644 (file)
--- a/drivers/gpu/drm/xe/xe_trace.h
+++ b/drivers/gpu/drm/xe/xe_trace.h
@@ -12,8 +12,6 @@
 #include <linux/tracepoint.h>
 #include <linux/types.h>
 
-#include "xe_bo.h"
-#include "xe_bo_types.h"
 #include "xe_exec_queue_types.h"
 #include "xe_gpu_scheduler_types.h"
 #include "xe_gt_tlb_invalidation_types.h"
@@ -76,58 +74,6 @@ DEFINE_EVENT(xe_gt_tlb_invalidation_fence, xe_gt_tlb_invalidation_fence_timeout,
             TP_ARGS(fence)
 );
 
-DECLARE_EVENT_CLASS(xe_bo,
-                   TP_PROTO(struct xe_bo *bo),
-                   TP_ARGS(bo),
-
-                   TP_STRUCT__entry(
-                            __field(size_t, size)
-                            __field(u32, flags)
-                            __field(struct xe_vm *, vm)
-                            ),
-
-                   TP_fast_assign(
-                          __entry->size = bo->size;
-                          __entry->flags = bo->flags;
-                          __entry->vm = bo->vm;
-                          ),
-
-                   TP_printk("size=%zu, flags=0x%02x, vm=%p",
-                             __entry->size, __entry->flags, __entry->vm)
-);
-
-DEFINE_EVENT(xe_bo, xe_bo_cpu_fault,
-            TP_PROTO(struct xe_bo *bo),
-            TP_ARGS(bo)
-);
-
-TRACE_EVENT(xe_bo_move,
-           TP_PROTO(struct xe_bo *bo, uint32_t new_placement, uint32_t old_placement,
-                    bool move_lacks_source),
-           TP_ARGS(bo, new_placement, old_placement, move_lacks_source),
-           TP_STRUCT__entry(
-                    __field(struct xe_bo *, bo)
-                    __field(size_t, size)
-                    __field(u32, new_placement)
-                    __field(u32, old_placement)
-                    __array(char, device_id, 12)
-                    __field(bool, move_lacks_source)
-                       ),
-
-           TP_fast_assign(
-                  __entry->bo      = bo;
-                  __entry->size = bo->size;
-                  __entry->new_placement = new_placement;
-                  __entry->old_placement = old_placement;
-                  strscpy(__entry->device_id, dev_name(xe_bo_device(__entry->bo)->drm.dev), 12);
-                  __entry->move_lacks_source = move_lacks_source;
-                  ),
-           TP_printk("move_lacks_source:%s, migrate object %p [size %zu] from %s to %s device_id:%s",
-                     __entry->move_lacks_source ? "yes" : "no", __entry->bo, __entry->size,
-                     xe_mem_type_to_name[__entry->old_placement],
-                     xe_mem_type_to_name[__entry->new_placement], __entry->device_id)
-);
-
 DECLARE_EVENT_CLASS(xe_exec_queue,
                    TP_PROTO(struct xe_exec_queue *q),
                    TP_ARGS(q),
@@ -386,164 +332,6 @@ DEFINE_EVENT(xe_hw_fence, xe_hw_fence_free,
             TP_ARGS(fence)
 );
 
-DECLARE_EVENT_CLASS(xe_vma,
-                   TP_PROTO(struct xe_vma *vma),
-                   TP_ARGS(vma),
-
-                   TP_STRUCT__entry(
-                            __field(struct xe_vma *, vma)
-                            __field(u32, asid)
-                            __field(u64, start)
-                            __field(u64, end)
-                            __field(u64, ptr)
-                            ),
-
-                   TP_fast_assign(
-                          __entry->vma = vma;
-                          __entry->asid = xe_vma_vm(vma)->usm.asid;
-                          __entry->start = xe_vma_start(vma);
-                          __entry->end = xe_vma_end(vma) - 1;
-                          __entry->ptr = xe_vma_userptr(vma);
-                          ),
-
-                   TP_printk("vma=%p, asid=0x%05x, start=0x%012llx, end=0x%012llx, userptr=0x%012llx,",
-                             __entry->vma, __entry->asid, __entry->start,
-                             __entry->end, __entry->ptr)
-)
-
-DEFINE_EVENT(xe_vma, xe_vma_flush,
-            TP_PROTO(struct xe_vma *vma),
-            TP_ARGS(vma)
-);
-
-DEFINE_EVENT(xe_vma, xe_vma_pagefault,
-            TP_PROTO(struct xe_vma *vma),
-            TP_ARGS(vma)
-);
-
-DEFINE_EVENT(xe_vma, xe_vma_acc,
-            TP_PROTO(struct xe_vma *vma),
-            TP_ARGS(vma)
-);
-
-DEFINE_EVENT(xe_vma, xe_vma_fail,
-            TP_PROTO(struct xe_vma *vma),
-            TP_ARGS(vma)
-);
-
-DEFINE_EVENT(xe_vma, xe_vma_bind,
-            TP_PROTO(struct xe_vma *vma),
-            TP_ARGS(vma)
-);
-
-DEFINE_EVENT(xe_vma, xe_vma_pf_bind,
-            TP_PROTO(struct xe_vma *vma),
-            TP_ARGS(vma)
-);
-
-DEFINE_EVENT(xe_vma, xe_vma_unbind,
-            TP_PROTO(struct xe_vma *vma),
-            TP_ARGS(vma)
-);
-
-DEFINE_EVENT(xe_vma, xe_vma_userptr_rebind_worker,
-            TP_PROTO(struct xe_vma *vma),
-            TP_ARGS(vma)
-);
-
-DEFINE_EVENT(xe_vma, xe_vma_userptr_rebind_exec,
-            TP_PROTO(struct xe_vma *vma),
-            TP_ARGS(vma)
-);
-
-DEFINE_EVENT(xe_vma, xe_vma_rebind_worker,
-            TP_PROTO(struct xe_vma *vma),
-            TP_ARGS(vma)
-);
-
-DEFINE_EVENT(xe_vma, xe_vma_rebind_exec,
-            TP_PROTO(struct xe_vma *vma),
-            TP_ARGS(vma)
-);
-
-DEFINE_EVENT(xe_vma, xe_vma_userptr_invalidate,
-            TP_PROTO(struct xe_vma *vma),
-            TP_ARGS(vma)
-);
-
-DEFINE_EVENT(xe_vma, xe_vma_invalidate,
-            TP_PROTO(struct xe_vma *vma),
-            TP_ARGS(vma)
-);
-
-DEFINE_EVENT(xe_vma, xe_vma_evict,
-            TP_PROTO(struct xe_vma *vma),
-            TP_ARGS(vma)
-);
-
-DEFINE_EVENT(xe_vma, xe_vma_userptr_invalidate_complete,
-            TP_PROTO(struct xe_vma *vma),
-            TP_ARGS(vma)
-);
-
-DECLARE_EVENT_CLASS(xe_vm,
-                   TP_PROTO(struct xe_vm *vm),
-                   TP_ARGS(vm),
-
-                   TP_STRUCT__entry(
-                            __field(struct xe_vm *, vm)
-                            __field(u32, asid)
-                            ),
-
-                   TP_fast_assign(
-                          __entry->vm = vm;
-                          __entry->asid = vm->usm.asid;
-                          ),
-
-                   TP_printk("vm=%p, asid=0x%05x",  __entry->vm,
-                             __entry->asid)
-);
-
-DEFINE_EVENT(xe_vm, xe_vm_kill,
-            TP_PROTO(struct xe_vm *vm),
-            TP_ARGS(vm)
-);
-
-DEFINE_EVENT(xe_vm, xe_vm_create,
-            TP_PROTO(struct xe_vm *vm),
-            TP_ARGS(vm)
-);
-
-DEFINE_EVENT(xe_vm, xe_vm_free,
-            TP_PROTO(struct xe_vm *vm),
-            TP_ARGS(vm)
-);
-
-DEFINE_EVENT(xe_vm, xe_vm_cpu_bind,
-            TP_PROTO(struct xe_vm *vm),
-            TP_ARGS(vm)
-);
-
-DEFINE_EVENT(xe_vm, xe_vm_restart,
-            TP_PROTO(struct xe_vm *vm),
-            TP_ARGS(vm)
-);
-
-DEFINE_EVENT(xe_vm, xe_vm_rebind_worker_enter,
-            TP_PROTO(struct xe_vm *vm),
-            TP_ARGS(vm)
-);
-
-DEFINE_EVENT(xe_vm, xe_vm_rebind_worker_retry,
-            TP_PROTO(struct xe_vm *vm),
-            TP_ARGS(vm)
-);
-
-DEFINE_EVENT(xe_vm, xe_vm_rebind_worker_exit,
-            TP_PROTO(struct xe_vm *vm),
-            TP_ARGS(vm)
-);
-
 /* GuC */
 DECLARE_EVENT_CLASS(xe_guc_ct_flow_control,
                    TP_PROTO(u32 _head, u32 _tail, u32 size, u32 space, u32 len),

diff --git a/drivers/gpu/drm/xe/xe_trace_bo.c b/drivers/gpu/drm/xe/xe_trace_bo.c
new file mode 100644 (file)
index 0000000..6d5e66c
--- /dev/null
+++ b/drivers/gpu/drm/xe/xe_trace_bo.c
@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright © 2024 Intel Corporation
+ */
+
+#ifndef __CHECKER__
+#define CREATE_TRACE_POINTS
+#include "xe_trace_bo.h"
+#endif

diff --git a/drivers/gpu/drm/xe/xe_trace_bo.h b/drivers/gpu/drm/xe/xe_trace_bo.h
new file mode 100644 (file)
index 0000000..c8bd746
--- /dev/null
+++ b/drivers/gpu/drm/xe/xe_trace_bo.h
@@ -0,0 +1,236 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * Copyright © 2024 Intel Corporation
+ */
+
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM xe
+
+#if !defined(_XE_TRACE_BO_H_) || defined(TRACE_HEADER_MULTI_READ)
+#define _XE_TRACE_BO_H_
+
+#include <linux/tracepoint.h>
+#include <linux/types.h>
+
+#include "xe_bo.h"
+#include "xe_bo_types.h"
+#include "xe_vm.h"
+
+DECLARE_EVENT_CLASS(xe_bo,
+                   TP_PROTO(struct xe_bo *bo),
+                   TP_ARGS(bo),
+
+                   TP_STRUCT__entry(
+                            __field(size_t, size)
+                            __field(u32, flags)
+                            __field(struct xe_vm *, vm)
+                            ),
+
+                   TP_fast_assign(
+                          __entry->size = bo->size;
+                          __entry->flags = bo->flags;
+                          __entry->vm = bo->vm;
+                          ),
+
+                   TP_printk("size=%zu, flags=0x%02x, vm=%p",
+                             __entry->size, __entry->flags, __entry->vm)
+);
+
+DEFINE_EVENT(xe_bo, xe_bo_cpu_fault,
+            TP_PROTO(struct xe_bo *bo),
+            TP_ARGS(bo)
+);
+
+TRACE_EVENT(xe_bo_move,
+           TP_PROTO(struct xe_bo *bo, uint32_t new_placement, uint32_t old_placement,
+                    bool move_lacks_source),
+           TP_ARGS(bo, new_placement, old_placement, move_lacks_source),
+           TP_STRUCT__entry(
+                    __field(struct xe_bo *, bo)
+                    __field(size_t, size)
+                    __field(u32, new_placement)
+                    __field(u32, old_placement)
+                    __array(char, device_id, 12)
+                    __field(bool, move_lacks_source)
+                       ),
+
+           TP_fast_assign(
+                  __entry->bo      = bo;
+                  __entry->size = bo->size;
+                  __entry->new_placement = new_placement;
+                  __entry->old_placement = old_placement;
+                  strscpy(__entry->device_id, dev_name(xe_bo_device(__entry->bo)->drm.dev), 12);
+                  __entry->move_lacks_source = move_lacks_source;
+                  ),
+           TP_printk("move_lacks_source:%s, migrate object %p [size %zu] from %s to %s device_id:%s",
+                     __entry->move_lacks_source ? "yes" : "no", __entry->bo, __entry->size,
+                     xe_mem_type_to_name[__entry->old_placement],
+                     xe_mem_type_to_name[__entry->new_placement], __entry->device_id)
+);
+
+DECLARE_EVENT_CLASS(xe_vma,
+                   TP_PROTO(struct xe_vma *vma),
+                   TP_ARGS(vma),
+
+                   TP_STRUCT__entry(
+                            __field(struct xe_vma *, vma)
+                            __field(u32, asid)
+                            __field(u64, start)
+                            __field(u64, end)
+                            __field(u64, ptr)
+                            ),
+
+                   TP_fast_assign(
+                          __entry->vma = vma;
+                          __entry->asid = xe_vma_vm(vma)->usm.asid;
+                          __entry->start = xe_vma_start(vma);
+                          __entry->end = xe_vma_end(vma) - 1;
+                          __entry->ptr = xe_vma_userptr(vma);
+                          ),
+
+                   TP_printk("vma=%p, asid=0x%05x, start=0x%012llx, end=0x%012llx, userptr=0x%012llx,",
+                             __entry->vma, __entry->asid, __entry->start,
+                             __entry->end, __entry->ptr)
+)
+
+DEFINE_EVENT(xe_vma, xe_vma_flush,
+            TP_PROTO(struct xe_vma *vma),
+            TP_ARGS(vma)
+);
+
+DEFINE_EVENT(xe_vma, xe_vma_pagefault,
+            TP_PROTO(struct xe_vma *vma),
+            TP_ARGS(vma)
+);
+
+DEFINE_EVENT(xe_vma, xe_vma_acc,
+            TP_PROTO(struct xe_vma *vma),
+            TP_ARGS(vma)
+);
+
+DEFINE_EVENT(xe_vma, xe_vma_fail,
+            TP_PROTO(struct xe_vma *vma),
+            TP_ARGS(vma)
+);
+
+DEFINE_EVENT(xe_vma, xe_vma_bind,
+            TP_PROTO(struct xe_vma *vma),
+            TP_ARGS(vma)
+);
+
+DEFINE_EVENT(xe_vma, xe_vma_pf_bind,
+            TP_PROTO(struct xe_vma *vma),
+            TP_ARGS(vma)
+);
+
+DEFINE_EVENT(xe_vma, xe_vma_unbind,
+            TP_PROTO(struct xe_vma *vma),
+            TP_ARGS(vma)
+);
+
+DEFINE_EVENT(xe_vma, xe_vma_userptr_rebind_worker,
+            TP_PROTO(struct xe_vma *vma),
+            TP_ARGS(vma)
+);
+
+DEFINE_EVENT(xe_vma, xe_vma_userptr_rebind_exec,
+            TP_PROTO(struct xe_vma *vma),
+            TP_ARGS(vma)
+);
+
+DEFINE_EVENT(xe_vma, xe_vma_rebind_worker,
+            TP_PROTO(struct xe_vma *vma),
+            TP_ARGS(vma)
+);
+
+DEFINE_EVENT(xe_vma, xe_vma_rebind_exec,
+            TP_PROTO(struct xe_vma *vma),
+            TP_ARGS(vma)
+);
+
+DEFINE_EVENT(xe_vma, xe_vma_userptr_invalidate,
+            TP_PROTO(struct xe_vma *vma),
+            TP_ARGS(vma)
+);
+
+DEFINE_EVENT(xe_vma, xe_vma_invalidate,
+            TP_PROTO(struct xe_vma *vma),
+            TP_ARGS(vma)
+);
+
+DEFINE_EVENT(xe_vma, xe_vma_evict,
+            TP_PROTO(struct xe_vma *vma),
+            TP_ARGS(vma)
+);
+
+DEFINE_EVENT(xe_vma, xe_vma_userptr_invalidate_complete,
+            TP_PROTO(struct xe_vma *vma),
+            TP_ARGS(vma)
+);
+
+DECLARE_EVENT_CLASS(xe_vm,
+                   TP_PROTO(struct xe_vm *vm),
+                   TP_ARGS(vm),
+
+                   TP_STRUCT__entry(
+                            __field(struct xe_vm *, vm)
+                            __field(u32, asid)
+                            ),
+
+                   TP_fast_assign(
+                          __entry->vm = vm;
+                          __entry->asid = vm->usm.asid;
+                          ),
+
+                   TP_printk("vm=%p, asid=0x%05x",  __entry->vm,
+                             __entry->asid)
+);
+
+DEFINE_EVENT(xe_vm, xe_vm_kill,
+            TP_PROTO(struct xe_vm *vm),
+            TP_ARGS(vm)
+);
+
+DEFINE_EVENT(xe_vm, xe_vm_create,
+            TP_PROTO(struct xe_vm *vm),
+            TP_ARGS(vm)
+);
+
+DEFINE_EVENT(xe_vm, xe_vm_free,
+            TP_PROTO(struct xe_vm *vm),
+            TP_ARGS(vm)
+);
+
+DEFINE_EVENT(xe_vm, xe_vm_cpu_bind,
+            TP_PROTO(struct xe_vm *vm),
+            TP_ARGS(vm)
+);
+
+DEFINE_EVENT(xe_vm, xe_vm_restart,
+            TP_PROTO(struct xe_vm *vm),
+            TP_ARGS(vm)
+);
+
+DEFINE_EVENT(xe_vm, xe_vm_rebind_worker_enter,
+            TP_PROTO(struct xe_vm *vm),
+            TP_ARGS(vm)
+);
+
+DEFINE_EVENT(xe_vm, xe_vm_rebind_worker_retry,
+            TP_PROTO(struct xe_vm *vm),
+            TP_ARGS(vm)
+);
+
+DEFINE_EVENT(xe_vm, xe_vm_rebind_worker_exit,
+            TP_PROTO(struct xe_vm *vm),
+            TP_ARGS(vm)
+);
+
+#endif
+
+/* This part must be outside protection */
+#undef TRACE_INCLUDE_PATH
+#undef TRACE_INCLUDE_FILE
+#define TRACE_INCLUDE_PATH ../../drivers/gpu/drm/xe
+#define TRACE_INCLUDE_FILE xe_trace_bo
+#include <trace/define_trace.h>

diff --git a/drivers/gpu/drm/xe/xe_vm.c b/drivers/gpu/drm/xe/xe_vm.c
index 99bf7412475c085da557ebfc52ae8a1829a0d657..ffda487653d8e1937865d44e2dd5609488b5d93e 100644 (file)
--- a/drivers/gpu/drm/xe/xe_vm.c
+++ b/drivers/gpu/drm/xe/xe_vm.c
@@ -36,7 +36,7 @@
 #include "xe_pt.h"
 #include "xe_res_cursor.h"
 #include "xe_sync.h"
-#include "xe_trace.h"
+#include "xe_trace_bo.h"
 #include "xe_wa.h"
 #include "xe_hmm.h"