From c7e497384686b85b6f101bc5c940b6cf2d152d1d Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 14 Jun 2023 16:15:57 +0000 Subject: [PATCH] Revert "bpf, sockmap: Wake up polling after data copy" This reverts commit dd628fc697ee59b76bd3877c4bd13f07ccc3776f. 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: Iceb2053c9440a9b52e1d1d331bdd4fb9f8d649c9 Signed-off-by: Greg Kroah-Hartman --- net/core/skmsg.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/net/core/skmsg.c b/net/core/skmsg.c index 062612ee508c..d3ffca1b9646 100644 --- a/net/core/skmsg.c +++ b/net/core/skmsg.c @@ -1196,19 +1196,10 @@ out: static void sk_psock_verdict_data_ready(struct sock *sk) { struct socket *sock = sk->sk_socket; - int copied; if (unlikely(!sock || !sock->ops || !sock->ops->read_skb)) return; - copied = sock->ops->read_skb(sk, sk_psock_verdict_recv); - if (copied >= 0) { - struct sk_psock *psock; - - rcu_read_lock(); - psock = sk_psock(sk); - psock->saved_data_ready(sk); - rcu_read_unlock(); - } + sock->ops->read_skb(sk, sk_psock_verdict_recv); } void sk_psock_start_verdict(struct sock *sk, struct sk_psock *psock)