From fda78dabcaec2129e98825ce0f09e585571e83fb Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sat, 18 Feb 2023 15:10:20 +0000 Subject: [PATCH] Revert "ANDROID: GKI: Add vendor hook to binder transaction" This reverts commit cabca1b98e40a2b087c5cea3949ebf18dcd46999. The hook android_rvh_binder_transaction is not used by any vendor, so remove it to help with merge issues with future LTS releases. If this is needed by any real user, it can easily be reverted to add it back and then the symbol should be added to the abi list at the same time to prevent it from being removed again later. Bug: 205648032 Bug: 203756332 Cc: Liangliang Li Signed-off-by: Greg Kroah-Hartman Change-Id: I46394ebf00b7aa882f6df37ee3eec5cdc0263579 --- drivers/android/binder.c | 1 - drivers/android/vendor_hooks.c | 1 - include/trace/hooks/binder.h | 4 ---- 3 files changed, 6 deletions(-) diff --git a/drivers/android/binder.c b/drivers/android/binder.c index 903ea3efbcc9..314b295df907 100644 --- a/drivers/android/binder.c +++ b/drivers/android/binder.c @@ -2998,7 +2998,6 @@ static void binder_transaction(struct binder_proc *proc, if (target_thread) e->to_thread = target_thread->pid; e->to_proc = target_proc->pid; - trace_android_rvh_binder_transaction(target_proc, proc, thread, tr); /* TODO: reuse incoming transaction for reply */ t = kzalloc(sizeof(*t), GFP_KERNEL); diff --git a/drivers/android/vendor_hooks.c b/drivers/android/vendor_hooks.c index bd9538802d3f..4056091034b6 100644 --- a/drivers/android/vendor_hooks.c +++ b/drivers/android/vendor_hooks.c @@ -228,7 +228,6 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_cpuidle_psci_enter); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_cpuidle_psci_exit); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_cgroup_force_kthread_migration); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_binder_wait_for_work); -EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_binder_transaction); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_binder_proc_transaction_entry); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_binder_select_worklist_ilocked); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_binder_proc_transaction_finish); diff --git a/include/trace/hooks/binder.h b/include/trace/hooks/binder.h index 99ee00c77a7e..b442c86d79ce 100644 --- a/include/trace/hooks/binder.h +++ b/include/trace/hooks/binder.h @@ -43,10 +43,6 @@ DECLARE_HOOK(android_vh_binder_wait_for_work, DECLARE_HOOK(android_vh_sync_txn_recvd, TP_PROTO(struct task_struct *tsk, struct task_struct *from), TP_ARGS(tsk, from)); -DECLARE_RESTRICTED_HOOK(android_rvh_binder_transaction, - TP_PROTO(struct binder_proc *target_proc, struct binder_proc *proc, - struct binder_thread *thread, struct binder_transaction_data *tr), - TP_ARGS(target_proc, proc, thread, tr), 1); DECLARE_HOOK(android_vh_binder_proc_transaction_entry, TP_PROTO(struct binder_proc *proc, struct binder_transaction *t, struct binder_thread **thread, int node_debug_id, bool pending_async,