diff --git a/drivers/android/vendor_hooks.c b/drivers/android/vendor_hooks.c index d560210730bf..a4778e273887 100644 --- a/drivers/android/vendor_hooks.c +++ b/drivers/android/vendor_hooks.c @@ -12,7 +12,6 @@ #include #include #include -#include #include #include #include @@ -66,15 +65,6 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_binder_transaction_init); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_binder_set_priority); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_binder_restore_priority); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_binder_wakeup_ilocked); -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); -EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_rwsem_write_wait_finish); -EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_sched_show_task); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_cpu_idle_enter); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_cpu_idle_exit); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_mpam_set); diff --git a/include/trace/hooks/dtask.h b/include/trace/hooks/dtask.h deleted file mode 100644 index 6f005d49b4e2..000000000000 --- a/include/trace/hooks/dtask.h +++ /dev/null @@ -1,50 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#undef TRACE_SYSTEM -#define TRACE_SYSTEM dtask -#define TRACE_INCLUDE_PATH trace/hooks - -#if !defined(_TRACE_HOOK_DTASK_H) || defined(TRACE_HEADER_MULTI_READ) -#define _TRACE_HOOK_DTASK_H -#include -/* - * Following tracepoints are not exported in tracefs and provide a - * mechanism for vendor modules to hook and extend functionality - */ -struct mutex; -DECLARE_HOOK(android_vh_mutex_wait_start, - TP_PROTO(struct mutex *lock), - TP_ARGS(lock)); -DECLARE_HOOK(android_vh_mutex_wait_finish, - TP_PROTO(struct mutex *lock), - TP_ARGS(lock)); - -struct rt_mutex_base; -DECLARE_HOOK(android_vh_rtmutex_wait_start, - TP_PROTO(struct rt_mutex_base *lock), - TP_ARGS(lock)); -DECLARE_HOOK(android_vh_rtmutex_wait_finish, - TP_PROTO(struct rt_mutex_base *lock), - TP_ARGS(lock)); - -struct rw_semaphore; -DECLARE_HOOK(android_vh_rwsem_read_wait_start, - TP_PROTO(struct rw_semaphore *sem), - TP_ARGS(sem)); -DECLARE_HOOK(android_vh_rwsem_read_wait_finish, - TP_PROTO(struct rw_semaphore *sem), - TP_ARGS(sem)); -DECLARE_HOOK(android_vh_rwsem_write_wait_start, - TP_PROTO(struct rw_semaphore *sem), - TP_ARGS(sem)); -DECLARE_HOOK(android_vh_rwsem_write_wait_finish, - TP_PROTO(struct rw_semaphore *sem), - TP_ARGS(sem)); - -struct task_struct; -DECLARE_HOOK(android_vh_sched_show_task, - TP_PROTO(struct task_struct *task), - TP_ARGS(task)); - -#endif /* _TRACE_HOOK_DTASK_H */ -/* This part must be outside protection */ -#include diff --git a/kernel/locking/mutex.c b/kernel/locking/mutex.c index 97437e69acdd..5e3585950ec8 100644 --- a/kernel/locking/mutex.c +++ b/kernel/locking/mutex.c @@ -39,8 +39,6 @@ # define MUTEX_WARN_ON(cond) #endif -#include - void __mutex_init(struct mutex *lock, const char *name, struct lock_class_key *key) { @@ -642,7 +640,6 @@ __mutex_lock_common(struct mutex *lock, unsigned int state, unsigned int subclas goto err_early_kill; } - trace_android_vh_mutex_wait_start(lock); set_current_state(state); for (;;) { bool first; @@ -692,7 +689,6 @@ __mutex_lock_common(struct mutex *lock, unsigned int state, unsigned int subclas raw_spin_lock(&lock->wait_lock); acquired: __set_current_state(TASK_RUNNING); - trace_android_vh_mutex_wait_finish(lock); if (ww_ctx) { /* @@ -721,7 +717,6 @@ __mutex_lock_common(struct mutex *lock, unsigned int state, unsigned int subclas err: __set_current_state(TASK_RUNNING); - trace_android_vh_mutex_wait_finish(lock); __mutex_remove_waiter(lock, &waiter); err_early_kill: raw_spin_unlock(&lock->wait_lock); diff --git a/kernel/locking/rtmutex.c b/kernel/locking/rtmutex.c index e65ead81ba5d..8555c4efe97c 100644 --- a/kernel/locking/rtmutex.c +++ b/kernel/locking/rtmutex.c @@ -23,7 +23,6 @@ #include #include #include -#include #include "rtmutex_common.h" @@ -1489,7 +1488,6 @@ static int __sched rt_mutex_slowlock_block(struct rt_mutex_base *lock, struct task_struct *owner; 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)) @@ -1523,7 +1521,6 @@ static int __sched rt_mutex_slowlock_block(struct rt_mutex_base *lock, set_current_state(state); } - trace_android_vh_rtmutex_wait_finish(lock); __set_current_state(TASK_RUNNING); return ret; } diff --git a/kernel/locking/rwsem.c b/kernel/locking/rwsem.c index a99be2882ed6..acde5d6f1254 100644 --- a/kernel/locking/rwsem.c +++ b/kernel/locking/rwsem.c @@ -30,7 +30,6 @@ #ifndef CONFIG_PREEMPT_RT #include "lock_events.h" -#include /* * The least significant 2 bits of the owner value has the following @@ -1016,7 +1015,6 @@ rwsem_down_read_slowpath(struct rw_semaphore *sem, long count, unsigned int stat wake_up_q(&wake_q); /* wait to be given the lock */ - trace_android_vh_rwsem_read_wait_start(sem); for (;;) { set_current_state(state); if (!smp_load_acquire(&waiter.task)) { @@ -1036,7 +1034,6 @@ rwsem_down_read_slowpath(struct rw_semaphore *sem, long count, unsigned int stat } __set_current_state(TASK_RUNNING); - trace_android_vh_rwsem_read_wait_finish(sem); lockevent_inc(rwsem_rlock); return sem; @@ -1044,7 +1041,6 @@ rwsem_down_read_slowpath(struct rw_semaphore *sem, long count, unsigned int stat rwsem_del_waiter(sem, &waiter); raw_spin_unlock_irq(&sem->wait_lock); __set_current_state(TASK_RUNNING); - trace_android_vh_rwsem_read_wait_finish(sem); lockevent_inc(rwsem_rlock_fail); return ERR_PTR(-EINTR); } @@ -1112,7 +1108,6 @@ rwsem_down_write_slowpath(struct rw_semaphore *sem, int state) wait: /* wait until we successfully acquire the lock */ - trace_android_vh_rwsem_write_wait_start(sem); set_current_state(state); for (;;) { if (rwsem_try_write_lock(sem, &waiter)) { @@ -1151,14 +1146,12 @@ rwsem_down_write_slowpath(struct rw_semaphore *sem, int state) raw_spin_lock_irq(&sem->wait_lock); } __set_current_state(TASK_RUNNING); - trace_android_vh_rwsem_write_wait_finish(sem); raw_spin_unlock_irq(&sem->wait_lock); lockevent_inc(rwsem_wlock); return sem; out_nolock: __set_current_state(TASK_RUNNING); - trace_android_vh_rwsem_write_wait_finish(sem); raw_spin_lock_irq(&sem->wait_lock); rwsem_del_waiter(sem, &waiter); if (!list_empty(&sem->wait_list)) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 5e93c2285107..0e96851c81dc 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -28,7 +28,6 @@ #include "smp.h" #include -#include /* * Export tracepoints that act as a bare tracehook (ie: have no trace event @@ -8651,7 +8650,6 @@ void sched_show_task(struct task_struct *p) print_worker_info(KERN_INFO, p); print_stop_info(KERN_INFO, p); - trace_android_vh_sched_show_task(p); show_stack(p, NULL, KERN_INFO); put_task_stack(p); }