Add gpu memory tracepoints
Subsystems (2)
PATCH v2 1/1 Add gpu memory tracepoints
From: Yiwei Zhang <[email protected]>
This change adds the below gpu memory tracepoint:
gpu_mem/gpu_mem_total: track global or process gpu memory total counters
--- 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
drivers/Kconfig +2 -0
@@ -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"
drivers/gpu/Makefile +1 -0
@@ -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/
drivers/gpu/trace/Kconfig new file +4 -0
@@ -0,0 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only + +config TRACE_GPU_MEM + bool
drivers/gpu/trace/Makefile new file +3 -0
@@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0 + +obj-$(CONFIG_TRACE_GPU_MEM) += trace_gpu_mem.o
drivers/gpu/trace/trace_gpu_mem.c new file +13 -0
@@ -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);
include/trace/events/gpu_mem.h new file +64 -0
64 lines not on this page · raw message
Signature · 1 line
2.25.0.225.g125e21ebc7-goog
The context is here: https://lkml.org/lkml/2020/2/10/1903 and
https://lkml.org/lkml/2020/2/12/997
Quoted 153 lines · On Wed, Feb 12, 2020 at 4:33 PM <[email protected]> wrote:
From: Yiwei Zhang <[email protected]>
This change adds the below gpu memory tracepoint:
gpu_mem/gpu_mem_total: track global or process gpu memory total countersSigned-off-by Yiwei Zhang <[email protected]>--- 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.hdrivers/Kconfig +2
-0@@ -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"drivers/gpu/Makefile +1
-0@@ -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/drivers/gpu/trace/Kconfig new file +4
-0@@ -0,0 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only + +config TRACE_GPU_MEM + booldrivers/gpu/trace/Makefile new file +3
-0@@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0 + +obj-$(CONFIG_TRACE_GPU_MEM) += trace_gpu_mem.odrivers/gpu/trace/trace_gpu_mem.c new file +13
-0@@ -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);include/trace/events/gpu_mem.h new file +64
-1@@ -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
Quoted 6 lines · On Wed, Feb 12, 2020 at 04:32:59PM -0800, [email protected] wrote:
From: Yiwei Zhang <[email protected]>
This change adds the below gpu memory tracepoint:
gpu_mem/gpu_mem_total: track global or process gpu memory total countersSigned-off-by Yiwei Zhang <[email protected]>
If this helps gpu drivers wean themselves off of debugfs, I am all for it:
Thanks for doing this.
greg k-h
Hi Greg,
Thanks for your prompt response!
For upstream drm gem based gfx drivers, the lower level device driver layer is able to implement such per-process gpu memory total counters but the common drm gem layer is probably not. At least the global total gpu memory counter is fairly easy to implement, and then this tracepoint can still be useful right away.
For Android, the debugfs has already been forced to be deprecated in the coming Android 11 release. We have asked Android GPU vendors to implement such global and per-process total memory counters. So they can easily use this tracepoint inside the driver. This is mainly to serve the profiling needs as well as the runtime query needs(by attaching a eBPF program from userspace), and this patch helps standardize the tracepoint in the kernel.
Many thanks!
Yiwei
Quoted 16 lines · Greg KH
Quoted 6 lines · On Wed, Feb 12, 2020 at 04:32:59PM -0800, [email protected] wrote:
From: Yiwei Zhang <[email protected]>
This change adds the below gpu memory tracepoint:
gpu_mem/gpu_mem_total: track global or process gpu memory total countersSigned-off-by Yiwei Zhang <[email protected]>If this helps gpu drivers wean themselves off of debugfs, I am all for it:
Thanks for doing this.
greg k-h
Steven Rostedt
maintainerQuoted 23 lines · On Wed, 12 Feb 2020 16:32:59 -0800 [email protected] wrote:
include/trace/events/gpu_mem.h new file +23
-0+#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,
include/trace/events/gpu_mem.h line 40
Quoted 10 lines
include/trace/events/gpu_mem.h new file +10
-0+TP_PROTO ( + uint32_t gpu_id, + uint32_t pid, + uint64_t size + ), +TP_ARGS ( + gpu_id, + pid, + size + ),
This is unique whitespace parsing. Usually, this would be:
TP_PROTO(uint32_t gpu_id, unint32_t pid, uint64_t size), TP_ARGS(gpu_id, pid, size),
Quoted 4 lines
include/trace/events/gpu_mem.h new file +4
-0+TP_STRUCT__entry ( +__field (uint32_t ,gpu_id ) +__field (uint32_t, pid) + __field(uint64_t, size)
include/trace/events/gpu_mem.h line 54
Quoted 10 lines
include/trace/events/gpu_mem.h new file +10
-0+ ), + TP_fast_assign( + __entry->gpu_id = gpu_id; + __entry->pid = pid; + __entry->size = size; + ), + TP_printk( + "gpu_id=%u " + "pid=%u " + "size=%llu",
Breaking up a string is frowned upon.
TP_print("gpu_id=%u pid=$u size=%llu",
__entry->gpu_id,
__entry->pid,
__entry->size)-- Steve
Quoted 10 lines
include/trace/events/gpu_mem.h new file +10
-0+ __entry->gpu_id, + __entry->pid, + __entry->size + ) +); + +#endif /* _TRACE_GPU_MEM_H */ + +/* This part must be outside protection */ +#include <trace/define_trace.h>
PATCH v2 1/1 Add gpu memory tracepoints
In reply to [email protected]From: Yiwei Zhang <[email protected]>
This change adds the below gpu memory tracepoint:
gpu_mem/gpu_mem_total: track global or process gpu memory total counters
--- 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 | 57 +++++++++++++++++++++++++++++++ 6 files changed, 80 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
drivers/Kconfig +2 -0
@@ -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"
drivers/gpu/Makefile +1 -0
@@ -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/
drivers/gpu/trace/Kconfig new file +4 -0
@@ -0,0 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only + +config TRACE_GPU_MEM + bool
drivers/gpu/trace/Makefile new file +3 -0
@@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0 + +obj-$(CONFIG_TRACE_GPU_MEM) += trace_gpu_mem.o
drivers/gpu/trace/trace_gpu_mem.c new file +13 -0
@@ -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);
include/trace/events/gpu_mem.h new file +57 -0
57 lines not on this page · raw message
Signature · 1 line
2.25.0.225.g125e21ebc7-goog
Hi Steven,
I'm not sure if my use of "in-reply-to" is correct. I can only find the Message-Id of my original email from cmdline. but looks like the diff shows up right.
Best,
Yiwei
Quoted 146 lines · On Wed, Feb 12, 2020 at 6:20 PM <[email protected]> wrote:
From: Yiwei Zhang <[email protected]>
This change adds the below gpu memory tracepoint:
gpu_mem/gpu_mem_total: track global or process gpu memory total countersSigned-off-by Yiwei Zhang <[email protected]>--- 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 | 57 +++++++++++++++++++++++++++++++ 6 files changed, 80 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.hdrivers/Kconfig +2
-0@@ -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"drivers/gpu/Makefile +1
-0@@ -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/drivers/gpu/trace/Kconfig new file +4
-0@@ -0,0 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only + +config TRACE_GPU_MEM + booldrivers/gpu/trace/Makefile new file +3
-0@@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0 + +obj-$(CONFIG_TRACE_GPU_MEM) += trace_gpu_mem.odrivers/gpu/trace/trace_gpu_mem.c new file +13
-0@@ -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);include/trace/events/gpu_mem.h new file +57
-1@@ -0,0 +1,57 @@ +/* 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
Steven Rostedt
maintainerQuoted 5 lines · On Wed, 12 Feb 2020 18:24:32 -0800 Yiwei Zhang <[email protected]> wrote:
Hi Steven,
I'm not sure if my use of "in-reply-to" is correct. I can only find the Message-Id of my original email from cmdline. but looks like the diff shows up right.
You mean this one?
https://lore.kernel.org/lkml/[email protected]/
Looks fine, except I think you meant to make this v3. Also you may have wanted to add a topic, "gpu/trace: "? to the subject.
-- Steve
PATCH v3 1/1 gpu/trace: add gpu memory tracepoints
From: Yiwei Zhang <[email protected]>
This change adds the below gpu memory tracepoint:
gpu_mem/gpu_mem_total: track global or process gpu memory total counters
--- 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 | 57 +++++++++++++++++++++++++++++++ 6 files changed, 80 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
drivers/Kconfig +2 -0
@@ -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"
drivers/gpu/Makefile +1 -0
@@ -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/
drivers/gpu/trace/Kconfig new file +4 -0
@@ -0,0 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only + +config TRACE_GPU_MEM + bool
drivers/gpu/trace/Makefile new file +3 -0
@@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0 + +obj-$(CONFIG_TRACE_GPU_MEM) += trace_gpu_mem.o
drivers/gpu/trace/trace_gpu_mem.c new file +13 -0
@@ -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);
include/trace/events/gpu_mem.h new file +57 -0
57 lines not on this page · raw message
Signature · 1 line
2.25.0.225.g125e21ebc7-goog
Re: [PATCH v3] gpu/trace: add gpu memory tracepoints
Hi Steven,
Just update a v3 here with the gpu/trace: included in the subject line. You might have received a spam v3 previously, which I forgot to include [email protected] for the confusion.
Best,
Yiwei
Steven Rostedt
maintainerRe: [PATCH v3] gpu/trace: add gpu memory tracepoints
In reply to [email protected]Hi Yiwei,
You left off a lot of people that you Cc'd for the previous versions. You'll need at least Greg's acked-by on this, and perhaps even others that own the gpu directory.
-- Steve
Quoted 142 lines · On Wed, 12 Feb 2020 20:23:31 -0800 [email protected] wrote:
From: Yiwei Zhang <[email protected]>
This change adds the below gpu memory tracepoint:
gpu_mem/gpu_mem_total: track global or process gpu memory total countersSigned-off-by Yiwei Zhang <[email protected]>--- 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 | 57 +++++++++++++++++++++++++++++++ 6 files changed, 80 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.hdrivers/Kconfig +2
-0@@ -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"drivers/gpu/Makefile +1
-0@@ -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/drivers/gpu/trace/Kconfig new file +4
-0@@ -0,0 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only + +config TRACE_GPU_MEM + booldrivers/gpu/trace/Makefile new file +3
-0@@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0 + +obj-$(CONFIG_TRACE_GPU_MEM) += trace_gpu_mem.odrivers/gpu/trace/trace_gpu_mem.c new file +13
-0@@ -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);include/trace/events/gpu_mem.h new file +57
-0@@ -0,0 +1,57 @@ +/* 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>
Re: [PATCH v3] gpu/trace: add gpu memory tracepoints
Hi folks,
This [PATCH v3] just re-format the tracepoint definition and update the subject line. Please take another look. Many thanks!
Best,
Yiwei
Quoted 157 lines · Steven Rostedt
Hi Yiwei,
You left off a lot of people that you Cc'd for the previous versions. You'll need at least Greg's acked-by on this, and perhaps even others that own the gpu directory.
-- Steve
Quoted 142 lines · On Wed, 12 Feb 2020 20:23:31 -0800 [email protected] wrote:
From: Yiwei Zhang <[email protected]>
This change adds the below gpu memory tracepoint:
gpu_mem/gpu_mem_total: track global or process gpu memory total countersSigned-off-by Yiwei Zhang <[email protected]>--- 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 | 57 +++++++++++++++++++++++++++++++ 6 files changed, 80 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.hdrivers/Kconfig +2
-0@@ -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"drivers/gpu/Makefile +1
-0@@ -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/drivers/gpu/trace/Kconfig new file +4
-0@@ -0,0 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only + +config TRACE_GPU_MEM + booldrivers/gpu/trace/Makefile new file +3
-0@@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0 + +obj-$(CONFIG_TRACE_GPU_MEM) += trace_gpu_mem.odrivers/gpu/trace/trace_gpu_mem.c new file +13
-0@@ -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);include/trace/events/gpu_mem.h new file +57
-0@@ -0,0 +1,57 @@ +/* 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>
Re: [PATCH v3] gpu/trace: add gpu memory tracepoints
Dear gpu and tracing owners,
It's been a while and this is just a gentle and friendly re-ping for review of this small patch.
Many many thanks!
Yiwei
Steven Rostedt
maintainerRe: [PATCH v3] gpu/trace: add gpu memory tracepoints
Quoted 4 lines · On Sun, 23 Feb 2020 22:31:11 -0800 Yiwei Zhang <[email protected]> wrote:
Dear gpu and tracing owners,
It's been a while and this is just a gentle and friendly re-ping for review of this small patch.
I guess the question is what tree should this go through. I usually only take tracing infrastructure changes and leave topic specific tracing for those that maintain the topics.
I'm fine with taking this through my tree if I get a bunch of acked/reviewed by from other maintainers.
-- Steve
Re: [PATCH v3] gpu/trace: add gpu memory tracepoints
Quoted 9 lines · Steven Rostedt
Quoted 4 lines · On Sun, 23 Feb 2020 22:31:11 -0800 Yiwei Zhang <[email protected]> wrote:
Dear gpu and tracing owners,
It's been a while and this is just a gentle and friendly re-ping for review of this small patch.
Quoted 9 lines
I guess the question is what tree should this go through. I usually only take tracing infrastructure changes and leave topic specific tracing for those that maintain the topics.
I'm fine with taking this through my tree if I get a bunch of acked/reviewed by from other maintainers.
-- Steve
Hi GPU directory owners/maintainers,
Given Steve's reply, could you guys help review and ack this tiny patch? This is a friendly re-ping since it's been more than 2 weeks without any response from gpu directory folks. The patchset v2 was ack'ed by Greg(gregkh@), and this v3 patch only has format updates. Please take another look. Many many thanks!
Best regards,
Yiwei
PATCH v4 1/1 gpu/trace: add a gpu total memory usage tracepoint
From: Yiwei Zhang <[email protected]>
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.
--- 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 | 57 +++++++++++++++++++++++++++++++ 6 files changed, 80 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
drivers/Kconfig +2 -0
@@ -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"
drivers/gpu/Makefile +1 -0
@@ -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/
drivers/gpu/trace/Kconfig new file +4 -0
@@ -0,0 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only + +config TRACE_GPU_MEM + bool
drivers/gpu/trace/Makefile new file +3 -0
@@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0 + +obj-$(CONFIG_TRACE_GPU_MEM) += trace_gpu_mem.o
drivers/gpu/trace/trace_gpu_mem.c new file +13 -0
@@ -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);
include/trace/events/gpu_mem.h new file +57 -0
57 lines not on this page · raw message
Signature · 1 line
2.25.0.265.gbab2e86ba0-goog
Re: [PATCH] [PATCH v4] gpu/trace: add a gpu total memory usage tracepoint
Sorry for the noise here, there's a duplicate "[PATCH]" in the subject line. Please refer to this one instead:
https://lkml.org/lkml/2020/3/2/1181
PATCH v4 1/1 gpu/trace: add a gpu total memory usage tracepoint
In reply to Yiwei ZhangFrom: Yiwei Zhang <[email protected]>
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.
--- 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 | 57 +++++++++++++++++++++++++++++++ 6 files changed, 80 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
drivers/Kconfig +2 -0
@@ -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"
drivers/gpu/Makefile +1 -0
@@ -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/
drivers/gpu/trace/Kconfig new file +4 -0
@@ -0,0 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only + +config TRACE_GPU_MEM + bool
drivers/gpu/trace/Makefile new file +3 -0
@@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0 + +obj-$(CONFIG_TRACE_GPU_MEM) += trace_gpu_mem.o
drivers/gpu/trace/trace_gpu_mem.c new file +13 -0
@@ -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);
include/trace/events/gpu_mem.h new file +57 -0
57 lines not on this page · raw message
Signature · 1 line
2.25.0.265.gbab2e86ba0-goog
Steven Rostedt
maintainerRe: [PATCH v4] gpu/trace: add a gpu total memory usage tracepoint
Greg,
You acked this patch before, did you want to ack it again, and I'll take it in my tree?
-- Steve
Quoted 156 lines · On Mon, 2 Mar 2020 15:50:44 -0800 [email protected] wrote:
From: Yiwei Zhang <[email protected]>
This change adds the below gpu memory tracepoint:
gpu_mem/gpu_mem_total: track global or proc gpu memory total usagesPer 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.
Signed-off-by Yiwei Zhang <[email protected]>--- 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 | 57 +++++++++++++++++++++++++++++++ 6 files changed, 80 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.hdrivers/Kconfig +2
-0@@ -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"drivers/gpu/Makefile +1
-0@@ -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/drivers/gpu/trace/Kconfig new file +4
-0@@ -0,0 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only + +config TRACE_GPU_MEM + booldrivers/gpu/trace/Makefile new file +3
-0@@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0 + +obj-$(CONFIG_TRACE_GPU_MEM) += trace_gpu_mem.odrivers/gpu/trace/trace_gpu_mem.c new file +13
-0@@ -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);include/trace/events/gpu_mem.h new file +57
-0@@ -0,0 +1,57 @@ +/* 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>
Greg KH
Acked-byRe: [PATCH v4] gpu/trace: add a gpu total memory usage tracepoint
Quoted 5 lines · Steven Rostedt
Greg,
You acked this patch before, did you want to ack it again, and I'll take it in my tree?
Sure, but where did my ack go? What changed from previous versions???
Anyway, the patch seems sane enough to me:
Steven Rostedt
maintainerRe: [PATCH v4] gpu/trace: add a gpu total memory usage tracepoint
Quoted 4 lines · On Tue, 3 Mar 2020 15:15:05 +0100 Greg KH <[email protected]> wrote:
Quoted 3 lines · Steven Rostedt
Greg,
Quoted 8 lines
Quoted 2 lines
You acked this patch before, did you want to ack it again, and I'll take it in my tree?
Sure, but where did my ack go? What changed from previous versions???
Anyway, the patch seems sane enough to me:
Your previous ack was was here:
https://lore.kernel.org/lkml/[email protected]/
And the patch changed since then (although, only cosmetically), so your ack was removed. The diff between this patch and the patch you acked is this:
-- Steve
include/trace/events/gpu_mem.h +9 -16
@@ -28,34 +28,27 @@* */ TRACE_EVENT (gpu_mem_total, -TP_PROTO ( - uint32_t gpu_id, - uint32_t pid, - uint64_t size - ), -TP_ARGS ( - gpu_id, - pid, - size - ), + + 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" , + +TP_printk ("gpu_id=%u pid=%u size=%llu" , __entry->gpu_id, __entry->pid, - __entry->size - ) + __entry->size) );#endif /* _TRACE_GPU_MEM_H */
Re: [PATCH v4] gpu/trace: add a gpu total memory usage tracepoint
Quoted 64 lines · Steven Rostedt
Quoted 4 lines · On Tue, 3 Mar 2020 15:15:05 +0100 Greg KH <[email protected]> wrote:
Quoted 3 lines · Steven Rostedt
Greg,
Quoted 8 lines
Quoted 2 lines
You acked this patch before, did you want to ack it again, and I'll take it in my tree?
Sure, but where did my ack go? What changed from previous versions???
Anyway, the patch seems sane enough to me:
Your previous ack was was here:
https://lore.kernel.org/lkml/[email protected]/
And the patch changed since then (although, only cosmetically), so your ack was removed. The diff between this patch and the patch you acked is this:
-- Steve
include/trace/events/gpu_mem.h +6
-14@@ -28,34 +28,27 @@* */ TRACE_EVENT(gpu_mem_total, - TP_PROTO( - uint32_t gpu_id, - uint32_t pid, - uint64_t size - ), - TP_ARGS( - gpu_id, - pid, - size - ), + + 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",
include/trace/events/gpu_mem.h line 54
Quoted 10 lines
include/trace/events/gpu_mem.h +3
-2+ +TP_printk ("gpu_id=%u pid=%u size=%llu" , __entry->gpu_id, __entry->pid, - __entry->size - ) + __entry->size) );#endif /* _TRACE_GPU_MEM_H */
Hi Steve, since Greg has acknowledged again on the latest patch v4, will you help merge from your tree?
Thanks for all the help!
Yiwei
Steven Rostedt
maintainerRe: [PATCH v4] gpu/trace: add a gpu total memory usage tracepoint
Quoted 2 lines · On Tue, 3 Mar 2020 07:15:46 -0800 Yiwei Zhang <[email protected]> wrote:
Hi Steve, since Greg has acknowledged again on the latest patch v4, will you help merge from your tree?
Yes, I can add it to my queue for the next merge window.
-- Steve
Re: [PATCH v4] gpu/trace: add a gpu total memory usage tracepoint
In reply to Steven RostedtQuoted 12 lines · Steven Rostedt
Quoted 9 lines · On Tue, 3 Mar 2020 15:15:05 +0100 Greg KH <[email protected]> wrote:
Quoted 5 lines · Steven Rostedt
Greg,
You acked this patch before, did you want to ack it again, and I'll take it in my tree?
Sure, but where did my ack go? What changed from previous versions???
Quoted 7 lines
Quoted 3 lines
Anyway, the patch seems sane enough to me:
Your previous ack was was here:
Yeah, I remember that.
Quoted 43 lines
And the patch changed since then (although, only cosmetically), so your ack was removed. The diff between this patch and the patch you acked is this:
-- Steve
include/trace/events/gpu_mem.h +6
-14@@ -28,34 +28,27 @@* */ TRACE_EVENT(gpu_mem_total, - TP_PROTO( - uint32_t gpu_id, - uint32_t pid, - uint64_t size - ), - TP_ARGS( - gpu_id, - pid, - size - ), + + 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",
include/trace/events/gpu_mem.h line 54
Quoted 10 lines
include/trace/events/gpu_mem.h +3
-2+ +TP_printk ("gpu_id=%u pid=%u size=%llu" , __entry->gpu_id, __entry->pid, - __entry->size - ) + __entry->size) );#endif /* _TRACE_GPU_MEM_H */
thanks for the diff, my ack still stands.
greg k-h
Re: [PATCH v4] gpu/trace: add a gpu total memory usage tracepoint
Quoted 76 lines · Greg KH
Quoted 12 lines · Steven Rostedt
Quoted 9 lines · On Tue, 3 Mar 2020 15:15:05 +0100 Greg KH <[email protected]> wrote:
Quoted 5 lines · Steven Rostedt
Greg,
You acked this patch before, did you want to ack it again, and I'll take it in my tree?
Sure, but where did my ack go? What changed from previous versions???
Quoted 7 lines
Quoted 3 lines
Anyway, the patch seems sane enough to me:
Your previous ack was was here:
Yeah, I remember that.
Quoted 52 lines
And the patch changed since then (although, only cosmetically), so your ack was removed. The diff between this patch and the patch you acked is this:
-- Steve
include/trace/events/gpu_mem.h +9
-16@@ -28,34 +28,27 @@* */ TRACE_EVENT (gpu_mem_total, -TP_PROTO ( - uint32_t gpu_id, - uint32_t pid, - uint64_t size - ), -TP_ARGS ( - gpu_id, - pid, - size - ), + + 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" , + +TP_printk ("gpu_id=%u pid=%u size=%llu" , __entry->gpu_id, __entry->pid, - __entry->size - ) + __entry->size) );
Quoted 5 lines
include/trace/events/gpu_mem.h line 54
Quoted 1 line
include/trace/events/gpu_mem.h +0
-0#endif /* _TRACE_GPU_MEM_H */ thanks for the diff, my ack still stands.
greg k-h
Hi guys, thanks for all the help throughout this. After struggling a while, I failed to figure out when the next merge window is. Could you help point me to the release calendar or something? Thanks again!
Best,
Yiwei
Steven Rostedt
maintainerRe: [PATCH v4] gpu/trace: add a gpu total memory usage tracepoint
Quoted 3 lines · On Fri, 13 Mar 2020 15:59:37 -0700 Yiwei Zhang <[email protected]> wrote:
Hi guys, thanks for all the help throughout this. After struggling a while, I failed to figure out when the next merge window is. Could you help point me to the release calendar or something? Thanks again!
I have this queued in my local tree. I'm currently having some issues with my testing (there appears to be an unrelated bug to my code keeping it from passing). But you should see this patch fly by when I add it to my linux-next queue.
-- Steve
Re: [PATCH v4] gpu/trace: add a gpu total memory usage tracepoint
Quoted 8 lines · Steven Rostedt
Quoted 3 lines · On Fri, 13 Mar 2020 15:59:37 -0700 Yiwei Zhang <[email protected]> wrote:
Hi guys, thanks for all the help throughout this. After struggling a while, I failed to figure out when the next merge window is. Could you help point me to the release calendar or something? Thanks again!
Quoted 6 lines
I have this queued in my local tree. I'm currently having some issues with my testing (there appears to be an unrelated bug to my code keeping it from passing). But you should see this patch fly by when I add it to my linux-next queue.
-- Steve
Got it. Awesome, thanks Steve!