Commit 7786dfc4 authored by Cong Wang's avatar Cong Wang Committed by Alexei Starovoitov
Browse files

skmsg: Use rcu work for destroying psock 



The RCU callback sk_psock_destroy() only queues work psock->gc,
so we can just switch to rcu work to simplify the code.

Signed-off-by: default avatarCong Wang <cong.wang@bytedance.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Acked-by: default avatarJohn Fastabend <john.fastabend@gmail.com>
Link: https://lore.kernel.org/bpf/20210331023237.41094-6-xiyou.wangcong@gmail.com
parent 799aa7f9

include/linux/skmsg.h

+1 −4
Original line number Diff line number Diff line
@@ -102,10 +102,7 @@ struct sk_psock { 
	struct mutex			work_mutex;

	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,

net/core/skmsg.c

+5 −12
Original line number Diff line number Diff line
@@ -666,10 +666,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);
@@ -688,14 +688,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);
@@ -709,7 +701,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);