tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "ANDROID: Add a vendor hook that allow a module to modify the wake flag"

Browse Source 
This reverts commit 19919fb4e5.

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 <namkyu78.kim@samsung.com>
Cc: Dongseok Yi <dseok.yi@samsung.com>
Cc: Subash Abhinov Kasiviswanathan <quic_subashab@quicinc.com>
Change-Id: I7db39d307feeb38dc3e164ae9a63e2abeb3ce049
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2024-07-25 06:46:40 +00:00
parent 3f1278e7d3
commit e4bd522969
4 changed files with 2 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/trace/hooks/sched.h
-8
View File
@@ -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 */
kernel/sched/vendor_hooks.c
-2
View File
@@ -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);
kernel/sched/wait.c
+1 -5
View File
@@ -4,7 +4,6 @@
*
* (C) 2004 Nadia Yvette Chambers, Oracle
*/
#include <trace/hooks/sched.h>
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);
net/core/sock.c
+1 -12
View File
@@ -139,7 +139,6 @@
#include <net/bpf_sk_storage.h>
#include <trace/events/sock.h>
#include <trace/hooks/sched.h>
#include <net/tcp.h>
#include <net/busy_poll.h>
@@ -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();
}