[bpf-next,v6,01/12] skmsg: lock ingress_skb when purging

Message ID	20210323003808.16074-2-xiyou.wangcong@gmail.com
State	Superseded
Headers	show Return-Path: <netdev-owner@kernel.org> 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 v6 01/12] skmsg: lock ingress_skb when purging Date: Mon, 22 Mar 2021 17:37:57 -0700 Message-Id: <20210323003808.16074-2-xiyou.wangcong@gmail.com> In-Reply-To: <20210323003808.16074-1-xiyou.wangcong@gmail.com> References: <20210323003808.16074-1-xiyou.wangcong@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	sockmap: introduce BPF_SK_SKB_VERDICT and support UDP \| expand [bpf-next,v6,00/12] sockmap: introduce BPF_SK_SKB_VERDICT and support UDP [bpf-next,v6,01/12] skmsg: lock ingress_skb when purging [bpf-next,v6,02/12] skmsg: introduce a spinlock to protect ingress_msg [bpf-next,v6,03/12] skmsg: introduce skb_send_sock() for sock_map [bpf-next,v6,04/12] skmsg: avoid lock_sock() in sk_psock_backlog() [bpf-next,v6,05/12] skmsg: use rcu work for destroying psock [bpf-next,v6,06/12] sock_map: introduce BPF_SK_SKB_VERDICT [bpf-next,v6,07/12] sock: introduce sk->sk_prot->psock_update_sk_prot() [bpf-next,v6,08/12] udp: implement ->read_sock() for sockmap [bpf-next,v6,09/12] skmsg: extract __tcp_bpf_recvmsg() and tcp_bpf_wait_data() [bpf-next,v6,10/12] udp: implement udp_bpf_recvmsg() for sockmap [bpf-next,v6,11/12] sock_map: update sock type checks for UDP [bpf-next,v6,12/12] selftests/bpf: add a test case for udp sockmap

Message ID

20210323003808.16074-2-xiyou.wangcong@gmail.com

State

Superseded

Headers

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 v6 01/12] skmsg: lock ingress_skb when purging
Date: Mon, 22 Mar 2021 17:37:57 -0700
Message-Id: <20210323003808.16074-2-xiyou.wangcong@gmail.com>
In-Reply-To: <20210323003808.16074-1-xiyou.wangcong@gmail.com>
References: <20210323003808.16074-1-xiyou.wangcong@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

sockmap: introduce BPF_SK_SKB_VERDICT and support UDP | expand

Commit Message

Cong Wang March 23, 2021, 12:37 a.m. UTC

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);
 	}