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 v6 05/12] skmsg: use rcu work for destroying psock
Date: Mon, 22 Mar 2021 17:38:01 -0700 [thread overview]
Message-ID: <20210323003808.16074-6-xiyou.wangcong@gmail.com> (raw)
In-Reply-To: <20210323003808.16074-1-xiyou.wangcong@gmail.com>
From: Cong Wang <cong.wang@bytedance.com>
The RCU callback sk_psock_destroy() only queues work psock->gc,
so we can just switch to rcu work to simplify the code.
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>
---
include/linux/skmsg.h | 5 +----
net/core/skmsg.c | 17 +++++------------
2 files changed, 6 insertions(+), 16 deletions(-)
diff --git a/include/linux/skmsg.h b/include/linux/skmsg.h
index cf23e6e2cf54..d75c3936ab91 100644
--- a/include/linux/skmsg.h
+++ b/include/linux/skmsg.h
@@ -101,10 +101,7 @@ struct sk_psock {
struct proto *sk_proto;
struct sk_psock_work_state work_state;
struct work_struct work;
- union {
- struct rcu_head rcu;
- struct work_struct gc;
- };
+ struct rcu_work rwork;
};
int sk_msg_alloc(struct sock *sk, struct sk_msg *msg, int len,
diff --git a/net/core/skmsg.c b/net/core/skmsg.c
index 9176add87643..a9ee26aebfbd 100644
--- a/net/core/skmsg.c
+++ b/net/core/skmsg.c
@@ -662,10 +662,10 @@ void sk_psock_stop(struct sk_psock *psock, bool wait)
static void sk_psock_done_strp(struct sk_psock *psock);
-static void sk_psock_destroy_deferred(struct work_struct *gc)
+static void sk_psock_destroy(struct work_struct *work)
{
- struct sk_psock *psock = container_of(gc, struct sk_psock, gc);
-
+ struct sk_psock *psock = container_of(to_rcu_work(work),
+ struct sk_psock, rwork);
/* No sk_callback_lock since already detached. */
sk_psock_done_strp(psock);
@@ -683,14 +683,6 @@ static void sk_psock_destroy_deferred(struct work_struct *gc)
kfree(psock);
}
-static void sk_psock_destroy(struct rcu_head *rcu)
-{
- struct sk_psock *psock = container_of(rcu, struct sk_psock, rcu);
-
- INIT_WORK(&psock->gc, sk_psock_destroy_deferred);
- schedule_work(&psock->gc);
-}
-
void sk_psock_drop(struct sock *sk, struct sk_psock *psock)
{
sk_psock_stop(psock, false);
@@ -704,7 +696,8 @@ void sk_psock_drop(struct sock *sk, struct sk_psock *psock)
sk_psock_stop_verdict(sk, psock);
write_unlock_bh(&sk->sk_callback_lock);
- call_rcu(&psock->rcu, sk_psock_destroy);
+ INIT_RCU_WORK(&psock->rwork, sk_psock_destroy);
+ queue_rcu_work(system_wq, &psock->rwork);
}
EXPORT_SYMBOL_GPL(sk_psock_drop);
--
2.25.1
next prev parent reply other threads:[~2021-03-23 0:39 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-23 0:37 [Patch bpf-next v6 00/12] sockmap: introduce BPF_SK_SKB_VERDICT and support UDP Cong Wang
2021-03-23 0:37 ` [Patch bpf-next v6 01/12] skmsg: lock ingress_skb when purging Cong Wang
2021-03-23 0:37 ` [Patch bpf-next v6 02/12] skmsg: introduce a spinlock to protect ingress_msg Cong Wang
2021-03-23 1:24 ` Yunsheng Lin
2021-03-23 3:38 ` Cong Wang
2021-03-23 0:37 ` [Patch bpf-next v6 03/12] skmsg: introduce skb_send_sock() for sock_map Cong Wang
2021-03-23 0:38 ` [Patch bpf-next v6 04/12] skmsg: avoid lock_sock() in sk_psock_backlog() Cong Wang
2021-03-26 2:10 ` John Fastabend
2021-03-27 5:50 ` Cong Wang
2021-03-23 0:38 ` Cong Wang [this message]
2021-03-26 2:11 ` [Patch bpf-next v6 05/12] skmsg: use rcu work for destroying psock John Fastabend
2021-03-23 0:38 ` [Patch bpf-next v6 06/12] sock_map: introduce BPF_SK_SKB_VERDICT Cong Wang
2021-03-23 0:38 ` [Patch bpf-next v6 07/12] sock: introduce sk->sk_prot->psock_update_sk_prot() Cong Wang
2021-03-23 0:38 ` [Patch bpf-next v6 08/12] udp: implement ->read_sock() for sockmap Cong Wang
2021-03-23 6:31 ` Yunsheng Lin
2021-03-24 20:04 ` Cong Wang
2021-03-23 0:38 ` [Patch bpf-next v6 09/12] skmsg: extract __tcp_bpf_recvmsg() and tcp_bpf_wait_data() Cong Wang
2021-03-23 0:38 ` [Patch bpf-next v6 10/12] udp: implement udp_bpf_recvmsg() for sockmap Cong Wang
2021-03-23 0:38 ` [Patch bpf-next v6 11/12] sock_map: update sock type checks for UDP Cong Wang
2021-03-23 0:38 ` [Patch bpf-next v6 12/12] 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=20210323003808.16074-6-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).