From e97fed285679eee64d142b9e6e286896021ac141 Mon Sep 17 00:00:00 2001 From: Namkyu Kim Date: Thu, 4 Mar 2021 09:31:56 +0900 Subject: [PATCH] ANDROID: Add a vendor hook that allow a module to modify the wake flag android_vh_do_wake_up_sync: To modify the mode value of __wake_up_sync_key android_vh_set_wake_flags: To modify the wake flag from a module Bug: 181743516 Bug: 263838089 Signed-off-by: Namkyu Kim Change-Id: I972e2469c3f139373d21f1e8c85974763388a693 (cherry picked from commit 97368fc2dcc29777e8d3d637d0afdef90e611763) (cherry picked from commit 0d0f0c5020bc425c9a51c8d17b16ca831c2598fb) [Dongseok Yi: Moved into kernel/sched/vendor_hooks.c per commit 5f657b04f4f2 ("ANDROID: subsystem-specific vendor_hooks.c for sched")] Signed-off-by: Dongseok Yi --- 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, 27 insertions(+), 2 deletions(-) diff --git a/include/trace/hooks/sched.h b/include/trace/hooks/sched.h index 0773eae433a6..c94e0484cb39 100644 --- a/include/trace/hooks/sched.h +++ b/include/trace/hooks/sched.h @@ -317,6 +317,14 @@ 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), + TP_ARGS(wq_head, done)); + +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 a5a581cf888c..26dc388f983d 100644 --- a/kernel/sched/vendor_hooks.c +++ b/kernel/sched/vendor_hooks.c @@ -82,3 +82,5 @@ 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 9860bb9a847c..ba93b6cba096 100644 --- a/kernel/sched/wait.c +++ b/kernel/sched/wait.c @@ -4,6 +4,7 @@ * * (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) { @@ -198,10 +199,13 @@ EXPORT_SYMBOL_GPL(__wake_up_locked_key_bookmark); 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; - __wake_up_common_lock(wq_head, mode, 1, WF_SYNC, key); + trace_android_vh_set_wake_flags(&wake_flags, &mode); + __wake_up_common_lock(wq_head, mode, 1, wake_flags, key); } EXPORT_SYMBOL_GPL(__wake_up_sync_key); diff --git a/net/core/sock.c b/net/core/sock.c index a3ba0358c77c..587e8dbe9cac 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -135,6 +135,7 @@ #include #include +#include #include #include @@ -3271,9 +3272,19 @@ void sock_def_readable(struct sock *sk) rcu_read_lock(); wq = rcu_dereference(sk->sk_wq); - if (skwq_has_sleeper(wq)) + + if (skwq_has_sleeper(wq)) { + int done = 0; + + trace_android_vh_do_wake_up_sync(&wq->wait, &done); + if (done) + goto out; + wake_up_interruptible_sync_poll(&wq->wait, EPOLLIN | EPOLLPRI | EPOLLRDNORM | EPOLLRDBAND); + } + +out: sk_wake_async(sk, SOCK_WAKE_WAITD, POLL_IN); rcu_read_unlock(); }