netpoll: add generic support for bridge and bonding devices

This whole patchset is for adding netpoll support to bridge and bonding
devices. I already tested it for bridge, bonding, bridge over bonding,
and bonding over bridge. It looks fine now.

To make bridge and bonding support netpoll, we need to adjust
some netpoll generic code. This patch does the following things:

1) introduce two new priv_flags for struct net_device:
   IFF_IN_NETPOLL which identifies we are processing a netpoll;
   IFF_DISABLE_NETPOLL is used to disable netpoll support for a device
   at run-time;

2) introduce one new method for netdev_ops:
   ->ndo_netpoll_cleanup() is used to clean up netpoll when a device is
     removed.

3) introduce netpoll_poll_dev() which takes a struct net_device * parameter;
   export netpoll_send_skb() and netpoll_poll_dev() which will be used later;

4) hide a pointer to struct netpoll in struct netpoll_info, ditto.

5) introduce ->real_dev for struct netpoll.

6) introduce a new status NETDEV_BONDING_DESLAE, which is used to disable
   netconsole before releasing a slave, to avoid deadlocks.

Cc: David Miller <davem@davemloft.net>
Cc: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: WANG Cong <amwang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 9 insertions, 6 deletions

diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c
index a361dea35574..ca142c47b2e4 100644
--- a/drivers/net/netconsole.c
+++ b/drivers/net/netconsole.c
@@ -665,7 +665,8 @@ static int netconsole_netdev_event(struct notifier_block *this,
         struct netconsole_target *nt;
         struct net_device *dev = ptr;
 
-        if (!(event == NETDEV_CHANGENAME || event == NETDEV_UNREGISTER))
+        if (!(event == NETDEV_CHANGENAME || event == NETDEV_UNREGISTER ||
+              event == NETDEV_BONDING_DESLAVE || event == NETDEV_GOING_DOWN))
                 goto done;
 
         spin_lock_irqsave(&target_list_lock, flags);
@@ -677,19 +678,21 @@ static int netconsole_netdev_event(struct notifier_block *this,
                                 strlcpy(nt->np.dev_name, dev->name, IFNAMSIZ);
                                 break;
                         case NETDEV_UNREGISTER:
-                                if (!nt->enabled)
-                                        break;
                                 netpoll_cleanup(&nt->np);
+                                /* Fall through */
+                        case NETDEV_GOING_DOWN:
+                        case NETDEV_BONDING_DESLAVE:
                                 nt->enabled = 0;
-                                printk(KERN_INFO "netconsole: network logging stopped"
-                                        ", interface %s unregistered\n",
-                                        dev->name);
                                 break;
                         }
                 }
                 netconsole_target_put(nt);
         }
         spin_unlock_irqrestore(&target_list_lock, flags);
+        if (event == NETDEV_UNREGISTER || event == NETDEV_BONDING_DESLAVE)
+                printk(KERN_INFO "netconsole: network logging stopped, "
+                        "interface %s %s\n",  dev->name,
+                        event == NETDEV_UNREGISTER ? "unregistered" : "released slaves");
 
 done:
         return NOTIFY_DONE;