* [PATCHv2 ipsec-next] xfrm: remove the unnecessary .net_exit for xfrmi
@ 2019-09-09 8:30 Xin Long
2019-09-17 9:02 ` Steffen Klassert
0 siblings, 1 reply; 3+ messages in thread
From: Xin Long @ 2019-09-09 8:30 UTC (permalink / raw)
To: network dev; +Cc: davem, steffen.klassert
The xfrm_if(s) on each netns can be deleted when its xfrmi dev is
deleted. xfrmi dev's removal can happen when:
a. netns is being removed and all xfrmi devs will be deleted.
b. rtnl_link_unregister(&xfrmi_link_ops) in xfrmi_fini() when
xfrm_interface.ko is being unloaded.
So there's no need to use xfrmi_exit_net() to clean any xfrm_if up.
v1->v2:
- Fix some changelog.
Signed-off-by: Xin Long <lucien.xin@gmail.com>
---
net/xfrm/xfrm_interface.c | 23 -----------------------
1 file changed, 23 deletions(-)
diff --git a/net/xfrm/xfrm_interface.c b/net/xfrm/xfrm_interface.c
index 74868f9..faa0518 100644
--- a/net/xfrm/xfrm_interface.c
+++ b/net/xfrm/xfrm_interface.c
@@ -738,30 +738,7 @@ static struct rtnl_link_ops xfrmi_link_ops __read_mostly = {
.get_link_net = xfrmi_get_link_net,
};
-static void __net_exit xfrmi_destroy_interfaces(struct xfrmi_net *xfrmn)
-{
- struct xfrm_if *xi;
- LIST_HEAD(list);
-
- xi = rtnl_dereference(xfrmn->xfrmi[0]);
- if (!xi)
- return;
-
- unregister_netdevice_queue(xi->dev, &list);
- unregister_netdevice_many(&list);
-}
-
-static void __net_exit xfrmi_exit_net(struct net *net)
-{
- struct xfrmi_net *xfrmn = net_generic(net, xfrmi_net_id);
-
- rtnl_lock();
- xfrmi_destroy_interfaces(xfrmn);
- rtnl_unlock();
-}
-
static struct pernet_operations xfrmi_net_ops = {
- .exit = xfrmi_exit_net,
.id = &xfrmi_net_id,
.size = sizeof(struct xfrmi_net),
};
--
2.1.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCHv2 ipsec-next] xfrm: remove the unnecessary .net_exit for xfrmi
2019-09-09 8:30 [PATCHv2 ipsec-next] xfrm: remove the unnecessary .net_exit for xfrmi Xin Long
@ 2019-09-17 9:02 ` Steffen Klassert
2019-10-04 4:57 ` Steffen Klassert
0 siblings, 1 reply; 3+ messages in thread
From: Steffen Klassert @ 2019-09-17 9:02 UTC (permalink / raw)
To: Xin Long; +Cc: network dev, davem
On Mon, Sep 09, 2019 at 04:30:10PM +0800, Xin Long wrote:
> The xfrm_if(s) on each netns can be deleted when its xfrmi dev is
> deleted. xfrmi dev's removal can happen when:
>
> a. netns is being removed and all xfrmi devs will be deleted.
>
> b. rtnl_link_unregister(&xfrmi_link_ops) in xfrmi_fini() when
> xfrm_interface.ko is being unloaded.
>
> So there's no need to use xfrmi_exit_net() to clean any xfrm_if up.
>
> v1->v2:
> - Fix some changelog.
>
> Signed-off-by: Xin Long <lucien.xin@gmail.com>
I've queued this for applying until after the merge window,
no need to resend.
Thanks!
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCHv2 ipsec-next] xfrm: remove the unnecessary .net_exit for xfrmi
2019-09-17 9:02 ` Steffen Klassert
@ 2019-10-04 4:57 ` Steffen Klassert
0 siblings, 0 replies; 3+ messages in thread
From: Steffen Klassert @ 2019-10-04 4:57 UTC (permalink / raw)
To: Xin Long; +Cc: network dev, davem
On Tue, Sep 17, 2019 at 11:02:29AM +0200, Steffen Klassert wrote:
> On Mon, Sep 09, 2019 at 04:30:10PM +0800, Xin Long wrote:
> > The xfrm_if(s) on each netns can be deleted when its xfrmi dev is
> > deleted. xfrmi dev's removal can happen when:
> >
> > a. netns is being removed and all xfrmi devs will be deleted.
> >
> > b. rtnl_link_unregister(&xfrmi_link_ops) in xfrmi_fini() when
> > xfrm_interface.ko is being unloaded.
> >
> > So there's no need to use xfrmi_exit_net() to clean any xfrm_if up.
> >
> > v1->v2:
> > - Fix some changelog.
> >
> > Signed-off-by: Xin Long <lucien.xin@gmail.com>
>
> I've queued this for applying until after the merge window,
> no need to resend.
This is now applied to ipsec-next.
Thanks!
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-10-04 4:58 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-09 8:30 [PATCHv2 ipsec-next] xfrm: remove the unnecessary .net_exit for xfrmi Xin Long
2019-09-17 9:02 ` Steffen Klassert
2019-10-04 4:57 ` Steffen Klassert
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).