bonding: Fix bonding drivers improper modification of netpoll structure

The bonding driver currently modifies the netpoll structure in its xmit path
while sending frames from netpoll.  This is racy, as other cpus can access the
netpoll structure in parallel. Since the bonding driver points np->dev to a
slave device, other cpus can inadvertently attempt to send data directly to
slave devices, leading to improper locking with the bonding master, lost frames,
and deadlocks.  This patch fixes that up.

This patch also removes the real_dev pointer from the netpoll structure as that
data is really only used by bonding in the poll_controller, and we can emulate
its behavior by check each slave for IS_UP.

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

1 files changed, 9 insertions, 6 deletions

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 7703d35de65d..813cc2f8edd6 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -449,11 +449,9 @@ int bond_dev_queue_xmit(struct bonding *bond, struct sk_buff *skb,
         if (unlikely(bond->dev->priv_flags & IFF_IN_NETPOLL)) {
                 struct netpoll *np = bond->dev->npinfo->netpoll;
                 slave_dev->npinfo = bond->dev->npinfo;
-                np->real_dev = np->dev = skb->dev;
                 slave_dev->priv_flags |= IFF_IN_NETPOLL;
-                netpoll_send_skb(np, skb);
+                netpoll_send_skb_on_dev(np, skb, slave_dev);
                 slave_dev->priv_flags &= ~IFF_IN_NETPOLL;
-                np->dev = bond->dev;
         } else
 #endif
                 dev_queue_xmit(skb);
@@ -1332,9 +1330,14 @@ static bool slaves_support_netpoll(struct net_device *bond_dev)
 
 static void bond_poll_controller(struct net_device *bond_dev)
 {
-        struct net_device *dev = bond_dev->npinfo->netpoll->real_dev;
-        if (dev != bond_dev)
-                netpoll_poll_dev(dev);
+        struct bonding *bond = netdev_priv(bond_dev);
+        struct slave *slave;
+        int i;
+
+        bond_for_each_slave(bond, slave, i) {
+                if (slave->dev && IS_UP(slave->dev))
+                        netpoll_poll_dev(slave->dev);
+        }
 }
 
 static void bond_netpoll_cleanup(struct net_device *bond_dev)