Commit 401ab829 authored May 21, 2022 by Wang Yufen Committed by Zheng Zengkai May 21, 2022

skmsg: Lock ingress_skb when purging

mainline inclusion
from mainline-v5.13-rc1
commit 37f0e514
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I545NW

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=37f0e514db660f03f8982b8f4fbbd4b2740abe7d



--------------------------------

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.

Signed-off-by: Cong Wang <cong.wang@bytedance.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: Jakub Sitnicki <jakub@cloudflare.com>
Acked-by: John Fastabend <john.fastabend@gmail.com>
Link: https://lore.kernel.org/bpf/20210331023237.41094-2-xiyou.wangcong@gmail.com


Signed-off-by: Wang Yufen <wangyufen@huawei.com>
Reviewed-by: Yue Haibing <yuehaibing@huawei.com>
Reviewed-by: Liu Jian <liujian56@huawei.com>
Reviewed-by: Wei Yongjun <weiyongjun1@huawei.com>
Signed-off-by: Zheng Zengkai <zhengzengkai@huawei.com>

parent 71a2e225

net/core/skmsg.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -638,7 +638,7 @@ void __sk_psock_purge_ingress_msg(struct sk_psock *psock)

		static void sk_psock_zap_ingress(struct sk_psock *psock)
		{
		__skb_queue_purge(&psock->ingress_skb);
		skb_queue_purge(&psock->ingress_skb);
		__sk_psock_purge_ingress_msg(psock);
		}