* [PATCH bpf] skmsg: schedule psock work if the cached skb exists on the psock
@ 2022-09-07 7:13 Liu Jian
2022-09-22 18:19 ` John Fastabend
2022-09-26 16:00 ` patchwork-bot+netdevbpf
0 siblings, 2 replies; 3+ messages in thread
From: Liu Jian @ 2022-09-07 7:13 UTC (permalink / raw)
To: john.fastabend, jakub, davem, edumazet, kuba, pabeni, daniel,
ast, netdev, bpf
Cc: liujian56
In sk_psock_backlog function, for ingress direction skb, if no new data
packet arrives after the skb is cached, the cached skb does not have a
chance to be added to the receive queue of psock. As a result, the cached
skb cannot be received by the upper-layer application.
Fix this by reschedule the psock work to dispose the cached skb in
sk_msg_recvmsg function.
Fixes: 604326b41a6f ("bpf, sockmap: convert to generic sk_msg interface")
Signed-off-by: Liu Jian <liujian56@huawei.com>
---
net/core/skmsg.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/net/core/skmsg.c b/net/core/skmsg.c
index 188f8558d27d..ca70525621c7 100644
--- a/net/core/skmsg.c
+++ b/net/core/skmsg.c
@@ -434,8 +434,10 @@ int sk_msg_recvmsg(struct sock *sk, struct sk_psock *psock, struct msghdr *msg,
if (copied + copy > len)
copy = len - copied;
copy = copy_page_to_iter(page, sge->offset, copy, iter);
- if (!copy)
- return copied ? copied : -EFAULT;
+ if (!copy) {
+ copied = copied ? copied : -EFAULT;
+ goto out;
+ }
copied += copy;
if (likely(!peek)) {
@@ -455,7 +457,7 @@ int sk_msg_recvmsg(struct sock *sk, struct sk_psock *psock, struct msghdr *msg,
* didn't copy the entire length lets just break.
*/
if (copy != sge->length)
- return copied;
+ goto out;
sk_msg_iter_var_next(i);
}
@@ -477,7 +479,9 @@ 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_work(&psock->work);
return copied;
}
EXPORT_SYMBOL_GPL(sk_msg_recvmsg);
--
2.17.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* RE: [PATCH bpf] skmsg: schedule psock work if the cached skb exists on the psock
2022-09-07 7:13 [PATCH bpf] skmsg: schedule psock work if the cached skb exists on the psock Liu Jian
@ 2022-09-22 18:19 ` John Fastabend
2022-09-26 16:00 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 3+ messages in thread
From: John Fastabend @ 2022-09-22 18:19 UTC (permalink / raw)
To: Liu Jian, john.fastabend, jakub, davem, edumazet, kuba, pabeni,
daniel, ast, netdev, bpf
Cc: liujian56
Liu Jian wrote:
> In sk_psock_backlog function, for ingress direction skb, if no new data
> packet arrives after the skb is cached, the cached skb does not have a
> chance to be added to the receive queue of psock. As a result, the cached
> skb cannot be received by the upper-layer application.
>
> Fix this by reschedule the psock work to dispose the cached skb in
> sk_msg_recvmsg function.
>
> Fixes: 604326b41a6f ("bpf, sockmap: convert to generic sk_msg interface")
> Signed-off-by: Liu Jian <liujian56@huawei.com>
> ---
Yep thanks. We have another fix coming for a similar case with ENOMEM
through backlog. I'll post here before end of week.
Acked-by: John Fastabend <john.fastabend@gmail.com>
> net/core/skmsg.c | 12 ++++++++----
> 1 file changed, 8 insertions(+), 4 deletions(-)
>
> diff --git a/net/core/skmsg.c b/net/core/skmsg.c
> index 188f8558d27d..ca70525621c7 100644
> --- a/net/core/skmsg.c
> +++ b/net/core/skmsg.c
> @@ -434,8 +434,10 @@ int sk_msg_recvmsg(struct sock *sk, struct sk_psock *psock, struct msghdr *msg,
> if (copied + copy > len)
> copy = len - copied;
> copy = copy_page_to_iter(page, sge->offset, copy, iter);
> - if (!copy)
> - return copied ? copied : -EFAULT;
> + if (!copy) {
> + copied = copied ? copied : -EFAULT;
> + goto out;
> + }
>
> copied += copy;
> if (likely(!peek)) {
> @@ -455,7 +457,7 @@ int sk_msg_recvmsg(struct sock *sk, struct sk_psock *psock, struct msghdr *msg,
> * didn't copy the entire length lets just break.
> */
> if (copy != sge->length)
> - return copied;
> + goto out;
> sk_msg_iter_var_next(i);
> }
>
> @@ -477,7 +479,9 @@ 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_work(&psock->work);
> return copied;
> }
> EXPORT_SYMBOL_GPL(sk_msg_recvmsg);
> --
> 2.17.1
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH bpf] skmsg: schedule psock work if the cached skb exists on the psock
2022-09-07 7:13 [PATCH bpf] skmsg: schedule psock work if the cached skb exists on the psock Liu Jian
2022-09-22 18:19 ` John Fastabend
@ 2022-09-26 16:00 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 3+ messages in thread
From: patchwork-bot+netdevbpf @ 2022-09-26 16:00 UTC (permalink / raw)
To: Liu Jian
Cc: john.fastabend, jakub, davem, edumazet, kuba, pabeni, daniel,
ast, netdev, bpf
Hello:
This patch was applied to bpf/bpf-next.git (master)
by Daniel Borkmann <daniel@iogearbox.net>:
On Wed, 7 Sep 2022 15:13:11 +0800 you wrote:
> In sk_psock_backlog function, for ingress direction skb, if no new data
> packet arrives after the skb is cached, the cached skb does not have a
> chance to be added to the receive queue of psock. As a result, the cached
> skb cannot be received by the upper-layer application.
>
> Fix this by reschedule the psock work to dispose the cached skb in
> sk_msg_recvmsg function.
>
> [...]
Here is the summary with links:
- [bpf] skmsg: schedule psock work if the cached skb exists on the psock
https://git.kernel.org/bpf/bpf-next/c/bec217197b41
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-09-26 17:00 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-07 7:13 [PATCH bpf] skmsg: schedule psock work if the cached skb exists on the psock Liu Jian
2022-09-22 18:19 ` John Fastabend
2022-09-26 16:00 ` patchwork-bot+netdevbpf
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.