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>,
Lorenz Bauer <lmb@cloudflare.com>,
Jakub Sitnicki <jakub@cloudflare.com>
Subject: [Patch bpf-next v7 01/13] skmsg: lock ingress_skb when purging
Date: Sun, 28 Mar 2021 13:20:01 -0700 [thread overview]
Message-ID: <20210328202013.29223-2-xiyou.wangcong@gmail.com> (raw)
In-Reply-To: <20210328202013.29223-1-xiyou.wangcong@gmail.com>
From: Cong Wang <cong.wang@bytedance.com>
Currently we purge the ingress_skb queue only when psock
refcnt goes down to 0, so locking the queue is not necessary,
but in order to be called during ->close, we have to lock it
here.
Cc: John Fastabend <john.fastabend@gmail.com>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Cc: Lorenz Bauer <lmb@cloudflare.com>
Acked-by: Jakub Sitnicki <jakub@cloudflare.com>
Signed-off-by: Cong Wang <cong.wang@bytedance.com>
---
net/core/skmsg.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/core/skmsg.c b/net/core/skmsg.c
index 07f54015238a..bebf84ed4e30 100644
--- a/net/core/skmsg.c
+++ b/net/core/skmsg.c
@@ -634,7 +634,7 @@ static void sk_psock_zap_ingress(struct sk_psock *psock)
{
struct sk_buff *skb;
- while ((skb = __skb_dequeue(&psock->ingress_skb)) != NULL) {
+ while ((skb = skb_dequeue(&psock->ingress_skb)) != NULL) {
skb_bpf_redirect_clear(skb);
kfree_skb(skb);
}
--
2.25.1
next prev parent reply other threads:[~2021-03-28 20:21 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-28 20:20 [Patch bpf-next v7 00/13] sockmap: introduce BPF_SK_SKB_VERDICT and support UDP Cong Wang
2021-03-28 20:20 ` Cong Wang [this message]
2021-03-28 20:20 ` [Patch bpf-next v7 02/13] skmsg: introduce a spinlock to protect ingress_msg Cong Wang
2021-03-29 19:11 ` John Fastabend
2021-03-28 20:20 ` [Patch bpf-next v7 03/13] net: introduce skb_send_sock() for sock_map Cong Wang
2021-03-28 20:20 ` [Patch bpf-next v7 04/13] skmsg: avoid lock_sock() in sk_psock_backlog() Cong Wang
2021-03-29 19:41 ` John Fastabend
2021-03-28 20:20 ` [Patch bpf-next v7 05/13] skmsg: use rcu work for destroying psock Cong Wang
2021-03-29 19:42 ` John Fastabend
2021-03-28 20:20 ` [Patch bpf-next v7 06/13] skmsg: use GFP_KERNEL in sk_psock_create_ingress_msg() Cong Wang
2021-03-29 19:44 ` John Fastabend
2021-03-28 20:20 ` [Patch bpf-next v7 07/13] sock_map: introduce BPF_SK_SKB_VERDICT Cong Wang
2021-03-29 20:09 ` John Fastabend
2021-03-30 1:27 ` Cong Wang
2021-03-28 20:20 ` [Patch bpf-next v7 08/13] sock: introduce sk->sk_prot->psock_update_sk_prot() Cong Wang
2021-03-28 20:20 ` [Patch bpf-next v7 09/13] udp: implement ->read_sock() for sockmap Cong Wang
2021-03-29 20:54 ` John Fastabend
2021-03-30 5:39 ` Cong Wang
2021-03-30 6:23 ` John Fastabend
2021-03-30 6:36 ` Cong Wang
2021-03-30 6:45 ` John Fastabend
2021-03-28 20:20 ` [Patch bpf-next v7 10/13] skmsg: extract __tcp_bpf_recvmsg() and tcp_bpf_wait_data() Cong Wang
2021-03-28 20:20 ` [Patch bpf-next v7 11/13] udp: implement udp_bpf_recvmsg() for sockmap Cong Wang
2021-03-28 20:20 ` [Patch bpf-next v7 12/13] sock_map: update sock type checks for UDP Cong Wang
2021-03-29 23:10 ` John Fastabend
2021-03-30 5:47 ` Cong Wang
2021-03-28 20:20 ` [Patch bpf-next v7 13/13] selftests/bpf: add a test case for udp sockmap Cong Wang
2021-03-28 23:27 ` [Patch bpf-next v7 00/13] sockmap: introduce BPF_SK_SKB_VERDICT and support UDP Alexei Starovoitov
2021-03-29 15:03 ` John Fastabend
2021-03-29 16:57 ` 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=20210328202013.29223-2-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).