From: Kalesh Singh <kaleshsingh@google.com>
To: unlisted-recipients:; (no To-header on input)
Cc: gregkh@linuxfoundation.org, surenb@google.com, hridya@google.com,
john.reitan@arm.com, orjan.eide@arm.com, mark.underwood@arm.com,
gary.sweet@broadcom.com, stephen.mansfield@imgtec.com,
mbalci@quicinc.com, mkrom@qti.qualcomm.com,
kernel-team@android.com, Kalesh Singh <kaleshsingh@google.com>,
Steven Rostedt <rostedt@goodmis.org>,
Ingo Molnar <mingo@redhat.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH] tracing/gpu: Add gpu_mem_imported tracepoint
Date: Mon, 26 Jul 2021 16:41:31 +0000 [thread overview]
Message-ID: <20210726164135.1745059-1-kaleshsingh@google.com> (raw)
The existing gpu_mem_total tracepoint allows GPU drivers a unifrom way
to report the per-process and system-wide GPU memory usage. This
tracepoint reports a single total of the GPU private allocations and the
imported memory. [1]
To allow distinguishing GPU private vs imported memory, add
gpu_mem_imported tracepoint.
GPU drivers can use this tracepoint to report the per-process and global
GPU-imported memory in a uniform way.
For backward compatility with already existing implementations of
gpu_mem_total by various Android GPU drivers, this is proposed as a new
tracepoint rather than additional args to gpu_mem_total.
[1] https://lore.kernel.org/r/20200302234840.57188-1-zzyiwei@google.com/
Signed-off-by: Kalesh Singh <kaleshsingh@google.com>
---
include/trace/events/gpu_mem.h | 51 ++++++++++++++++++++++++----------
1 file changed, 36 insertions(+), 15 deletions(-)
diff --git a/include/trace/events/gpu_mem.h b/include/trace/events/gpu_mem.h
index 26d871f96e94..b9543abf1461 100644
--- a/include/trace/events/gpu_mem.h
+++ b/include/trace/events/gpu_mem.h
@@ -13,21 +13,7 @@
#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: Size of the allocation in bytes.
- *
- */
-TRACE_EVENT(gpu_mem_total,
+DECLARE_EVENT_CLASS(gpu_mem_template,
TP_PROTO(uint32_t gpu_id, uint32_t pid, uint64_t size),
@@ -51,6 +37,41 @@ TRACE_EVENT(gpu_mem_total,
__entry->size)
);
+/*
+ * 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: Size of the allocation in bytes.
+ *
+ */
+DEFINE_EVENT(gpu_mem_template, gpu_mem_total,
+ TP_PROTO(uint32_t gpu_id, uint32_t pid, uint64_t size),
+ TP_ARGS(gpu_id, pid, size));
+
+/*
+ * The gpu_mem_imported event indicates that there's an update to the
+ * global or process imported gpu memory counters.
+ *
+ * This event should be emitted whenever the kernel device driver imports
+ * or unimports memory (allocated externally) 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: Size of the imported memory in bytes.
+ */
+DEFINE_EVENT(gpu_mem_template, gpu_mem_imported,
+ TP_PROTO(uint32_t gpu_id, uint32_t pid, uint64_t size),
+ TP_ARGS(gpu_id, pid, size));
+
#endif /* _TRACE_GPU_MEM_H */
/* This part must be outside protection */
base-commit: ff1176468d368232b684f75e82563369208bc371
--
2.32.0.432.gabb21c7263-goog
next reply other threads:[~2021-07-26 16:46 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-26 16:41 Kalesh Singh [this message]
2021-08-16 17:22 ` [PATCH] tracing/gpu: Add gpu_mem_imported tracepoint Ørjan Eide
2021-08-16 19:46 ` Kalesh Singh
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=20210726164135.1745059-1-kaleshsingh@google.com \
--to=kaleshsingh@google.com \
--cc=gary.sweet@broadcom.com \
--cc=gregkh@linuxfoundation.org \
--cc=hridya@google.com \
--cc=john.reitan@arm.com \
--cc=kernel-team@android.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.underwood@arm.com \
--cc=mbalci@quicinc.com \
--cc=mingo@redhat.com \
--cc=mkrom@qti.qualcomm.com \
--cc=orjan.eide@arm.com \
--cc=rostedt@goodmis.org \
--cc=stephen.mansfield@imgtec.com \
--cc=surenb@google.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).