net: factorize rt_do_flush for batch device unregistering
Subsystems (3)
PATCH 1/1 net: factorize rt_do_flush for batch device unregistering
Tests performed with per device sysctl/sysfs entries disabled:
$ insmod /lib/modules/dummy.ko numdummies=8000 $ time rmmod dummy
Without the patch: With the patch: real 0m 3.65s real 0m 0.27s user 0m 0.00s user 0m 0.00s sys 0m 3.42s sys 0m 0.24s
--- net/core/dev.c | 28 ++++++++++++++++++++++++++-- net/ipv4/fib_frontend.c | 13 ++++++++----- 2 files changed, 34 insertions(+), 7 deletions(-)
net/core/dev.c +26 -2
@@ -4720,7 +4720,8 @@ static void net_set_todo(struct net_device *dev)static void rollback_registered_many (struct list_head *head) { -struct net_device *dev; +struct net_device *dev, *aux, *fdev; +LIST_HEAD (rt_flush_list);BUG_ON (dev_boot_phase);ASSERT_RTNL ();
@@ -4778,8 +4779,28 @@ static void rollback_registered_many(struct list_head *head)synchronize_net (); -list_for_each_entry (dev, head, unreg_list) +/* flush route cache by resending one NETDEV_UNREGISTER per namespace */ +list_for_each_entry_safe (dev, aux, head, unreg_list) { +int needs_flush =1 ; +list_for_each_entry (fdev, &rt_flush_list, unreg_list) { +if (dev_net (dev) ==dev_net (fdev)) { + needs_flush =0 ; +dev_put (dev); +break ; + } + } +if (needs_flush) { +list_del (&dev->unreg_list); +list_add (&dev->unreg_list, &rt_flush_list); + } + } + +list_for_each_entry_safe (dev, aux, &rt_flush_list, unreg_list) { +list_del_init (&dev->unreg_list); +call_netdevice_notifiers (NETDEV_UNREGISTER , dev); +list_add (&dev->unreg_list, head);dev_put (dev); + } }static void rollback_registered (struct net_device *dev)
@@ -5374,6 +5395,9 @@ EXPORT_SYMBOL(unregister_netdevice_queue);* unregister_netdevice_many - unregister many devices * @head: list of devices * +* WARNING: This function modifies the list. It may change the order of the +* elements in the list. However, you can assume it does not add or delete +* elements to/from the list. */ void unregister_netdevice_many (struct list_head *head) {
net/ipv4/fib_frontend.c +8 -5
@@ -895,11 +895,11 @@ static void nl_fib_lookup_exit(struct net *net) net->ipv4.fibnl =NULL ; } -static void fib_disable_ip (struct net_device *dev,int force) +static void fib_disable_ip (struct net_device *dev,int force,int delay) {if (fib_sync_down_dev (dev, force))fib_flush (dev_net (dev)); -rt_cache_flush (dev_net (dev),0 ); +rt_cache_flush (dev_net (dev), delay);arp_ifdown (dev); }
@@ -922,7 +922,7 @@ static int fib_inetaddr_event(struct notifier_block *this, unsigned long event,/* Last address was deleted from this interface. Disable IP. */ -fib_disable_ip (dev,1 ); +fib_disable_ip (dev,1 ,0 ); }else {rt_cache_flush (dev_net (dev),-1 ); }
@@ -937,7 +937,10 @@ static int fib_netdev_event(struct notifier_block *this, unsigned long event, vostruct in_device *in_dev =__in_dev_get_rtnl (dev);if (event ==NETDEV_UNREGISTER ) { -fib_disable_ip (dev,2 ); +/* if this event is part of a batch then don't flush the cache +* now; we will receive another event at the end of the batch */ +int rt_flush =list_empty (&dev->unreg_list) ?0 :-1 ; +fib_disable_ip (dev,2 , rt_flush);return NOTIFY_DONE ; }
@@ -955,7 +958,7 @@ static int fib_netdev_event(struct notifier_block *this, unsigned long event, vort_cache_flush (dev_net (dev),-1 );break ;case NETDEV_DOWN : -fib_disable_ip (dev,0 ); +fib_disable_ip (dev,0 ,0 );break ;case NETDEV_CHANGEMTU :case NETDEV_CHANGE :
Signature · 1 line
1.5.6.5
Quoted 38 lines · Octavian Purdila
Tests performed with per device sysctl/sysfs entries disabled:
$ insmod /lib/modules/dummy.ko numdummies=8000 $ time rmmod dummyWithout the patch: With the patch: real 0m 3.65s real 0m 0.27s user 0m 0.00s user 0m 0.00s sys 0m 3.42s sys 0m 0.24sSigned-off-by Octavian Purdila <[email protected]>--- net/core/dev.c | 28 ++++++++++++++++++++++++++-- net/ipv4/fib_frontend.c | 13 ++++++++----- 2 files changed, 34 insertions(+), 7 deletions(-)net/core/dev.c +5
-2@@ -4720,7 +4720,8 @@ static void net_set_todo(struct net_device *dev)static void rollback_registered_many (struct list_head *head) { -struct net_device *dev; +struct net_device *dev, *aux, *fdev; +LIST_HEAD (rt_flush_list);BUG_ON (dev_boot_phase);ASSERT_RTNL ();@@ -4778,8 +4779,28 @@ static void rollback_registered_many(struct list_head *head)synchronize_net (); -list_for_each_entry (dev, head, unreg_list) +/* flush route cache by resending one NETDEV_UNREGISTER per namespace */ +list_for_each_entry_safe (dev, aux, head, unreg_list) { +int needs_flush =1 ;
net/core/dev.c static void rollback_registered_many(struct list_head *head) · line 4794
Quoted 10 lines
net/core/dev.c +10
-0+list_for_each_entry (fdev, &rt_flush_list, unreg_list) { +if (dev_net (dev) ==dev_net (fdev)) { + needs_flush =0 ; +dev_put (dev); +break ; + } + } +if (needs_flush) { +list_del (&dev->unreg_list); +list_add (&dev->unreg_list, &rt_flush_list);
list_move ...
Quoted 13 lines
net/core/dev.c +8
-0+ } + } + +list_for_each_entry_safe (dev, aux, &rt_flush_list, unreg_list) { +list_del_init (&dev->unreg_list); +call_netdevice_notifiers (NETDEV_UNREGISTER , dev); +list_add (&dev->unreg_list, head);dev_put (dev); + } }static void rollback_registered (struct net_device *dev)
net/core/dev.c EXPORT_SYMBOL(unregister_netdevice_queue); · line 5400
Quoted 6 lines
net/core/dev.c +3
-0@@ -5374,6 +5395,9 @@ EXPORT_SYMBOL(unregister_netdevice_queue);* unregister_netdevice_many - unregister many devices * @head: list of devices * +* WARNING: This function modifies the list. It may change the order of the +* elements in the list. However, you can assume it does not add or delete +* elements to/from the list.
Sorry I dont understand this comment
Quoted 31 lines
net/core/dev.c +0
-0*/ void unregister_netdevice_many (struct list_head *head) {net/ipv4/fib_frontend.c +3
-3@@ -895,11 +895,11 @@ static void nl_fib_lookup_exit(struct net *net) net->ipv4.fibnl =NULL ; } -static void fib_disable_ip (struct net_device *dev,int force) +static void fib_disable_ip (struct net_device *dev,int force,int delay) {if (fib_sync_down_dev (dev, force))fib_flush (dev_net (dev)); -rt_cache_flush (dev_net (dev),0 ); +rt_cache_flush (dev_net (dev), delay);arp_ifdown (dev); }@@ -922,7 +922,7 @@ static int fib_inetaddr_event(struct notifier_block *this, unsigned long event,/* Last address was deleted from this interface. Disable IP. */ -fib_disable_ip (dev,1 ); +fib_disable_ip (dev,1 ,0 ); }else {rt_cache_flush (dev_net (dev),-1 ); }
net/ipv4/fib_frontend.c static int fib_netdev_event(struct notifier_block *this, unsigned long event, vo · line 942
Quoted 7 lines
net/ipv4/fib_frontend.c +3
-1@@ -937,7 +937,10 @@ static int fib_netdev_event(struct notifier_block *this, unsigned long event, vostruct in_device *in_dev =__in_dev_get_rtnl (dev);if (event ==NETDEV_UNREGISTER ) { -fib_disable_ip (dev,2 ); +/* if this event is part of a batch then don't flush the cache +* now; we will receive another event at the end of the batch */ +int rt_flush =list_empty (&dev->unreg_list) ?0 :-1 ;
hmm... a bit ugly...
net/ipv4/fib_frontend.c static int fib_netdev_event(struct notifier_block *this, unsigned long event, vo · line 964
Quoted 13 lines
net/ipv4/fib_frontend.c +2
-1+fib_disable_ip (dev,2 , rt_flush);return NOTIFY_DONE ; }@@ -955,7 +958,7 @@ static int fib_netdev_event(struct notifier_block *this, unsigned long event, vort_cache_flush (dev_net (dev),-1 );break ;case NETDEV_DOWN : -fib_disable_ip (dev,0 ); +fib_disable_ip (dev,0 ,0 );break ;case NETDEV_CHANGEMTU :case NETDEV_CHANGE :
Are you sure you want to overload NETDEV_UNREGISTER ?
Maybe it would be cleaner to add a new value, NETDEV_UNREGISTER_PERNET or something for the final loop...
Quoted 10 lines · On Monday 16 November 2009 23:32:55 you wrote:
Quoted 7 lines
net/core/dev.c +1
-0@@ -5374,6 +5395,9 @@ EXPORT_SYMBOL(unregister_netdevice_queue);* unregister_netdevice_many - unregister many devices * @head: list of devices * +* WARNING: This function modifies the list. It may change the order of the + * elements in the list. However, you can assume it does not add or
delete + * elements to/from the list.Sorry I dont understand this comment
The list passed to unregister_netdevice_many(), as the "head" parameter, may be altered, e.g. order may change between the elements.
That is because we temporarily move the items from the list to the rt_flush_list for the flush. When we add the items back they may not be added in the same place.
Perhaps the confusion comes from the fact that I did not specified which list? (i.e. head)
Quoted 4 lines
Quoted 4 lines
(quoted diff) +0
-0@@ -937,7 +937,10 @@ static int fib_netdev_event(struct notifier_block *this, unsigned long event, vo struct in_device *in_dev = __in_dev_get_rtnl(dev);
Quoted 8 lines
net/ipv4/fib_frontend.c static int fib_netdev_event(struct notifier_block *this, unsigned long event, vo · line 942
Quoted 5 lines
net/ipv4/fib_frontend.c +3
-1if (event ==NETDEV_UNREGISTER ) { -fib_disable_ip (dev,2 ); +/* if this event is part of a batch then don't flush the cache +* now; we will receive another event at the end of the batch */ +int rt_flush =list_empty (&dev->unreg_list) ?0 :-1 ;hmm... a bit ugly...
Would it be better if I would add a dev_is_batch_unregister() instead?
Or add a new device flag to explicitly signal the batch unregister?
Quoted 16 lines
net/ipv4/fib_frontend.c static int fib_netdev_event(struct notifier_block · line 964
Quoted 13 lines
net/ipv4/fib_frontend.c +2
-1+fib_disable_ip (dev,2 , rt_flush);return NOTIFY_DONE ; }@@ -955,7 +958,7 @@ static int fib_netdev_event(struct notifier_block *this, unsigned long event, vo rt_cache_flush(dev_net(dev), -1);break ;case NETDEV_DOWN : -fib_disable_ip (dev,0 ); +fib_disable_ip (dev,0 ,0 );break ;case NETDEV_CHANGEMTU :case NETDEV_CHANGE :Are you sure you want to overload
NETDEV_UNREGISTER?
Quoted 3 lines
Maybe it would be cleaner to add a new value,
NETDEV_UNREGISTER_PERNETor
something for the final loop...
Hmm, I think that will allow us to get rid of the ugly test: never flush the cache for NETDEV_UNREGISTER, only flush it for NETDEV_UNREGISTER_PERNET.
We just need to make sure to add NETDEV_UNREGISTER_PERNET in other places where NETDEV_UNREGISTER is called.
I'll try this in the next patch. Thanks for reviewing.
Quoted 12 lines · Octavian Purdila
Quoted 9 lines · On Monday 16 November 2009 23:32:55 you wrote:
Quoted 7 lines
net/core/dev.c +1
-0@@ -5374,6 +5395,9 @@ EXPORT_SYMBOL(unregister_netdevice_queue);* unregister_netdevice_many - unregister many devices * @head: list of devices * +* WARNING: This function modifies the list. It may change the order of the + * elements in the list. However, you can assume it does not add or
delete + * elements to/from the list.Sorry I dont understand this comment
Quoted 7 lines
The list passed to
unregister_netdevice_many(), as the "head" parameter, may be altered, e.g. order may change between the elements.That is because we temporarily move the items from the list to the
rt_flush_listfor the flush. When we add the items back they may not be added in the same place.
Ah, I got it now, confusion is that comment makes more sense for rollback_registered_many() because when reading unregister_netdevice_many() it is clear it doesnt change the list...
void unregister_netdevice_many(struct list_head *head)
{
struct net_device *dev;
if (!list_empty(head)) {
rollback_registered_many(head);
list_for_each_entry(dev, head, unreg_list)
net_set_todo(dev);
}
}