From: Cong Wang <xiyou.wangcong@gmail.com>
To: netdev@vger.kernel.org
Cc: bpf@vger.kernel.org, duanxiongchun@bytedance.com,
wangdongdong.6@bytedance.com, jiang.wang@bytedance.com,
Cong Wang <cong.wang@bytedance.com>,
John Fastabend <john.fastabend@gmail.com>,
Daniel Borkmann <daniel@iogearbox.net>,
Jakub Sitnicki <jakub@cloudflare.com>,
Lorenz Bauer <lmb@cloudflare.com>
Subject: [Patch bpf-next v5 10/11] sock_map: update sock type checks for UDP
Date: Tue, 16 Mar 2021 19:22:18 -0700 [thread overview]
Message-ID: <20210317022219.24934-11-xiyou.wangcong@gmail.com> (raw)
In-Reply-To: <20210317022219.24934-1-xiyou.wangcong@gmail.com>
From: Cong Wang <cong.wang@bytedance.com>
Now UDP supports sockmap and redirection, we can safely update
the sock type checks for it accordingly.
Cc: John Fastabend <john.fastabend@gmail.com>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Cc: Jakub Sitnicki <jakub@cloudflare.com>
Cc: Lorenz Bauer <lmb@cloudflare.com>
Signed-off-by: Cong Wang <cong.wang@bytedance.com>
---
net/core/sock_map.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/net/core/sock_map.c b/net/core/sock_map.c
index 596cbac24091..5ec8f8ce5557 100644
--- a/net/core/sock_map.c
+++ b/net/core/sock_map.c
@@ -549,7 +549,10 @@ static bool sk_is_udp(const struct sock *sk)
static bool sock_map_redirect_allowed(const struct sock *sk)
{
- return sk_is_tcp(sk) && sk->sk_state != TCP_LISTEN;
+ if (sk_is_tcp(sk))
+ return sk->sk_state != TCP_LISTEN;
+ else
+ return sk->sk_state == TCP_ESTABLISHED;
}
static bool sock_map_sk_is_suitable(const struct sock *sk)
--
2.25.1
next prev parent reply other threads:[~2021-03-17 2:23 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-17 2:22 [Patch bpf-next v5 00/11] sockmap: introduce BPF_SK_SKB_VERDICT and support UDP Cong Wang
2021-03-17 2:22 ` [Patch bpf-next v5 01/11] skmsg: lock ingress_skb when purging Cong Wang
2021-03-17 2:22 ` [Patch bpf-next v5 02/11] skmsg: introduce a spinlock to protect ingress_msg Cong Wang
2021-03-17 2:22 ` [Patch bpf-next v5 03/11] skmsg: introduce skb_send_sock() for sock_map Cong Wang
2021-03-17 2:22 ` [Patch bpf-next v5 04/11] skmsg: avoid lock_sock() in sk_psock_backlog() Cong Wang
2021-03-20 2:45 ` John Fastabend
2021-03-22 3:23 ` Cong Wang
2021-03-17 2:22 ` [Patch bpf-next v5 05/11] sock_map: introduce BPF_SK_SKB_VERDICT Cong Wang
2021-03-17 2:22 ` [Patch bpf-next v5 06/11] sock: introduce sk->sk_prot->psock_update_sk_prot() Cong Wang
2021-03-18 12:09 ` Alexander Lobakin
2021-03-18 16:40 ` Cong Wang
2021-03-17 2:22 ` [Patch bpf-next v5 07/11] udp: implement ->read_sock() for sockmap Cong Wang
2021-03-17 2:22 ` [Patch bpf-next v5 08/11] skmsg: extract __tcp_bpf_recvmsg() and tcp_bpf_wait_data() Cong Wang
2021-03-17 2:22 ` [Patch bpf-next v5 09/11] udp: implement udp_bpf_recvmsg() for sockmap Cong Wang
2021-03-17 2:22 ` Cong Wang [this message]
2021-03-17 2:22 ` [Patch bpf-next v5 11/11] selftests/bpf: add a test case for udp sockmap Cong Wang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210317022219.24934-11-xiyou.wangcong@gmail.com \
--to=xiyou.wangcong@gmail.com \
--cc=bpf@vger.kernel.org \
--cc=cong.wang@bytedance.com \
--cc=daniel@iogearbox.net \
--cc=duanxiongchun@bytedance.com \
--cc=jakub@cloudflare.com \
--cc=jiang.wang@bytedance.com \
--cc=john.fastabend@gmail.com \
--cc=lmb@cloudflare.com \
--cc=netdev@vger.kernel.org \
--cc=wangdongdong.6@bytedance.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).