From d7c3711e7dcf9eb78ec2116f71b5dd0d2420fc86 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 14 Jun 2023 16:16:06 +0000 Subject: [PATCH] Revert "bpf, sockmap: Reschedule is now done through backlog" This reverts commit 1e4e379ccde8c33d4f60c9221003ffe18ec05592. It breaks the Android KABI and will be brought back at a later time when it is safe to do so. Bug: 161946584 Change-Id: I046885f1246a0def7ee238f833ee78ba8a4cecb0 Signed-off-by: Greg Kroah-Hartman --- net/core/skmsg.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/core/skmsg.c b/net/core/skmsg.c index 2dfb6e31e8d0..6a9b794861f3 100644 --- a/net/core/skmsg.c +++ b/net/core/skmsg.c @@ -480,6 +480,8 @@ int sk_msg_recvmsg(struct sock *sk, struct sk_psock *psock, struct msghdr *msg, msg_rx = sk_psock_peek_msg(psock); } out: + if (psock->work_state.skb && copied > 0) + schedule_delayed_work(&psock->work, 0); return copied; } EXPORT_SYMBOL_GPL(sk_msg_recvmsg);