From e4bd522969262b7139f77bb27cd8b0094ddcaab9 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 25 Jul 2024 06:46:40 +0000 Subject: [PATCH] Revert "ANDROID: Add a vendor hook that allow a module to modify the wake flag" This reverts commit 19919fb4e58ce5c7484c1d70c523ac82891078e6. It causes merge conflicts in 6.10-rc1 and if it is really needed, can come back at a later time after 6.10-final is merged properly. Bug: 302977161 Cc: Namkyu Kim Cc: Dongseok Yi Cc: Subash Abhinov Kasiviswanathan Change-Id: I7db39d307feeb38dc3e164ae9a63e2abeb3ce049 Signed-off-by: Greg Kroah-Hartman --- include/trace/hooks/sched.h | 8 -------- kernel/sched/vendor_hooks.c | 2 -- kernel/sched/wait.c | 6 +----- net/core/sock.c | 13 +------------ 4 files changed, 2 insertions(+), 27 deletions(-) diff --git a/include/trace/hooks/sched.h b/include/trace/hooks/sched.h index 320fbd00f28b..2573bfb46f9c 100644 --- a/include/trace/hooks/sched.h +++ b/include/trace/hooks/sched.h @@ -247,14 +247,6 @@ DECLARE_RESTRICTED_HOOK(android_rvh_update_thermal_stats, TP_PROTO(int cpu), TP_ARGS(cpu), 1); -DECLARE_HOOK(android_vh_do_wake_up_sync, - TP_PROTO(struct wait_queue_head *wq_head, int *done, struct sock *sk), - TP_ARGS(wq_head, done, sk)); - -DECLARE_HOOK(android_vh_set_wake_flags, - TP_PROTO(int *wake_flags, unsigned int *mode), - TP_ARGS(wake_flags, mode)); - /* macro versions of hooks are no longer required */ #endif /* _TRACE_HOOK_SCHED_H */ diff --git a/kernel/sched/vendor_hooks.c b/kernel/sched/vendor_hooks.c index 408a2a96f2a5..e38f51f84dc4 100644 --- a/kernel/sched/vendor_hooks.c +++ b/kernel/sched/vendor_hooks.c @@ -65,5 +65,3 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_schedule_bug); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_sched_exec); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_update_topology_flags_workfn); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_update_thermal_stats); -EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_do_wake_up_sync); -EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_set_wake_flags); diff --git a/kernel/sched/wait.c b/kernel/sched/wait.c index 3e28b779602d..51e38f5f4701 100644 --- a/kernel/sched/wait.c +++ b/kernel/sched/wait.c @@ -4,7 +4,6 @@ * * (C) 2004 Nadia Yvette Chambers, Oracle */ -#include void __init_waitqueue_head(struct wait_queue_head *wq_head, const char *name, struct lock_class_key *key) { @@ -168,13 +167,10 @@ EXPORT_SYMBOL_GPL(__wake_up_locked_key); void __wake_up_sync_key(struct wait_queue_head *wq_head, unsigned int mode, void *key) { - int wake_flags = WF_SYNC; - if (unlikely(!wq_head)) return; - trace_android_vh_set_wake_flags(&wake_flags, &mode); - __wake_up_common_lock(wq_head, mode, 1, wake_flags, key); + __wake_up_common_lock(wq_head, mode, 1, WF_SYNC, key); } EXPORT_SYMBOL_GPL(__wake_up_sync_key); diff --git a/net/core/sock.c b/net/core/sock.c index 3e3fd1ce0666..0963689a5950 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -139,7 +139,6 @@ #include #include -#include #include #include @@ -3351,19 +3350,9 @@ void sock_def_readable(struct sock *sk) rcu_read_lock(); wq = rcu_dereference(sk->sk_wq); - - if (skwq_has_sleeper(wq)) { - int done = 0; - - trace_android_vh_do_wake_up_sync(&wq->wait, &done, sk); - if (done) - goto out; - + if (skwq_has_sleeper(wq)) wake_up_interruptible_sync_poll(&wq->wait, EPOLLIN | EPOLLPRI | EPOLLRDNORM | EPOLLRDBAND); - } - -out: sk_wake_async(sk, SOCK_WAKE_WAITD, POLL_IN); rcu_read_unlock(); }