[NET]: Make NAPI polling independent of struct net_device objects.

Several devices have multiple independant RX queues per net
device, and some have a single interrupt doorbell for several
queues.

In either case, it's easier to support layouts like that if the
structure representing the poll is independant from the net
device itself.

The signature of the ->poll() call back goes from:

	int foo_poll(struct net_device *dev, int *budget)

to

	int foo_poll(struct napi_struct *napi, int budget)

The caller is returned the number of RX packets processed (or
the number of "NAPI credits" consumed if you want to get
abstract).  The callee no longer messes around bumping
dev->quota, *budget, etc. because that is all handled in the
caller upon return.

The napi_struct is to be embedded in the device driver private data
structures.

Furthermore, it is the driver's responsibility to disable all NAPI
instances in it's ->stop() device close handler.  Since the
napi_struct is privatized into the driver's private data structures,
only the driver knows how to get at all of the napi_struct instances
it may have per-device.

With lots of help and suggestions from Rusty Russell, Roland Dreier,
Michael Chan, Jeff Garzik, and Jamal Hadi Salim.

Bug fixes from Thomas Graf, Roland Dreier, Peter Zijlstra,
Joseph Fannin, Scott Wood, Hans J. Koch, and Michael Chan.

[ Ported to current tree and all drivers converted.  Integrated
  Stephen's follow-on kerneldoc additions, and restored poll_list
  handling to the old style to fix mutual exclusion issues.  -DaveM ]

Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 25 insertions, 14 deletions

diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index de1b26aa5720..abe6e3a4cc44 100644
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -119,19 +119,22 @@ static __sum16 checksum_udp(struct sk_buff *skb, struct udphdr *uh,
 static void poll_napi(struct netpoll *np)
 {
         struct netpoll_info *npinfo = np->dev->npinfo;
+        struct napi_struct *napi;
         int budget = 16;
 
-        if (test_bit(__LINK_STATE_RX_SCHED, &np->dev->state) &&
-            npinfo->poll_owner != smp_processor_id() &&
-            spin_trylock(&npinfo->poll_lock)) {
-                npinfo->rx_flags |= NETPOLL_RX_DROP;
-                atomic_inc(&trapped);
+        list_for_each_entry(napi, &np->dev->napi_list, dev_list) {
+                if (test_bit(NAPI_STATE_SCHED, &napi->state) &&
+                    napi->poll_owner != smp_processor_id() &&
+                    spin_trylock(&napi->poll_lock)) {
+                        npinfo->rx_flags |= NETPOLL_RX_DROP;
+                        atomic_inc(&trapped);
 
-                np->dev->poll(np->dev, &budget);
+                        napi->poll(napi, budget);
 
-                atomic_dec(&trapped);
-                npinfo->rx_flags &= ~NETPOLL_RX_DROP;
-                spin_unlock(&npinfo->poll_lock);
+                        atomic_dec(&trapped);
+                        npinfo->rx_flags &= ~NETPOLL_RX_DROP;
+                        spin_unlock(&napi->poll_lock);
+                }
         }
 }
 
@@ -157,7 +160,7 @@ void netpoll_poll(struct netpoll *np)
 
         /* Process pending work on NIC */
         np->dev->poll_controller(np->dev);
-        if (np->dev->poll)
+        if (!list_empty(&np->dev->napi_list))
                 poll_napi(np);
 
         service_arp_queue(np->dev->npinfo);
@@ -233,6 +236,17 @@ repeat:
         return skb;
 }
 
+static int netpoll_owner_active(struct net_device *dev)
+{
+        struct napi_struct *napi;
+
+        list_for_each_entry(napi, &dev->napi_list, dev_list) {
+                if (napi->poll_owner == smp_processor_id())
+                        return 1;
+        }
+        return 0;
+}
+
 static void netpoll_send_skb(struct netpoll *np, struct sk_buff *skb)
 {
         int status = NETDEV_TX_BUSY;
@@ -246,8 +260,7 @@ static void netpoll_send_skb(struct netpoll *np, struct sk_buff *skb)
         }
 
         /* don't get messages out of order, and no recursion */
-        if (skb_queue_len(&npinfo->txq) == 0 &&
-                    npinfo->poll_owner != smp_processor_id()) {
+        if (skb_queue_len(&npinfo->txq) == 0 && !netpoll_owner_active(dev)) {
                 unsigned long flags;
 
                 local_irq_save(flags);
@@ -652,8 +665,6 @@ int netpoll_setup(struct netpoll *np)
 
                 npinfo->rx_flags = 0;
                 npinfo->rx_np = NULL;
-                spin_lock_init(&npinfo->poll_lock);
-                npinfo->poll_owner = -1;
 
                 spin_lock_init(&npinfo->rx_lock);
                 skb_queue_head_init(&npinfo->arp_tx);