NothingOSS/android_kernel_msm-6.1_nothing_sm7635
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "bpf, sockmap: Wake up polling after data copy"

Browse source 
This reverts commit dd628fc697.

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 <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman 2023-06-14 16:15:57 +00:00
parent 0851b00164
commit c7e4973846
1 changed files with 1 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
net/core/skmsg.c
View file

@ -1196,19 +1196,10 @@ out:
static void sk_psock_verdict_data_ready(struct sock *sk) static void sk_psock_verdict_data_ready(struct sock *sk)
{ {
struct socket *sock = sk->sk_socket; struct socket *sock = sk->sk_socket;
int copied;
if (unlikely(!sock || !sock->ops || !sock->ops->read_skb)) if (unlikely(!sock || !sock->ops || !sock->ops->read_skb))
return; return;
copied = sock->ops->read_skb(sk, sk_psock_verdict_recv); 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();
}
} }
void sk_psock_start_verdict(struct sock *sk, struct sk_psock *psock) void sk_psock_start_verdict(struct sock *sk, struct sk_psock *psock)