From 0fb2278c2a30750d9d630291448e89062156269d Mon Sep 17 00:00:00 2001 From: Liujie Xie Date: Tue, 14 Jun 2022 17:47:19 +0800 Subject: [PATCH] ANDROID: vendor_hooks: Add hooks for rwsem and mutex Add hooks to apply oem's optimization of rwsem and mutex Bug: 182237112 Signed-off-by: Liujie Xie (cherry picked from commit 80b4341d0520dce2ef1e33aef06c6a2bc8ada518) Change-Id: I36895c432e5b6d6bff8781b4a7872badb693284c Signed-off-by: Carlos Llamas [cmllamas: completes the cherry-pick of original commit 80b4341d0520 since commit 0902cc73b793 was only partial] Signed-off-by: Jing Xia --- drivers/android/vendor_hooks.c | 1 + include/trace/hooks/rwsem.h | 3 +++ kernel/locking/rwsem.c | 1 + 3 files changed, 5 insertions(+) diff --git a/drivers/android/vendor_hooks.c b/drivers/android/vendor_hooks.c index 0049f7526def..7ae5f0710dde 100644 --- a/drivers/android/vendor_hooks.c +++ b/drivers/android/vendor_hooks.c @@ -147,3 +147,4 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_rwsem_wake); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_rwsem_write_finished); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_alter_rwsem_list_add); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_rwsem_downgrade_wake_finish); +EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_rwsem_wake_finish); diff --git a/include/trace/hooks/rwsem.h b/include/trace/hooks/rwsem.h index 40d960d4e29f..77e34478a42f 100644 --- a/include/trace/hooks/rwsem.h +++ b/include/trace/hooks/rwsem.h @@ -28,6 +28,9 @@ DECLARE_HOOK(android_vh_alter_rwsem_list_add, DECLARE_HOOK(android_vh_rwsem_downgrade_wake_finish, TP_PROTO(struct rw_semaphore *sem), TP_ARGS(sem)); +DECLARE_HOOK(android_vh_rwsem_wake_finish, + TP_PROTO(struct rw_semaphore *sem), + TP_ARGS(sem)); #endif /* _TRACE_HOOK_RWSEM_H */ /* This part must be outside protection */ #include diff --git a/kernel/locking/rwsem.c b/kernel/locking/rwsem.c index 4c6524464fdd..9f16fc9376e9 100644 --- a/kernel/locking/rwsem.c +++ b/kernel/locking/rwsem.c @@ -1228,6 +1228,7 @@ static struct rw_semaphore *rwsem_wake(struct rw_semaphore *sem) if (!list_empty(&sem->wait_list)) rwsem_mark_wake(sem, RWSEM_WAKE_ANY, &wake_q); + trace_android_vh_rwsem_wake_finish(sem); raw_spin_unlock_irqrestore(&sem->wait_lock, flags); wake_up_q(&wake_q);