Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/xe/trace: Print device_id in xe_trace_bo events

In multi-gpu environments it is important to know the device
bo/vm belongs to. The tracing information includes the device_id
to indicate the device the event is associated with.

v2: Use variable sized variant to display dev name(Gustavo)
v3: Pass single argument to __assign_str to fix kunit error
v4: Minor cleanups(Gustavo)

Suggested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: Gustavo Sousa <gustavo.sousa@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-4-radhakrishna.sripada@intel.com

authored by

Radhakrishna Sripada and committed by
Matt Roper
3432f26e 6a04e1fc

+20 -9
+20 -9
drivers/gpu/drm/xe/xe_trace_bo.h
··· 16 16 #include "xe_bo_types.h" 17 17 #include "xe_vm.h" 18 18 19 + #define __dev_name_bo(bo) dev_name(xe_bo_device(bo)->drm.dev) 20 + #define __dev_name_vm(vm) dev_name((vm)->xe->drm.dev) 21 + #define __dev_name_vma(vma) __dev_name_vm(xe_vma_vm(vma)) 22 + 19 23 DECLARE_EVENT_CLASS(xe_bo, 20 24 TP_PROTO(struct xe_bo *bo), 21 25 TP_ARGS(bo), 22 26 23 27 TP_STRUCT__entry( 28 + __string(dev, __dev_name_bo(bo)) 24 29 __field(size_t, size) 25 30 __field(u32, flags) 26 31 __field(struct xe_vm *, vm) 27 32 ), 28 33 29 34 TP_fast_assign( 35 + __assign_str(dev); 30 36 __entry->size = bo->size; 31 37 __entry->flags = bo->flags; 32 38 __entry->vm = bo->vm; 33 39 ), 34 40 35 - TP_printk("size=%zu, flags=0x%02x, vm=%p", 36 - __entry->size, __entry->flags, __entry->vm) 41 + TP_printk("dev=%s, size=%zu, flags=0x%02x, vm=%p", 42 + __get_str(dev), __entry->size, 43 + __entry->flags, __entry->vm) 37 44 ); 38 45 39 46 DEFINE_EVENT(xe_bo, xe_bo_cpu_fault, ··· 57 50 __field(size_t, size) 58 51 __field(u32, new_placement) 59 52 __field(u32, old_placement) 60 - __array(char, device_id, 12) 53 + __string(device_id, __dev_name_bo(bo)) 61 54 __field(bool, move_lacks_source) 62 55 ), 63 56 ··· 66 59 __entry->size = bo->size; 67 60 __entry->new_placement = new_placement; 68 61 __entry->old_placement = old_placement; 69 - strscpy(__entry->device_id, dev_name(xe_bo_device(__entry->bo)->drm.dev), 12); 62 + __assign_str(device_id); 70 63 __entry->move_lacks_source = move_lacks_source; 71 64 ), 72 65 TP_printk("move_lacks_source:%s, migrate object %p [size %zu] from %s to %s device_id:%s", 73 66 __entry->move_lacks_source ? "yes" : "no", __entry->bo, __entry->size, 74 67 xe_mem_type_to_name[__entry->old_placement], 75 - xe_mem_type_to_name[__entry->new_placement], __entry->device_id) 68 + xe_mem_type_to_name[__entry->new_placement], __get_str(device_id)) 76 69 ); 77 70 78 71 DECLARE_EVENT_CLASS(xe_vma, ··· 80 73 TP_ARGS(vma), 81 74 82 75 TP_STRUCT__entry( 76 + __string(dev, __dev_name_vma(vma)) 83 77 __field(struct xe_vma *, vma) 84 78 __field(u32, asid) 85 79 __field(u64, start) ··· 89 81 ), 90 82 91 83 TP_fast_assign( 84 + __assign_str(dev); 92 85 __entry->vma = vma; 93 86 __entry->asid = xe_vma_vm(vma)->usm.asid; 94 87 __entry->start = xe_vma_start(vma); ··· 97 88 __entry->ptr = xe_vma_userptr(vma); 98 89 ), 99 90 100 - TP_printk("vma=%p, asid=0x%05x, start=0x%012llx, end=0x%012llx, userptr=0x%012llx,", 101 - __entry->vma, __entry->asid, __entry->start, 91 + TP_printk("dev=%s, vma=%p, asid=0x%05x, start=0x%012llx, end=0x%012llx, userptr=0x%012llx,", 92 + __get_str(dev), __entry->vma, __entry->asid, __entry->start, 102 93 __entry->end, __entry->ptr) 103 94 ) 104 95 ··· 182 173 TP_ARGS(vm), 183 174 184 175 TP_STRUCT__entry( 176 + __string(dev, __dev_name_vm(vm)) 185 177 __field(struct xe_vm *, vm) 186 178 __field(u32, asid) 187 179 ), 188 180 189 181 TP_fast_assign( 182 + __assign_str(dev); 190 183 __entry->vm = vm; 191 184 __entry->asid = vm->usm.asid; 192 185 ), 193 186 194 - TP_printk("vm=%p, asid=0x%05x", __entry->vm, 195 - __entry->asid) 187 + TP_printk("dev=%s, vm=%p, asid=0x%05x", __get_str(dev), 188 + __entry->vm, __entry->asid) 196 189 ); 197 190 198 191 DEFINE_EVENT(xe_vm, xe_vm_kill,