From 64095600fd538eab27c28e2b54f0b0887a68f1f7 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 21 Oct 2021 09:34:04 +0200 Subject: [PATCH] Revert "ANDROID: vendor_hooks: Add hooks to recognize special worker thread." This reverts commit 8f3f46d77c8133ccce52e055a8b4b577699acc5f. The hook android_vh_create_worker 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: 184571803 Cc: Liujie Xie Signed-off-by: Greg Kroah-Hartman Change-Id: I3112f4e067c27ecb6889333bb58f9342df0ecb63 --- drivers/android/vendor_hooks.c | 2 -- include/trace/hooks/workqueue.h | 22 ---------------------- kernel/workqueue.c | 2 -- 3 files changed, 26 deletions(-) delete mode 100644 include/trace/hooks/workqueue.h diff --git a/drivers/android/vendor_hooks.c b/drivers/android/vendor_hooks.c index 8b3800240250..99d492cf8076 100644 --- a/drivers/android/vendor_hooks.c +++ b/drivers/android/vendor_hooks.c @@ -40,7 +40,6 @@ #include #include #include -#include #include #include #include @@ -233,7 +232,6 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_cpufreq_transition); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_cgroup_set_task); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_cgroup_force_kthread_migration); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_syscall_prctl_finished); -EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_create_worker); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_check_preempt_tick); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_replace_next_task_fair); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_do_sched_yield); diff --git a/include/trace/hooks/workqueue.h b/include/trace/hooks/workqueue.h deleted file mode 100644 index 0ffe56433a4c..000000000000 --- a/include/trace/hooks/workqueue.h +++ /dev/null @@ -1,22 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#undef TRACE_SYSTEM -#define TRACE_SYSTEM workqueue -#define TRACE_INCLUDE_PATH trace/hooks - -#if !defined(_TRACE_HOOK_WORKQUEUE_H) || defined(TRACE_HEADER_MULTI_READ) -#define _TRACE_HOOK_WORKQUEUE_H -#include -#include -/* - * Following tracepoints are not exported in tracefs and provide a - * mechanism for vendor modules to hook and extend functionality - */ -struct worker; -DECLARE_HOOK(android_vh_create_worker, - TP_PROTO(struct worker *worker, struct workqueue_attrs *attrs), - TP_ARGS(worker, attrs)); -/* macro versions of hooks are no longer required */ - -#endif /* _TRACE_HOOK_WORKQUEUE_H */ -/* This part must be outside protection */ -#include diff --git a/kernel/workqueue.c b/kernel/workqueue.c index 4d09cece5cb9..6adbbb358e3a 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -55,7 +55,6 @@ #include "workqueue_internal.h" #include -#include /* events/workqueue.h uses default TRACE_INCLUDE_PATH */ #undef TRACE_INCLUDE_PATH @@ -1950,7 +1949,6 @@ static struct worker *create_worker(struct worker_pool *pool) if (IS_ERR(worker->task)) goto fail; - trace_android_vh_create_worker(worker, pool->attrs); set_user_nice(worker->task, pool->attrs->nice); kthread_bind_mask(worker->task, pool->attrs->cpumask);