From bf2290a48ae24748ddfc7f34fe0cc8bec9cd6019 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 3 Sep 2021 11:52:26 +0200 Subject: [PATCH] Revert "ANDROID: vendor_hooks: set debugging data when rt_mutex is working" This reverts commit e289faa9f12811d3546def3083bac0cc35c54ba8. The mutex code is rewritten in 5.15-rc1, so hooks like this are no longer in the correct location, if even needed at all. So remove them for now, if vendors still need them, they can add them back in. Cc: JINHO LIM Signed-off-by: Greg Kroah-Hartman Change-Id: Idceef90a86c8794008e2f013d6ff958142661572 --- drivers/android/vendor_hooks.c | 2 -- include/trace/hooks/dtask.h | 8 -------- kernel/locking/rtmutex.c | 3 --- 3 files changed, 13 deletions(-) diff --git a/drivers/android/vendor_hooks.c b/drivers/android/vendor_hooks.c index 34bce7fec11c..5719e972d9f2 100644 --- a/drivers/android/vendor_hooks.c +++ b/drivers/android/vendor_hooks.c @@ -68,8 +68,6 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_alter_rwsem_list_add); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_alter_futex_plist_add); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_mutex_wait_start); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_mutex_wait_finish); -EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_rtmutex_wait_start); -EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_rtmutex_wait_finish); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_rwsem_read_wait_start); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_rwsem_read_wait_finish); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_rwsem_write_wait_start); diff --git a/include/trace/hooks/dtask.h b/include/trace/hooks/dtask.h index eb722ab079cd..8856bdceed06 100644 --- a/include/trace/hooks/dtask.h +++ b/include/trace/hooks/dtask.h @@ -19,14 +19,6 @@ DECLARE_HOOK(android_vh_mutex_wait_finish, TP_PROTO(struct mutex *lock), TP_ARGS(lock)); -struct rt_mutex; -DECLARE_HOOK(android_vh_rtmutex_wait_start, - TP_PROTO(struct rt_mutex *lock), - TP_ARGS(lock)); -DECLARE_HOOK(android_vh_rtmutex_wait_finish, - TP_PROTO(struct rt_mutex *lock), - TP_ARGS(lock)); - struct rw_semaphore; DECLARE_HOOK(android_vh_rwsem_read_wait_start, TP_PROTO(struct rw_semaphore *sem), diff --git a/kernel/locking/rtmutex.c b/kernel/locking/rtmutex.c index b12e4fde00a5..ad0db322ed3b 100644 --- a/kernel/locking/rtmutex.c +++ b/kernel/locking/rtmutex.c @@ -19,7 +19,6 @@ #include #include #include -#include #include "rtmutex_common.h" @@ -1142,7 +1141,6 @@ static int __sched __rt_mutex_slowlock(struct rt_mutex *lock, unsigned int state { int ret = 0; - trace_android_vh_rtmutex_wait_start(lock); for (;;) { /* Try to acquire the lock: */ if (try_to_take_rt_mutex(lock, current, waiter)) @@ -1165,7 +1163,6 @@ static int __sched __rt_mutex_slowlock(struct rt_mutex *lock, unsigned int state set_current_state(state); } - trace_android_vh_rtmutex_wait_finish(lock); __set_current_state(TASK_RUNNING); return ret; }