From 4b3396046c76922a86ea3bb0792f0095b59d19f7 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 21 Oct 2021 13:29:34 +0200 Subject: [PATCH] Revert "ANDROID: vendor_hooks: Add a hook for task tagging" This reverts commit cadbca1c5e17b746b994cd6b18ae6d927f41ae5e. The hook android_vh_set_task_comm 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: 203756332 Bug: 189352151 Cc: ted.lin Signed-off-by: Greg Kroah-Hartman Change-Id: I005ad1c1a55f8646e5bbccd142827eed553411f6 --- drivers/android/vendor_hooks.c | 1 - fs/exec.c | 2 -- include/trace/hooks/sched.h | 4 ---- 3 files changed, 7 deletions(-) diff --git a/drivers/android/vendor_hooks.c b/drivers/android/vendor_hooks.c index bdfd287971c6..afbf68f586f7 100644 --- a/drivers/android/vendor_hooks.c +++ b/drivers/android/vendor_hooks.c @@ -325,7 +325,6 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_save_vmalloc_stack); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_show_stack_hash); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_save_track_hash); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_vmpressure); -EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_set_task_comm); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_cpufreq_acct_update_power); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_typec_tcpm_log); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_media_device_setup_link); diff --git a/fs/exec.c b/fs/exec.c index ec5ef10ce2db..5ce144cf810f 100644 --- a/fs/exec.c +++ b/fs/exec.c @@ -73,7 +73,6 @@ #include "internal.h" #include -#include EXPORT_TRACEPOINT_SYMBOL_GPL(task_rename); @@ -1230,7 +1229,6 @@ void __set_task_comm(struct task_struct *tsk, const char *buf, bool exec) strlcpy(tsk->comm, buf, sizeof(tsk->comm)); task_unlock(tsk); perf_event_comm(tsk, exec); - trace_android_vh_set_task_comm(tsk); } /* diff --git a/include/trace/hooks/sched.h b/include/trace/hooks/sched.h index 92690acc1197..55fc6c3a1a89 100644 --- a/include/trace/hooks/sched.h +++ b/include/trace/hooks/sched.h @@ -363,10 +363,6 @@ DECLARE_HOOK(android_vh_dup_task_struct, TP_PROTO(struct task_struct *tsk, struct task_struct *orig), TP_ARGS(tsk, orig)); -DECLARE_HOOK(android_vh_set_task_comm, - TP_PROTO(struct task_struct *p), - TP_ARGS(p)); - DECLARE_RESTRICTED_HOOK(android_rvh_find_new_ilb, TP_PROTO(struct cpumask *nohz_idle_cpus_mask, int *ilb), TP_ARGS(nohz_idle_cpus_mask, ilb), 1);