mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-05 18:41:58 +09:00
bpf, sockmap: Reschedule is now done through backlog
[ Upstream commitbce22552f9] Now that the backlog manages the reschedule() logic correctly we can drop the partial fix to reschedule from recvmsg hook. Rescheduling on recvmsg hook was added to address a corner case where we still had data in the backlog state but had nothing to kick it and reschedule the backlog worker to run and finish copying data out of the state. This had a couple limitations, first it required user space to kick it introducing an unnecessary EBUSY and retry. Second it only handled the ingress case and egress redirects would still be hung. With the correct fix, pushing the reschedule logic down to where the enomem error occurs we can drop this fix. Fixes:bec217197b("skmsg: Schedule psock work if the cached skb exists on the psock") Signed-off-by: John Fastabend <john.fastabend@gmail.com> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> Reviewed-by: Jakub Sitnicki <jakub@cloudflare.com> Link: https://lore.kernel.org/bpf/20230523025618.113937-4-john.fastabend@gmail.com Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
9f4d7efb33
commit
1e4e379ccd
@@ -480,8 +480,6 @@ int sk_msg_recvmsg(struct sock *sk, struct sk_psock *psock, struct msghdr *msg,
|
|||||||
msg_rx = sk_psock_peek_msg(psock);
|
msg_rx = sk_psock_peek_msg(psock);
|
||||||
}
|
}
|
||||||
out:
|
out:
|
||||||
if (psock->work_state.skb && copied > 0)
|
|
||||||
schedule_delayed_work(&psock->work, 0);
|
|
||||||
return copied;
|
return copied;
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(sk_msg_recvmsg);
|
EXPORT_SYMBOL_GPL(sk_msg_recvmsg);
|
||||||
|
|||||||
Reference in New Issue
Block a user