renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-24 13:13:57 +08:00
Code

bpf, sockmap: Fix missing BPF_F_INGRESS flag when using apply_bytes

Browse Source 
When redirecting, we use sk_msg_to_ingress() to get the BPF_F_INGRESS
flag from the msg->flags. If apply_bytes is used and it is larger than
the current data being processed, sk_psock_msg_verdict() will not be
called when sendmsg() is called again. At this time, the msg->flags is 0,
and we lost the BPF_F_INGRESS flag.

So we need to save the BPF_F_INGRESS flag in sk_psock and use it when
redirection.

Fixes: 8934ce2fd0 ("bpf: sockmap redirect ingress support")
Signed-off-by: Pengcheng Yang <yangpc@wangsu.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Jakub Sitnicki <jakub@cloudflare.com>
Link: https://lore.kernel.org/bpf/1669718441-2654-3-git-send-email-yangpc@wangsu.com
This commit is contained in:
Pengcheng Yang 2022-11-29 18:40:39 +08:00 committed by Daniel Borkmann
parent 7a9841ca02
commit a351d6087b
5 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/linux/skmsg.h
View File

@ -82,6 +82,7 @@ struct sk_psock {
u32 apply_bytes; u32 apply_bytes;
u32 cork_bytes; u32 cork_bytes;
u32 eval; u32 eval;
bool redir_ingress; /* undefined if sk_redir is null */
struct sk_msg *cork; struct sk_msg *cork;
struct sk_psock_progs progs; struct sk_psock_progs progs;
#if IS_ENABLED(CONFIG_BPF_STREAM_PARSER) #if IS_ENABLED(CONFIG_BPF_STREAM_PARSER)

4
include/net/tcp.h
View File

@ -2319,8 +2319,8 @@ int tcp_bpf_update_proto(struct sock *sk, struct sk_psock *psock, bool restore);
void tcp_bpf_clone(const struct sock *sk, struct sock *newsk); void tcp_bpf_clone(const struct sock *sk, struct sock *newsk);
#endif /* CONFIG_BPF_SYSCALL */ #endif /* CONFIG_BPF_SYSCALL */
int tcp_bpf_sendmsg_redir(struct sock *sk, struct sk_msg *msg, u32 bytes, int tcp_bpf_sendmsg_redir(struct sock *sk, bool ingress,
int flags); struct sk_msg *msg, u32 bytes, int flags);
#endif /* CONFIG_NET_SOCK_MSG */ #endif /* CONFIG_NET_SOCK_MSG */
#if !defined(CONFIG_BPF_SYSCALL) || !defined(CONFIG_NET_SOCK_MSG) #if !defined(CONFIG_BPF_SYSCALL) || !defined(CONFIG_NET_SOCK_MSG)

9
net/core/skmsg.c
View File

@ -886,13 +886,16 @@ int sk_psock_msg_verdict(struct sock *sk, struct sk_psock *psock,
ret = sk_psock_map_verd(ret, msg->sk_redir); ret = sk_psock_map_verd(ret, msg->sk_redir);
psock->apply_bytes = msg->apply_bytes; psock->apply_bytes = msg->apply_bytes;
if (ret == __SK_REDIRECT) { if (ret == __SK_REDIRECT) {
if (psock->sk_redir) if (psock->sk_redir) {
sock_put(psock->sk_redir); sock_put(psock->sk_redir);
psock->sk_redir = msg->sk_redir; psock->sk_redir = NULL;
if (!psock->sk_redir) { }
if (!msg->sk_redir) {
ret = __SK_DROP; ret = __SK_DROP;
goto out; goto out;
} }
psock->redir_ingress = sk_msg_to_ingress(msg);
psock->sk_redir = msg->sk_redir;
sock_hold(psock->sk_redir); sock_hold(psock->sk_redir);
} }
out: out:

11
net/ipv4/tcp_bpf.c
View File

@ -131,10 +131,9 @@ static int tcp_bpf_push_locked(struct sock *sk, struct sk_msg *msg,
return ret; return ret;
} }
int tcp_bpf_sendmsg_redir(struct sock *sk, struct sk_msg *msg, int tcp_bpf_sendmsg_redir(struct sock *sk, bool ingress,
u32 bytes, int flags) struct sk_msg *msg, u32 bytes, int flags)
{ {
bool ingress = sk_msg_to_ingress(msg);
struct sk_psock *psock = sk_psock_get(sk); struct sk_psock *psock = sk_psock_get(sk);
int ret; int ret;
@ -276,7 +275,7 @@ msg_bytes_ready:
static int tcp_bpf_send_verdict(struct sock *sk, struct sk_psock *psock, static int tcp_bpf_send_verdict(struct sock *sk, struct sk_psock *psock,
struct sk_msg *msg, int *copied, int flags) struct sk_msg *msg, int *copied, int flags)
{ {
bool cork = false, enospc = sk_msg_full(msg); bool cork = false, enospc = sk_msg_full(msg), redir_ingress;
struct sock *sk_redir; struct sock *sk_redir;
u32 tosend, origsize, sent, delta = 0; u32 tosend, origsize, sent, delta = 0;
u32 eval; u32 eval;
@ -322,6 +321,7 @@ more_data:
sk_msg_apply_bytes(psock, tosend); sk_msg_apply_bytes(psock, tosend);
break; break;
case __SK_REDIRECT: case __SK_REDIRECT:
redir_ingress = psock->redir_ingress;
sk_redir = psock->sk_redir; sk_redir = psock->sk_redir;
sk_msg_apply_bytes(psock, tosend); sk_msg_apply_bytes(psock, tosend);
if (!psock->apply_bytes) { if (!psock->apply_bytes) {
@ -338,7 +338,8 @@ more_data:
release_sock(sk); release_sock(sk);
origsize = msg->sg.size; origsize = msg->sg.size;
ret = tcp_bpf_sendmsg_redir(sk_redir, msg, tosend, flags); ret = tcp_bpf_sendmsg_redir(sk_redir, redir_ingress,
msg, tosend, flags);
sent = origsize - msg->sg.size; sent = origsize - msg->sg.size;
if (eval == __SK_REDIRECT) if (eval == __SK_REDIRECT)

6
net/tls/tls_sw.c
View File

@ -792,7 +792,7 @@ static int bpf_exec_tx_verdict(struct sk_msg *msg, struct sock *sk,
struct sk_psock *psock; struct sk_psock *psock;
struct sock *sk_redir; struct sock *sk_redir;
struct tls_rec *rec; struct tls_rec *rec;
bool enospc, policy; bool enospc, policy, redir_ingress;
int err = 0, send; int err = 0, send;
u32 delta = 0; u32 delta = 0;
@ -837,6 +837,7 @@ more_data:
} }
break; break;
case __SK_REDIRECT: case __SK_REDIRECT:
redir_ingress = psock->redir_ingress;
sk_redir = psock->sk_redir; sk_redir = psock->sk_redir;
memcpy(&msg_redir, msg, sizeof(*msg)); memcpy(&msg_redir, msg, sizeof(*msg));
if (msg->apply_bytes < send) if (msg->apply_bytes < send)
@ -846,7 +847,8 @@ more_data:
sk_msg_return_zero(sk, msg, send); sk_msg_return_zero(sk, msg, send);
msg->sg.size -= send; msg->sg.size -= send;
release_sock(sk); release_sock(sk);
err = tcp_bpf_sendmsg_redir(sk_redir, &msg_redir, send, flags); err = tcp_bpf_sendmsg_redir(sk_redir, redir_ingress,
&msg_redir, send, flags);
lock_sock(sk); lock_sock(sk);
if (err < 0) { if (err < 0) {
*copied -= sk_msg_free_nocharge(sk, &msg_redir); *copied -= sk_msg_free_nocharge(sk, &msg_redir);