Commit 5dfa598b authored by James Chapman's avatar James Chapman Committed by David S. Miller
Browse files

l2tp: use pre_exit pernet hook to avoid rcu_barrier 



Move the work of closing all tunnels from the pernet exit hook to
pre_exit since the core does rcu synchronisation between these steps
and we can therefore remove rcu_barrier from l2tp code.

Signed-off-by: default avatarJames Chapman <jchapman@katalix.com>
Signed-off-by: default avatarTom Parkin <tparkin@katalix.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d93b8a63

net/l2tp/l2tp_core.c

+7 −2
Original line number Diff line number Diff line
@@ -1756,7 +1756,7 @@ static __net_init int l2tp_init_net(struct net *net) 
	return 0;

}



static __net_exit void l2tp_exit_net(struct net *net)

static __net_exit void l2tp_pre_exit_net(struct net *net)

{

	struct l2tp_net *pn = l2tp_pernet(net);

	struct l2tp_tunnel *tunnel = NULL;
@@ -1771,7 +1771,11 @@ static __net_exit void l2tp_exit_net(struct net *net) 


	if (l2tp_wq)

		drain_workqueue(l2tp_wq);

	rcu_barrier();

}



static __net_exit void l2tp_exit_net(struct net *net)

{

	struct l2tp_net *pn = l2tp_pernet(net);



	idr_destroy(&pn->l2tp_v2_session_idr);

	idr_destroy(&pn->l2tp_v3_session_idr);
@@ -1781,6 +1785,7 @@ static __net_exit void l2tp_exit_net(struct net *net) 
static struct pernet_operations l2tp_net_ops = {

	.init = l2tp_init_net,

	.exit = l2tp_exit_net,

	.pre_exit = l2tp_pre_exit_net,

	.id   = &l2tp_net_id,

	.size = sizeof(struct l2tp_net),

};