From 0d385a5b58ead06f4a2b6565cb1ce02b922863ce Mon Sep 17 00:00:00 2001 From: "T.J. Mercier" Date: Mon, 17 Jun 2024 15:37:23 +0800 Subject: [PATCH] ANDROID: dma-buf: Add vendor hook for deferred dmabuf sysfs stats release This vendor hook allows for the sysfs activity associated with dma-buf-sysfs-stats teardowns to be performed asynchronously similar to how the initialization works. Bug: 254192604 Signed-off-by: T.J. Mercier Change-Id: Ie076d0f8f67b96a97c71d9e6bf90539ebd9807bf (cherry picked from commit 549f6fcc90a8a3a2640805bf1753de21a074c17f) --- drivers/android/vendor_hooks.c | 2 ++ drivers/dma-buf/dma-buf-sysfs-stats.c | 9 +++++++-- include/trace/hooks/dmabuf.h | 20 ++++++++++++++++++++ 3 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 include/trace/hooks/dmabuf.h diff --git a/drivers/android/vendor_hooks.c b/drivers/android/vendor_hooks.c index 6e54123c015c..491b3b0a8a21 100644 --- a/drivers/android/vendor_hooks.c +++ b/drivers/android/vendor_hooks.c @@ -56,6 +56,7 @@ #include #include #include +#include /* * Export tracepoints that act as a bare tracehook (ie: have no trace event @@ -210,6 +211,7 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_try_to_freeze_todo); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_try_to_freeze_todo_unfrozen); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_die_kernel_fault); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_do_sp_pc_abort); +EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_dma_buf_stats_teardown); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_dpm_wait_start); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_dpm_wait_finish); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_sync_irq_wait_start); diff --git a/drivers/dma-buf/dma-buf-sysfs-stats.c b/drivers/dma-buf/dma-buf-sysfs-stats.c index 86299fd0fe2c..19f1248b4196 100644 --- a/drivers/dma-buf/dma-buf-sysfs-stats.c +++ b/drivers/dma-buf/dma-buf-sysfs-stats.c @@ -12,6 +12,7 @@ #include #include #include +#include #include "dma-buf-sysfs-stats.h" @@ -122,13 +123,17 @@ static const struct kobj_type dma_buf_ktype = { void dma_buf_stats_teardown(struct dma_buf *dmabuf) { struct dma_buf_sysfs_entry *sysfs_entry; + bool skip_sysfs_release = false; sysfs_entry = dmabuf->sysfs_entry; if (!sysfs_entry) return; - kobject_del(&sysfs_entry->kobj); - kobject_put(&sysfs_entry->kobj); + trace_android_rvh_dma_buf_stats_teardown(sysfs_entry, &skip_sysfs_release); + if (!skip_sysfs_release) { + kobject_del(&sysfs_entry->kobj); + kobject_put(&sysfs_entry->kobj); + } } diff --git a/include/trace/hooks/dmabuf.h b/include/trace/hooks/dmabuf.h new file mode 100644 index 000000000000..aa58f36c6fb1 --- /dev/null +++ b/include/trace/hooks/dmabuf.h @@ -0,0 +1,20 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#undef TRACE_SYSTEM +#define TRACE_SYSTEM dmabuf + +#undef TRACE_INCLUDE_PATH +#define TRACE_INCLUDE_PATH trace/hooks + +#if !defined(_TRACE_HOOK_DMABUF_H) || defined(TRACE_HEADER_MULTI_READ) +#define _TRACE_HOOK_DMABUF_H + +#include + +struct dma_buf_sysfs_entry; +DECLARE_RESTRICTED_HOOK(android_rvh_dma_buf_stats_teardown, + TP_PROTO(struct dma_buf_sysfs_entry *sysfs_entry, bool *skip_sysfs_release), + TP_ARGS(sysfs_entry, skip_sysfs_release), 1); +#endif /* _TRACE_HOOK_DMABUF_H */ +/* This part must be outside protection */ +#include