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

gpu/trace: add a gpu total memory usage tracepoint

This change adds the below gpu memory tracepoint:
gpu_mem/gpu_mem_total: track global or proc gpu memory total usages

Per process tracking of total gpu memory usage in the gem layer is not
appropriate and hard to implement with trivial overhead. So for the gfx
device driver layer to track total gpu memory usage both globally and
per process in an easy and uniform way is to integrate the tracepoint in
this patch to the underlying varied implementations of gpu memory
tracking system from vendors.

Putting this tracepoint in the common trace events can not only help
wean the gfx drivers off of debugfs but also greatly help the downstream
Android gpu vendors because debugfs is to be deprecated in the upcoming
Android release. Then the gpu memory tracking of both Android kernel and
the upstream linux kernel can stay closely, which can benefit the whole
kernel eco-system in the long term.

Link: http://lkml.kernel.org/r/20200302235044.59163-1-zzyiwei@google.com

Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Yiwei Zhang <zzyiwei@google.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>

authored by

Yiwei Zhang and committed by
Steven Rostedt (VMware)
bbd9d056 89b74cac

+80
+2
drivers/Kconfig
··· 200 200 201 201 source "drivers/android/Kconfig" 202 202 203 + source "drivers/gpu/trace/Kconfig" 204 + 203 205 source "drivers/nvdimm/Kconfig" 204 206 205 207 source "drivers/dax/Kconfig"
+1
drivers/gpu/Makefile
··· 5 5 obj-$(CONFIG_TEGRA_HOST1X) += host1x/ 6 6 obj-y += drm/ vga/ 7 7 obj-$(CONFIG_IMX_IPUV3_CORE) += ipu-v3/ 8 + obj-$(CONFIG_TRACE_GPU_MEM) += trace/
+4
drivers/gpu/trace/Kconfig
··· 1 + # SPDX-License-Identifier: GPL-2.0-only 2 + 3 + config TRACE_GPU_MEM 4 + bool
+3
drivers/gpu/trace/Makefile
··· 1 + # SPDX-License-Identifier: GPL-2.0 2 + 3 + obj-$(CONFIG_TRACE_GPU_MEM) += trace_gpu_mem.o
+13
drivers/gpu/trace/trace_gpu_mem.c
··· 1 + // SPDX-License-Identifier: GPL-2.0 2 + /* 3 + * GPU memory trace points 4 + * 5 + * Copyright (C) 2020 Google, Inc. 6 + */ 7 + 8 + #include <linux/module.h> 9 + 10 + #define CREATE_TRACE_POINTS 11 + #include <trace/events/gpu_mem.h> 12 + 13 + EXPORT_TRACEPOINT_SYMBOL(gpu_mem_total);
+57
include/trace/events/gpu_mem.h
··· 1 + /* SPDX-License-Identifier: GPL-2.0 */ 2 + /* 3 + * GPU memory trace points 4 + * 5 + * Copyright (C) 2020 Google, Inc. 6 + */ 7 + 8 + #undef TRACE_SYSTEM 9 + #define TRACE_SYSTEM gpu_mem 10 + 11 + #if !defined(_TRACE_GPU_MEM_H) || defined(TRACE_HEADER_MULTI_READ) 12 + #define _TRACE_GPU_MEM_H 13 + 14 + #include <linux/tracepoint.h> 15 + 16 + /* 17 + * The gpu_memory_total event indicates that there's an update to either the 18 + * global or process total gpu memory counters. 19 + * 20 + * This event should be emitted whenever the kernel device driver allocates, 21 + * frees, imports, unimports memory in the GPU addressable space. 22 + * 23 + * @gpu_id: This is the gpu id. 24 + * 25 + * @pid: Put 0 for global total, while positive pid for process total. 26 + * 27 + * @size: Virtual size of the allocation in bytes. 28 + * 29 + */ 30 + TRACE_EVENT(gpu_mem_total, 31 + 32 + TP_PROTO(uint32_t gpu_id, uint32_t pid, uint64_t size), 33 + 34 + TP_ARGS(gpu_id, pid, size), 35 + 36 + TP_STRUCT__entry( 37 + __field(uint32_t, gpu_id) 38 + __field(uint32_t, pid) 39 + __field(uint64_t, size) 40 + ), 41 + 42 + TP_fast_assign( 43 + __entry->gpu_id = gpu_id; 44 + __entry->pid = pid; 45 + __entry->size = size; 46 + ), 47 + 48 + TP_printk("gpu_id=%u pid=%u size=%llu", 49 + __entry->gpu_id, 50 + __entry->pid, 51 + __entry->size) 52 + ); 53 + 54 + #endif /* _TRACE_GPU_MEM_H */ 55 + 56 + /* This part must be outside protection */ 57 + #include <trace/define_trace.h>