ipv6: clean up anycast when an interface is destroyed
Subsystems (3)
PATCH 1/1 ipv6: clean up anycast when an interface is destroyed
If we try to rmmod the driver for an interface while sockets with setsockopt(JOIN_ANYCAST) are alive, some refcounts aren't cleaned up and we get stuck on:
unregister_netdevice: waiting for ens3 to become free. Usage count = 1
If we LEAVE_ANYCAST/close everything before rmmod'ing, there is no problem.
We need to perform a cleanup similar to the one for multicast in addrconf_ifdown(how == 1).
---
The problem is also present on a 3.2 and 3.16 kernel, and most likely everything in between.
include/net/addrconf.h | 1 + net/ipv6/addrconf.c | 8 +++++--- net/ipv6/anycast.c | 22 ++++++++++++++++++++++ 3 files changed, 28 insertions(+), 3 deletions(-)
include/net/addrconf.h +1 -0
@@ -204,6 +204,7 @@ void ipv6_sock_ac_close(struct sock *sk);int ipv6_dev_ac_inc (struct net_device *dev,const struct in6_addr *addr);int __ipv6_dev_ac_dec (struct inet6_dev *idev,const struct in6_addr *addr); +void ipv6_ac_destroy_dev (struct inet6_dev *idev);bool ipv6_chk_acast_addr (struct net *net,struct net_device *dev,const struct in6_addr *addr); bool ipv6_chk_acast_addr_src(struct net *net, struct net_device *dev,
net/ipv6/addrconf.c +5 -3
@@ -3094,11 +3094,13 @@ static int addrconf_ifdown(struct net_device *dev, int how)write_unlock_bh (&idev->lock); -/* Step 5: Discard multicast list */ -if (how) +/* Step 5: Discard anycast and multicast list */ +if (how) { +ipv6_ac_destroy_dev (idev);ipv6_mc_destroy_dev (idev); -else + }else {ipv6_mc_down (idev); + } idev->tstamp = jiffies;
net/ipv6/anycast.c +22 -0
@@ -351,6 +351,28 @@ static int ipv6_dev_ac_dec(struct net_device *dev, const struct in6_addr *addr)return __ipv6_dev_ac_dec (idev, addr); } +/* Device is being destroyed: clean up */ +void ipv6_ac_destroy_dev (struct inet6_dev *idev) +{ +struct ifacaddr6 *aca; + +write_lock_bh (&idev->lock); +while ((aca = idev->ac_list) !=NULL ) { + idev->ac_list = aca->aca_next; +write_unlock_bh (&idev->lock); + +addrconf_leave_solict (idev, &aca->aca_addr); + +dst_hold (&aca->aca_rt->dst); +ip6_del_rt (aca->aca_rt); + +aca_put (aca); + +write_lock_bh (&idev->lock); + } +write_unlock_bh (&idev->lock); +} +/* * check if the interface has this anycast address * called with rcu_read_lock()
Signature · 1 line
2.1.0
net/ipv6/anycast.c static int ipv6_dev_ac_dec(struct net_device *dev, const struct in6_addr *addr) · line 354
Quoted 9 lines · Sabrina Dubroca
net/ipv6/anycast.c +1
-0@@ -351,6 +351,28 @@ static int ipv6_dev_ac_dec(struct net_device *dev, const struct in6_addr *addr)return __ipv6_dev_ac_dec (idev, addr); } +/* Device is being destroyed: clean up */
This comment is useless.
Quoted 11 lines
net/ipv6/anycast.c +11
-0+void ipv6_ac_destroy_dev (struct inet6_dev *idev) +{ +struct ifacaddr6 *aca; + +write_lock_bh (&idev->lock); +while ((aca = idev->ac_list) !=NULL ) { + idev->ac_list = aca->aca_next; +write_unlock_bh (&idev->lock); + +addrconf_leave_solict (idev, &aca->aca_addr); +
net/ipv6/anycast.c static int ipv6_dev_ac_dec(struct net_device *dev, const struct in6_addr *addr) · line 375
Quoted 10 lines
net/ipv6/anycast.c +10
-0+dst_hold (&aca->aca_rt->dst); +ip6_del_rt (aca->aca_rt); + +aca_put (aca); + +write_lock_bh (&idev->lock); + } +write_unlock_bh (&idev->lock); +} +
I think you can probably refactor the code out of __ipv6_dev_ac_dec() so that you don't have to kinda duplicate the code?
David Miller
maintainerFrom: Cong Wang <[email protected]>
Date: Wed, 10 Sep 2014 10:15:01 -0700
Quoted 9 lines · Sabrina Dubroca
Quoted 8 lines
net/ipv6/anycast.c +0
-0@@ -351,6 +351,28 @@ static int ipv6_dev_ac_dec(struct net_device *dev, const struct in6_addr *addr)return __ipv6_dev_ac_dec (idev, addr); }
Quoted 3 lines
net/ipv6/anycast.c static int ipv6_dev_ac_dec(struct net_device *dev, const struct in6_addr *addr) · line 354
Quoted 1 line
net/ipv6/anycast.c +1
-0+/* Device is being destroyed: clean up */ This comment is useless.
Agreed, please remove this and respin that patch.
Thanks.
PATCH v2 1/1 ipv6: clean up anycast when an interface is destroyed
If we try to rmmod the driver for an interface while sockets with setsockopt(JOIN_ANYCAST) are alive, some refcounts aren't cleaned up and we get stuck on:
unregister_netdevice: waiting for ens3 to become free. Usage count = 1
If we LEAVE_ANYCAST/close everything before rmmod'ing, there is no problem.
We need to perform a cleanup similar to the one for multicast in addrconf_ifdown(how == 1).
---
v2: remove comment
include/net/addrconf.h | 1 + net/ipv6/addrconf.c | 8 +++++--- net/ipv6/anycast.c | 21 +++++++++++++++++++++ 3 files changed, 27 insertions(+), 3 deletions(-)
include/net/addrconf.h +1 -0
@@ -204,6 +204,7 @@ void ipv6_sock_ac_close(struct sock *sk);int ipv6_dev_ac_inc (struct net_device *dev,const struct in6_addr *addr);int __ipv6_dev_ac_dec (struct inet6_dev *idev,const struct in6_addr *addr); +void ipv6_ac_destroy_dev (struct inet6_dev *idev);bool ipv6_chk_acast_addr (struct net *net,struct net_device *dev,const struct in6_addr *addr); bool ipv6_chk_acast_addr_src(struct net *net, struct net_device *dev,
net/ipv6/addrconf.c +5 -3
@@ -3094,11 +3094,13 @@ static int addrconf_ifdown(struct net_device *dev, int how)write_unlock_bh (&idev->lock); -/* Step 5: Discard multicast list */ -if (how) +/* Step 5: Discard anycast and multicast list */ +if (how) { +ipv6_ac_destroy_dev (idev);ipv6_mc_destroy_dev (idev); -else + }else {ipv6_mc_down (idev); + } idev->tstamp = jiffies;
net/ipv6/anycast.c +21 -0
@@ -351,6 +351,27 @@ static int ipv6_dev_ac_dec(struct net_device *dev, const struct in6_addr *addr)return __ipv6_dev_ac_dec (idev, addr); } +void ipv6_ac_destroy_dev (struct inet6_dev *idev) +{ +struct ifacaddr6 *aca; + +write_lock_bh (&idev->lock); +while ((aca = idev->ac_list) !=NULL ) { + idev->ac_list = aca->aca_next; +write_unlock_bh (&idev->lock); + +addrconf_leave_solict (idev, &aca->aca_addr); + +dst_hold (&aca->aca_rt->dst); +ip6_del_rt (aca->aca_rt); + +aca_put (aca); + +write_lock_bh (&idev->lock); + } +write_unlock_bh (&idev->lock); +} +/* * check if the interface has this anycast address * called with rcu_read_lock()
Signature · 1 line
2.1.0
Quoted 6 lines · Sabrina Dubroca
If we try to rmmod the driver for an interface while sockets with
setsockopt(JOIN_ANYCAST)are alive, some refcounts aren't cleaned up and we get stuck on:
unregister_netdevice: waiting for ens3 to become free. Usage count = 1
Quoted 7 lines
If we LEAVE_ANYCAST/close everything before rmmod'ing, there is no problem.
We need to perform a cleanup similar to the one for multicast in
addrconf_ifdown(how == 1).Signed-off-by Sabrina Dubroca <[email protected]>
This is the correct fix for the bug:
more comments inline:
Quoted 28 lines
---
v2: remove commentinclude/net/addrconf.h | 1 + net/ipv6/addrconf.c | 8 +++++--- net/ipv6/anycast.c | 21 +++++++++++++++++++++ 3 files changed, 27 insertions(+), 3 deletions(-)include/net/addrconf.h +1
-0@@ -204,6 +204,7 @@ void ipv6_sock_ac_close(struct sock *sk);int ipv6_dev_ac_inc (struct net_device *dev,const struct in6_addr *addr);int __ipv6_dev_ac_dec (struct inet6_dev *idev,const struct in6_addr *addr); +void ipv6_ac_destroy_dev (struct inet6_dev *idev);bool ipv6_chk_acast_addr (struct net *net,struct net_device *dev,const struct in6_addr *addr); bool ipv6_chk_acast_addr_src(struct net *net, struct net_device *dev,net/ipv6/addrconf.c +0
-0@@ -3094,11 +3094,13 @@ static int addrconf_ifdown(struct net_device *dev, int how)write_unlock_bh (&idev->lock);
net/ipv6/addrconf.c static int addrconf_ifdown(struct net_device *dev, int how) · line 3103
Quoted 10 lines
net/ipv6/addrconf.c +5
-3-/* Step 5: Discard multicast list */ -if (how) +/* Step 5: Discard anycast and multicast list */ +if (how) { +ipv6_ac_destroy_dev (idev);ipv6_mc_destroy_dev (idev); -else + }else {ipv6_mc_down (idev); + }
Do we also need to provide a ipv6_ac_down function to unload all anycast sources when we ifdown an interface (we need to keep the entries in aca_list around and activate them when we initialize the interface again)?
Thanks,
Hannes
From: Sabrina Dubroca <[email protected]>
Date: Wed, 10 Sep 2014 23:23:02 +0200
Quoted 9 lines
If we try to rmmod the driver for an interface while sockets with
setsockopt(JOIN_ANYCAST)are alive, some refcounts aren't cleaned up and we get stuck on:
unregister_netdevice: waiting for ens3 to become free. Usage count = 1If we LEAVE_ANYCAST/close everything before rmmod'ing, there is no problem.
Quoted 6 lines
We need to perform a cleanup similar to the one for multicast in
addrconf_ifdown(how == 1).Signed-off-by Sabrina Dubroca <[email protected]>---
v2: remove comment
Applied, thank you.