From: zzyiwei@google.com
To: rostedt@goodmis.org, mingo@redhat.com,
gregkh@linuxfoundation.org, elder@kernel.org,
federico.vaga@cern.ch, tony.luck@intel.com,
vilhelm.gray@gmail.com, linus.walleij@linaro.org,
tglx@linutronix.de, yamada.masahiro@socionext.com,
paul.walmsley@sifive.com, linux-kernel@vger.kernel.org
Cc: prahladk@google.com, joelaf@google.com,
android-kernel@google.com, Yiwei Zhang <zzyiwei@google.com>
Subject: [PATCH v2] Add gpu memory tracepoints
Date: Wed, 12 Feb 2020 16:32:59 -0800 [thread overview]
Message-ID: <20200213003259.128938-1-zzyiwei@google.com> (raw)
From: Yiwei Zhang <zzyiwei@google.com>
This change adds the below gpu memory tracepoint:
gpu_mem/gpu_mem_total: track global or process gpu memory total counters
Signed-off-by: Yiwei Zhang <zzyiwei@google.com>
---
drivers/Kconfig | 2 +
drivers/gpu/Makefile | 1 +
drivers/gpu/trace/Kconfig | 4 ++
drivers/gpu/trace/Makefile | 3 ++
drivers/gpu/trace/trace_gpu_mem.c | 13 +++++++
include/trace/events/gpu_mem.h | 64 +++++++++++++++++++++++++++++++
6 files changed, 87 insertions(+)
create mode 100644 drivers/gpu/trace/Kconfig
create mode 100644 drivers/gpu/trace/Makefile
create mode 100644 drivers/gpu/trace/trace_gpu_mem.c
create mode 100644 include/trace/events/gpu_mem.h
diff --git a/drivers/Kconfig b/drivers/Kconfig
index 8befa53f43be..e0eda1a5c3f9 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -200,6 +200,8 @@ source "drivers/thunderbolt/Kconfig"
source "drivers/android/Kconfig"
+source "drivers/gpu/trace/Kconfig"
+
source "drivers/nvdimm/Kconfig"
source "drivers/dax/Kconfig"
diff --git a/drivers/gpu/Makefile b/drivers/gpu/Makefile
index f17d01f076c7..835c88318cec 100644
--- a/drivers/gpu/Makefile
+++ b/drivers/gpu/Makefile
@@ -5,3 +5,4 @@
obj-$(CONFIG_TEGRA_HOST1X) += host1x/
obj-y += drm/ vga/
obj-$(CONFIG_IMX_IPUV3_CORE) += ipu-v3/
+obj-$(CONFIG_TRACE_GPU_MEM) += trace/
diff --git a/drivers/gpu/trace/Kconfig b/drivers/gpu/trace/Kconfig
new file mode 100644
index 000000000000..c24e9edd022e
--- /dev/null
+++ b/drivers/gpu/trace/Kconfig
@@ -0,0 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
+config TRACE_GPU_MEM
+ bool
diff --git a/drivers/gpu/trace/Makefile b/drivers/gpu/trace/Makefile
new file mode 100644
index 000000000000..b70fbdc5847f
--- /dev/null
+++ b/drivers/gpu/trace/Makefile
@@ -0,0 +1,3 @@
+# SPDX-License-Identifier: GPL-2.0
+
+obj-$(CONFIG_TRACE_GPU_MEM) += trace_gpu_mem.o
diff --git a/drivers/gpu/trace/trace_gpu_mem.c b/drivers/gpu/trace/trace_gpu_mem.c
new file mode 100644
index 000000000000..01e855897b6d
--- /dev/null
+++ b/drivers/gpu/trace/trace_gpu_mem.c
@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * GPU memory trace points
+ *
+ * Copyright (C) 2020 Google, Inc.
+ */
+
+#include <linux/module.h>
+
+#define CREATE_TRACE_POINTS
+#include <trace/events/gpu_mem.h>
+
+EXPORT_TRACEPOINT_SYMBOL(gpu_mem_total);
diff --git a/include/trace/events/gpu_mem.h b/include/trace/events/gpu_mem.h
new file mode 100644
index 000000000000..3b632a2b5100
--- /dev/null
+++ b/include/trace/events/gpu_mem.h
@@ -0,0 +1,64 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * GPU memory trace points
+ *
+ * Copyright (C) 2020 Google, Inc.
+ */
+
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM gpu_mem
+
+#if !defined(_TRACE_GPU_MEM_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_GPU_MEM_H
+
+#include <linux/tracepoint.h>
+
+/*
+ * The gpu_memory_total event indicates that there's an update to either the
+ * global or process total gpu memory counters.
+ *
+ * This event should be emitted whenever the kernel device driver allocates,
+ * frees, imports, unimports memory in the GPU addressable space.
+ *
+ * @gpu_id: This is the gpu id.
+ *
+ * @pid: Put 0 for global total, while positive pid for process total.
+ *
+ * @size: Virtual size of the allocation in bytes.
+ *
+ */
+TRACE_EVENT(gpu_mem_total,
+ TP_PROTO(
+ uint32_t gpu_id,
+ uint32_t pid,
+ uint64_t size
+ ),
+ TP_ARGS(
+ gpu_id,
+ pid,
+ size
+ ),
+ TP_STRUCT__entry(
+ __field(uint32_t, gpu_id)
+ __field(uint32_t, pid)
+ __field(uint64_t, size)
+ ),
+ TP_fast_assign(
+ __entry->gpu_id = gpu_id;
+ __entry->pid = pid;
+ __entry->size = size;
+ ),
+ TP_printk(
+ "gpu_id=%u "
+ "pid=%u "
+ "size=%llu",
+ __entry->gpu_id,
+ __entry->pid,
+ __entry->size
+ )
+);
+
+#endif /* _TRACE_GPU_MEM_H */
+
+/* This part must be outside protection */
+#include <trace/define_trace.h>
--
2.25.0.225.g125e21ebc7-goog
next reply other threads:[~2020-02-13 0:33 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-13 0:32 zzyiwei [this message]
2020-02-13 0:39 ` [PATCH v2] Add gpu memory tracepoints Yiwei Zhang
2020-02-13 0:40 ` Greg KH
2020-02-13 1:23 ` Yiwei Zhang
2020-02-13 1:48 ` Steven Rostedt
2020-02-13 2:20 ` zzyiwei
2020-02-13 2:24 ` Yiwei Zhang
2020-02-13 3:29 ` Steven Rostedt
2020-02-13 4:23 ` [PATCH v3] gpu/trace: add " zzyiwei
2020-02-13 4:27 ` Yiwei Zhang
2020-02-13 14:03 ` Steven Rostedt
2020-02-13 17:49 ` Yiwei Zhang
2020-02-24 6:31 ` Yiwei Zhang
2020-02-24 16:38 ` Steven Rostedt
2020-03-01 0:53 ` Yiwei Zhang
2020-03-02 23:48 ` [PATCH] [PATCH v4] gpu/trace: add a gpu total memory usage tracepoint zzyiwei
2020-03-02 23:56 ` Yiwei Zhang
2020-03-02 23:50 ` zzyiwei
2020-03-03 14:07 ` Steven Rostedt
2020-03-03 14:15 ` Greg KH
2020-03-03 14:31 ` Steven Rostedt
2020-03-03 15:15 ` Yiwei Zhang
2020-03-03 15:48 ` Steven Rostedt
2020-03-03 15:56 ` Greg KH
2020-03-13 22:59 ` Yiwei Zhang
2020-03-16 18:05 ` Steven Rostedt
2020-03-16 19:28 ` Yiwei Zhang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200213003259.128938-1-zzyiwei@google.com \
--to=zzyiwei@google.com \
--cc=android-kernel@google.com \
--cc=elder@kernel.org \
--cc=federico.vaga@cern.ch \
--cc=gregkh@linuxfoundation.org \
--cc=joelaf@google.com \
--cc=linus.walleij@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=paul.walmsley@sifive.com \
--cc=prahladk@google.com \
--cc=rostedt@goodmis.org \
--cc=tglx@linutronix.de \
--cc=tony.luck@intel.com \
--cc=vilhelm.gray@gmail.com \
--cc=yamada.masahiro@socionext.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).