moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "ANDROID: vendor_hooks: add waiting information for blocked tasks"

Browse Source 
This reverts portions of commit 9ad8ff902e

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.

Signed-off-by: Sangmoon Kim <sangmoon.kim@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ib85c108e5bb306faea4fef5e0ca3b617a7f8f5c6
This commit is contained in:
Greg Kroah-Hartman
2021-09-03 15:22:26 +02:00
parent bf2290a48a
commit 31c9ccb138
3 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/android/vendor_hooks.c
View File

@@ -66,8 +66,6 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_rwsem_wake);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_rwsem_write_finished); 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_alter_rwsem_list_add);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_alter_futex_plist_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_rwsem_read_wait_start); 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_read_wait_finish);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_rwsem_write_wait_start); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_rwsem_write_wait_start);

8
include/trace/hooks/dtask.h
View File

@@ -11,14 +11,6 @@
* Following tracepoints are not exported in tracefs and provide a * Following tracepoints are not exported in tracefs and provide a
* mechanism for vendor modules to hook and extend functionality * 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 rw_semaphore; struct rw_semaphore;
DECLARE_HOOK(android_vh_rwsem_read_wait_start, DECLARE_HOOK(android_vh_rwsem_read_wait_start,
TP_PROTO(struct rw_semaphore *sem), TP_PROTO(struct rw_semaphore *sem),

6
kernel/locking/mutex.c
View File

@@ -36,8 +36,6 @@
# include "mutex.h" # include "mutex.h"
#endif #endif
#include <trace/hooks/dtask.h>
void void
__mutex_init(struct mutex *lock, const char *name, struct lock_class_key *key) __mutex_init(struct mutex *lock, const char *name, struct lock_class_key *key)
{ {
@@ -1007,7 +1005,6 @@ __mutex_lock_common(struct mutex *lock, unsigned int state, unsigned int subclas
waiter.task = current; waiter.task = current;
trace_android_vh_mutex_wait_start(lock);
set_current_state(state); set_current_state(state);
for (;;) { for (;;) {
/* /*
@@ -1063,7 +1060,6 @@ __mutex_lock_common(struct mutex *lock, unsigned int state, unsigned int subclas
spin_lock(&lock->wait_lock); spin_lock(&lock->wait_lock);
acquired: acquired:
__set_current_state(TASK_RUNNING); __set_current_state(TASK_RUNNING);
trace_android_vh_mutex_wait_finish(lock);
if (ww_ctx) { if (ww_ctx) {
/* /*
@@ -1092,8 +1088,6 @@ skip_wait:
err: err:
__set_current_state(TASK_RUNNING); __set_current_state(TASK_RUNNING);
trace_android_vh_mutex_wait_finish(lock);
__mutex_remove_waiter(lock, &waiter);
err_early_kill: err_early_kill:
spin_unlock(&lock->wait_lock); spin_unlock(&lock->wait_lock);
debug_mutex_free_waiter(&waiter); debug_mutex_free_waiter(&waiter);