Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[linux-2.6.git] / net / core / netpoll.c
index a01abdd..06be243 100644 (file)
@@ -9,7 +9,7 @@
  * Copyright (C) 2002  Red Hat, Inc.
  */
 
-#include <linux/smp_lock.h>
+#include <linux/moduleparam.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/string.h>
 #include <linux/delay.h>
 #include <linux/rcupdate.h>
 #include <linux/workqueue.h>
+#include <linux/slab.h>
 #include <net/tcp.h>
 #include <net/udp.h>
 #include <asm/unaligned.h>
+#include <trace/events/napi.h>
 
 /*
  * We maintain a small pool of fully-sized skbs, to make sure the
@@ -33,7 +35,6 @@
 
 #define MAX_UDP_CHUNK 1460
 #define MAX_SKBS 32
-#define MAX_QUEUE_DEPTH (MAX_SKBS / 2)
 
 static struct sk_buff_head skb_pool;
 
@@ -50,29 +51,41 @@ static atomic_t trapped;
 static void zap_completion_queue(void);
 static void arp_reply(struct sk_buff *skb);
 
+static unsigned int carrier_timeout = 4;
+module_param(carrier_timeout, uint, 0644);
+
 static void queue_process(struct work_struct *work)
 {
        struct netpoll_info *npinfo =
                container_of(work, struct netpoll_info, tx_work.work);
        struct sk_buff *skb;
+       unsigned long flags;
 
        while ((skb = skb_dequeue(&npinfo->txq))) {
                struct net_device *dev = skb->dev;
+               const struct net_device_ops *ops = dev->netdev_ops;
+               struct netdev_queue *txq;
 
                if (!netif_device_present(dev) || !netif_running(dev)) {
                        __kfree_skb(skb);
                        continue;
                }
 
-               netif_tx_lock_bh(dev);
-               if (netif_queue_stopped(dev) ||
-                   dev->hard_start_xmit(skb, dev) != NETDEV_TX_OK) {
+               txq = netdev_get_tx_queue(dev, skb_get_queue_mapping(skb));
+
+               local_irq_save(flags);
+               __netif_tx_lock(txq, smp_processor_id());
+               if (netif_tx_queue_frozen_or_stopped(txq) ||
+                   ops->ndo_start_xmit(skb, dev) != NETDEV_TX_OK) {
                        skb_queue_head(&npinfo->txq, skb);
-                       netif_tx_unlock_bh(dev);
+                       __netif_tx_unlock(txq);
+                       local_irq_restore(flags);
 
                        schedule_delayed_work(&npinfo->tx_work, HZ/10);
                        return;
                }
+               __netif_tx_unlock(txq);
+               local_irq_restore(flags);
        }
 }
 
@@ -81,7 +94,7 @@ static __sum16 checksum_udp(struct sk_buff *skb, struct udphdr *uh,
 {
        __wsum psum;
 
-       if (uh->check == 0 || skb->ip_summed == CHECKSUM_UNNECESSARY)
+       if (uh->check == 0 || skb_csum_unnecessary(skb))
                return 0;
 
        psum = csum_tcpudp_nofold(saddr, daddr, ulen, IPPROTO_UDP, 0);
@@ -111,54 +124,97 @@ static __sum16 checksum_udp(struct sk_buff *skb, struct udphdr *uh,
  * network adapter, forcing superfluous retries and possibly timeouts.
  * Thus, we set our budget to greater than 1.
  */
-static void poll_napi(struct netpoll *np)
+static int poll_one_napi(struct netpoll_info *npinfo,
+                        struct napi_struct *napi, int budget)
 {
-       struct netpoll_info *npinfo = np->dev->npinfo;
-       int budget = 16;
+       int work;
 
-       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);
+       /* net_rx_action's ->poll() invocations and our's are
+        * synchronized by this test which is only made while
+        * holding the napi->poll_lock.
+        */
+       if (!test_bit(NAPI_STATE_SCHED, &napi->state))
+               return budget;
 
-               np->dev->poll(np->dev, &budget);
+       npinfo->rx_flags |= NETPOLL_RX_DROP;
+       atomic_inc(&trapped);
+       set_bit(NAPI_STATE_NPSVC, &napi->state);
 
-               atomic_dec(&trapped);
-               npinfo->rx_flags &= ~NETPOLL_RX_DROP;
-               spin_unlock(&npinfo->poll_lock);
-       }
+       work = napi->poll(napi, budget);
+       trace_napi_poll(napi);
+
+       clear_bit(NAPI_STATE_NPSVC, &napi->state);
+       atomic_dec(&trapped);
+       npinfo->rx_flags &= ~NETPOLL_RX_DROP;
+
+       return budget - work;
 }
 
-static void service_arp_queue(struct netpoll_info *npi)
+static void poll_napi(struct net_device *dev)
 {
-       struct sk_buff *skb;
+       struct napi_struct *napi;
+       int budget = 16;
 
-       if (unlikely(!npi))
-               return;
+       list_for_each_entry(napi, &dev->napi_list, dev_list) {
+               if (napi->poll_owner != smp_processor_id() &&
+                   spin_trylock(&napi->poll_lock)) {
+                       budget = poll_one_napi(dev->npinfo, napi, budget);
+                       spin_unlock(&napi->poll_lock);
 
-       skb = skb_dequeue(&npi->arp_tx);
+                       if (!budget)
+                               break;
+               }
+       }
+}
 
-       while (skb != NULL) {
-               arp_reply(skb);
-               skb = skb_dequeue(&npi->arp_tx);
+static void service_arp_queue(struct netpoll_info *npi)
+{
+       if (npi) {
+               struct sk_buff *skb;
+
+               while ((skb = skb_dequeue(&npi->arp_tx)))
+                       arp_reply(skb);
        }
 }
 
-void netpoll_poll(struct netpoll *np)
+void netpoll_poll_dev(struct net_device *dev)
 {
-       if (!np->dev || !netif_running(np->dev) || !np->dev->poll_controller)
+       const struct net_device_ops *ops;
+
+       if (!dev || !netif_running(dev))
+               return;
+
+       ops = dev->netdev_ops;
+       if (!ops->ndo_poll_controller)
                return;
 
        /* Process pending work on NIC */
-       np->dev->poll_controller(np->dev);
-       if (np->dev->poll)
-               poll_napi(np);
+       ops->ndo_poll_controller(dev);
 
-       service_arp_queue(np->dev->npinfo);
+       poll_napi(dev);
+
+       if (dev->priv_flags & IFF_SLAVE) {
+               if (dev->npinfo) {
+                       struct net_device *bond_dev = dev->master;
+                       struct sk_buff *skb;
+                       while ((skb = skb_dequeue(&dev->npinfo->arp_tx))) {
+                               skb->dev = bond_dev;
+                               skb_queue_tail(&bond_dev->npinfo->arp_tx, skb);
+                       }
+               }
+       }
+
+       service_arp_queue(dev->npinfo);
 
        zap_completion_queue();
 }
+EXPORT_SYMBOL(netpoll_poll_dev);
+
+void netpoll_poll(struct netpoll *np)
+{
+       netpoll_poll_dev(np->dev);
+}
+EXPORT_SYMBOL(netpoll_poll);
 
 static void refill_skbs(void)
 {
@@ -192,10 +248,12 @@ static void zap_completion_queue(void)
                while (clist != NULL) {
                        struct sk_buff *skb = clist;
                        clist = clist->next;
-                       if (skb->destructor)
+                       if (skb->destructor) {
+                               atomic_inc(&skb->users);
                                dev_kfree_skb_any(skb); /* put this one back */
-                       else
+                       } else {
                                __kfree_skb(skb);
+                       }
                }
        }
 
@@ -228,41 +286,65 @@ repeat:
        return skb;
 }
 
-static void netpoll_send_skb(struct netpoll *np, struct sk_buff *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;
+}
+
+void netpoll_send_skb_on_dev(struct netpoll *np, struct sk_buff *skb,
+                            struct net_device *dev)
 {
        int status = NETDEV_TX_BUSY;
        unsigned long tries;
-       struct net_device *dev = np->dev;
-       struct netpoll_info *npinfo = np->dev->npinfo;
+       const struct net_device_ops *ops = dev->netdev_ops;
+       /* It is up to the caller to keep npinfo alive. */
+       struct netpoll_info *npinfo = np->dev->npinfo;
 
-       if (!npinfo || !netif_running(dev) || !netif_device_present(dev)) {
-               __kfree_skb(skb);
-               return;
-       }
+       if (!npinfo || !netif_running(dev) || !netif_device_present(dev)) {
+               __kfree_skb(skb);
+               return;
+       }
 
        /* 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)) {
+               struct netdev_queue *txq;
                unsigned long flags;
 
+               txq = netdev_get_tx_queue(dev, skb_get_queue_mapping(skb));
+
                local_irq_save(flags);
-               if (netif_tx_trylock(dev)) {
-                       /* try until next clock tick */
-                       for (tries = jiffies_to_usecs(1)/USEC_PER_POLL;
-                                       tries > 0; --tries) {
-                               if (!netif_queue_stopped(dev))
-                                       status = dev->hard_start_xmit(skb, dev);
+               /* try until next clock tick */
+               for (tries = jiffies_to_usecs(1)/USEC_PER_POLL;
+                    tries > 0; --tries) {
+                       if (__netif_tx_trylock(txq)) {
+                               if (!netif_tx_queue_stopped(txq)) {
+                                       status = ops->ndo_start_xmit(skb, dev);
+                                       if (status == NETDEV_TX_OK)
+                                               txq_trans_update(txq);
+                               }
+                               __netif_tx_unlock(txq);
 
                                if (status == NETDEV_TX_OK)
                                        break;
 
-                               /* tickle device maybe there is some cleanup */
-                               netpoll_poll(np);
-
-                               udelay(USEC_PER_POLL);
                        }
-                       netif_tx_unlock(dev);
+
+                       /* tickle device maybe there is some cleanup */
+                       netpoll_poll(np);
+
+                       udelay(USEC_PER_POLL);
                }
+
+               WARN_ONCE(!irqs_disabled(),
+                       "netpoll_send_skb(): %s enabled interrupts in poll (%pF)\n",
+                       dev->name, ops->ndo_start_xmit);
+
                local_irq_restore(flags);
        }
 
@@ -271,6 +353,7 @@ static void netpoll_send_skb(struct netpoll *np, struct sk_buff *skb)
                schedule_delayed_work(&npinfo->tx_work,0);
        }
 }
+EXPORT_SYMBOL(netpoll_send_skb_on_dev);
 
 void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
 {
@@ -288,22 +371,26 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
        if (!skb)
                return;
 
-       memcpy(skb->data, msg, len);
+       skb_copy_to_linear_data(skb, msg, len);
        skb->len += len;
 
-       skb->h.uh = udph = (struct udphdr *) skb_push(skb, sizeof(*udph));
+       skb_push(skb, sizeof(*udph));
+       skb_reset_transport_header(skb);
+       udph = udp_hdr(skb);
        udph->source = htons(np->local_port);
        udph->dest = htons(np->remote_port);
        udph->len = htons(udp_len);
        udph->check = 0;
-       udph->check = csum_tcpudp_magic(htonl(np->local_ip),
-                                       htonl(np->remote_ip),
+       udph->check = csum_tcpudp_magic(np->local_ip,
+                                       np->remote_ip,
                                        udp_len, IPPROTO_UDP,
-                                       csum_partial((unsigned char *)udph, udp_len, 0));
+                                       csum_partial(udph, udp_len, 0));
        if (udph->check == 0)
                udph->check = CSUM_MANGLED_0;
 
-       skb->nh.iph = iph = (struct iphdr *)skb_push(skb, sizeof(*iph));
+       skb_push(skb, sizeof(*iph));
+       skb_reset_network_header(skb);
+       iph = ip_hdr(skb);
 
        /* iph->version = 4; iph->ihl = 5; */
        put_unaligned(0x45, (unsigned char *)iph);
@@ -314,20 +401,21 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
        iph->ttl      = 64;
        iph->protocol = IPPROTO_UDP;
        iph->check    = 0;
-       put_unaligned(htonl(np->local_ip), &(iph->saddr));
-       put_unaligned(htonl(np->remote_ip), &(iph->daddr));
+       put_unaligned(np->local_ip, &(iph->saddr));
+       put_unaligned(np->remote_ip, &(iph->daddr));
        iph->check    = ip_fast_csum((unsigned char *)iph, iph->ihl);
 
        eth = (struct ethhdr *) skb_push(skb, ETH_HLEN);
-       skb->mac.raw = skb->data;
+       skb_reset_mac_header(skb);
        skb->protocol = eth->h_proto = htons(ETH_P_IP);
-       memcpy(eth->h_source, np->local_mac, 6);
-       memcpy(eth->h_dest, np->remote_mac, 6);
+       memcpy(eth->h_source, np->dev->dev_addr, ETH_ALEN);
+       memcpy(eth->h_dest, np->remote_mac, ETH_ALEN);
 
        skb->dev = np->dev;
 
        netpoll_send_skb(np, skb);
 }
+EXPORT_SYMBOL(netpoll_send_udp);
 
 static void arp_reply(struct sk_buff *skb)
 {
@@ -338,24 +426,36 @@ static void arp_reply(struct sk_buff *skb)
        __be32 sip, tip;
        unsigned char *sha;
        struct sk_buff *send_skb;
-       struct netpoll *np = NULL;
+       struct netpoll *np, *tmp;
+       unsigned long flags;
+       int hits = 0;
+
+       if (list_empty(&npinfo->rx_np))
+               return;
 
-       if (npinfo->rx_np && npinfo->rx_np->dev == skb->dev)
-               np = npinfo->rx_np;
-       if (!np)
+       /* Before checking the packet, we do some early
+          inspection whether this is interesting at all */
+       spin_lock_irqsave(&npinfo->rx_lock, flags);
+       list_for_each_entry_safe(np, tmp, &npinfo->rx_np, rx) {
+               if (np->dev == skb->dev)
+                       hits++;
+       }
+       spin_unlock_irqrestore(&npinfo->rx_lock, flags);
+
+       /* No netpoll struct is using this dev */
+       if (!hits)
                return;
 
        /* No arp on this interface */
        if (skb->dev->flags & IFF_NOARP)
                return;
 
-       if (!pskb_may_pull(skb, (sizeof(struct arphdr) +
-                                (2 * skb->dev->addr_len) +
-                                (2 * sizeof(u32)))))
+       if (!pskb_may_pull(skb, arp_hdr_len(skb->dev)))
                return;
 
-       skb->h.raw = skb->nh.raw = skb->data;
-       arp = skb->nh.arph;
+       skb_reset_network_header(skb);
+       skb_reset_transport_header(skb);
+       arp = arp_hdr(skb);
 
        if ((arp->ar_hrd != htons(ARPHRD_ETHER) &&
             arp->ar_hrd != htons(ARPHRD_IEEE802)) ||
@@ -369,78 +469,91 @@ static void arp_reply(struct sk_buff *skb)
        arp_ptr += skb->dev->addr_len;
        memcpy(&sip, arp_ptr, 4);
        arp_ptr += 4;
-       /* if we actually cared about dst hw addr, it would get copied here */
+       /* If we actually cared about dst hw addr,
+          it would get copied here */
        arp_ptr += skb->dev->addr_len;
        memcpy(&tip, arp_ptr, 4);
 
        /* Should we ignore arp? */
-       if (tip != htonl(np->local_ip) || LOOPBACK(tip) || MULTICAST(tip))
+       if (ipv4_is_loopback(tip) || ipv4_is_multicast(tip))
                return;
 
-       size = sizeof(struct arphdr) + 2 * (skb->dev->addr_len + 4);
-       send_skb = find_skb(np, size + LL_RESERVED_SPACE(np->dev),
-                           LL_RESERVED_SPACE(np->dev));
+       size = arp_hdr_len(skb->dev);
 
-       if (!send_skb)
-               return;
-
-       send_skb->nh.raw = send_skb->data;
-       arp = (struct arphdr *) skb_put(send_skb, size);
-       send_skb->dev = skb->dev;
-       send_skb->protocol = htons(ETH_P_ARP);
-
-       /* Fill the device header for the ARP frame */
+       spin_lock_irqsave(&npinfo->rx_lock, flags);
+       list_for_each_entry_safe(np, tmp, &npinfo->rx_np, rx) {
+               if (tip != np->local_ip)
+                       continue;
 
-       if (np->dev->hard_header &&
-           np->dev->hard_header(send_skb, skb->dev, ptype,
-                                sha, np->local_mac,
-                                send_skb->len) < 0) {
-               kfree_skb(send_skb);
-               return;
-       }
+               send_skb = find_skb(np, size + LL_ALLOCATED_SPACE(np->dev),
+                                   LL_RESERVED_SPACE(np->dev));
+               if (!send_skb)
+                       continue;
 
-       /*
-        * Fill out the arp protocol part.
-        *
-        * we only support ethernet device type,
-        * which (according to RFC 1390) should always equal 1 (Ethernet).
-        */
+               skb_reset_network_header(send_skb);
+               arp = (struct arphdr *) skb_put(send_skb, size);
+               send_skb->dev = skb->dev;
+               send_skb->protocol = htons(ETH_P_ARP);
 
-       arp->ar_hrd = htons(np->dev->type);
-       arp->ar_pro = htons(ETH_P_IP);
-       arp->ar_hln = np->dev->addr_len;
-       arp->ar_pln = 4;
-       arp->ar_op = htons(type);
+               /* Fill the device header for the ARP frame */
+               if (dev_hard_header(send_skb, skb->dev, ptype,
+                                   sha, np->dev->dev_addr,
+                                   send_skb->len) < 0) {
+                       kfree_skb(send_skb);
+                       continue;
+               }
 
-       arp_ptr=(unsigned char *)(arp + 1);
-       memcpy(arp_ptr, np->dev->dev_addr, np->dev->addr_len);
-       arp_ptr += np->dev->addr_len;
-       memcpy(arp_ptr, &tip, 4);
-       arp_ptr += 4;
-       memcpy(arp_ptr, sha, np->dev->addr_len);
-       arp_ptr += np->dev->addr_len;
-       memcpy(arp_ptr, &sip, 4);
+               /*
+                * Fill out the arp protocol part.
+                *
+                * we only support ethernet device type,
+                * which (according to RFC 1390) should
+                * always equal 1 (Ethernet).
+                */
 
-       netpoll_send_skb(np, send_skb);
+               arp->ar_hrd = htons(np->dev->type);
+               arp->ar_pro = htons(ETH_P_IP);
+               arp->ar_hln = np->dev->addr_len;
+               arp->ar_pln = 4;
+               arp->ar_op = htons(type);
+
+               arp_ptr = (unsigned char *)(arp + 1);
+               memcpy(arp_ptr, np->dev->dev_addr, np->dev->addr_len);
+               arp_ptr += np->dev->addr_len;
+               memcpy(arp_ptr, &tip, 4);
+               arp_ptr += 4;
+               memcpy(arp_ptr, sha, np->dev->addr_len);
+               arp_ptr += np->dev->addr_len;
+               memcpy(arp_ptr, &sip, 4);
+
+               netpoll_send_skb(np, send_skb);
+
+               /* If there are several rx_hooks for the same address,
+                  we're fine by sending a single reply */
+               break;
+       }
+       spin_unlock_irqrestore(&npinfo->rx_lock, flags);
 }
 
 int __netpoll_rx(struct sk_buff *skb)
 {
        int proto, len, ulen;
+       int hits = 0;
        struct iphdr *iph;
        struct udphdr *uh;
-       struct netpoll_info *npi = skb->dev->npinfo;
-       struct netpoll *np = npi->rx_np;
+       struct netpoll_info *npinfo = skb->dev->npinfo;
+       struct netpoll *np, *tmp;
 
-       if (!np)
+       if (list_empty(&npinfo->rx_np))
                goto out;
+
        if (skb->dev->type != ARPHRD_ETHER)
                goto out;
 
        /* check if netpoll clients need ARP */
-       if (skb->protocol == __constant_htons(ETH_P_ARP) &&
+       if (skb->protocol == htons(ETH_P_ARP) &&
            atomic_read(&trapped)) {
-               skb_queue_tail(&npi->arp_tx, skb);
+               skb_queue_tail(&npinfo->arp_tx, skb);
                return 1;
        }
 
@@ -466,6 +579,13 @@ int __netpoll_rx(struct sk_buff *skb)
        if (skb->len < len || len < iph->ihl*4)
                goto out;
 
+       /*
+        * Our transport medium may have padded the buffer out.
+        * Now We trim to the true length of the frame.
+        */
+       if (pskb_trim_rcsum(skb, len))
+               goto out;
+
        if (iph->protocol != IPPROTO_UDP)
                goto out;
 
@@ -477,16 +597,23 @@ int __netpoll_rx(struct sk_buff *skb)
                goto out;
        if (checksum_udp(skb, uh, ulen, iph->saddr, iph->daddr))
                goto out;
-       if (np->local_ip && np->local_ip != ntohl(iph->daddr))
-               goto out;
-       if (np->remote_ip && np->remote_ip != ntohl(iph->saddr))
-               goto out;
-       if (np->local_port && np->local_port != ntohs(uh->dest))
-               goto out;
 
-       np->rx_hook(np, ntohs(uh->source),
-                   (char *)(uh+1),
-                   ulen - sizeof(struct udphdr));
+       list_for_each_entry_safe(np, tmp, &npinfo->rx_np, rx) {
+               if (np->local_ip && np->local_ip != iph->daddr)
+                       continue;
+               if (np->remote_ip && np->remote_ip != iph->saddr)
+                       continue;
+               if (np->local_port && np->local_port != ntohs(uh->dest))
+                       continue;
+
+               np->rx_hook(np, ntohs(uh->source),
+                              (char *)(uh+1),
+                              ulen - sizeof(struct udphdr));
+               hits++;
+       }
+
+       if (!hits)
+               goto out;
 
        kfree_skb(skb);
        return 1;
@@ -500,6 +627,23 @@ out:
        return 0;
 }
 
+void netpoll_print_options(struct netpoll *np)
+{
+       printk(KERN_INFO "%s: local port %d\n",
+                        np->name, np->local_port);
+       printk(KERN_INFO "%s: local IP %pI4\n",
+                        np->name, &np->local_ip);
+       printk(KERN_INFO "%s: interface '%s'\n",
+                        np->name, np->dev_name);
+       printk(KERN_INFO "%s: remote port %d\n",
+                        np->name, np->remote_port);
+       printk(KERN_INFO "%s: remote IP %pI4\n",
+                        np->name, &np->remote_ip);
+       printk(KERN_INFO "%s: remote ethernet address %pM\n",
+                        np->name, np->remote_mac);
+}
+EXPORT_SYMBOL(netpoll_print_options);
+
 int netpoll_parse_options(struct netpoll *np, char *opt)
 {
        char *cur=opt, *delim;
@@ -512,17 +656,13 @@ int netpoll_parse_options(struct netpoll *np, char *opt)
                cur = delim;
        }
        cur++;
-       printk(KERN_INFO "%s: local port %d\n", np->name, np->local_port);
 
        if (*cur != '/') {
                if ((delim = strchr(cur, '/')) == NULL)
                        goto parse_failed;
                *delim = 0;
-               np->local_ip = ntohl(in_aton(cur));
+               np->local_ip = in_aton(cur);
                cur = delim;
-
-               printk(KERN_INFO "%s: local IP %d.%d.%d.%d\n",
-                      np->name, HIPQUAD(np->local_ip));
        }
        cur++;
 
@@ -536,29 +676,26 @@ int netpoll_parse_options(struct netpoll *np, char *opt)
        }
        cur++;
 
-       printk(KERN_INFO "%s: interface %s\n", np->name, np->dev_name);
-
        if (*cur != '@') {
                /* dst port */
                if ((delim = strchr(cur, '@')) == NULL)
                        goto parse_failed;
                *delim = 0;
+               if (*cur == ' ' || *cur == '\t')
+                       printk(KERN_INFO "%s: warning: whitespace"
+                                       "is not allowed\n", np->name);
                np->remote_port = simple_strtol(cur, NULL, 10);
                cur = delim;
        }
        cur++;
-       printk(KERN_INFO "%s: remote port %d\n", np->name, np->remote_port);
 
        /* dst ip */
        if ((delim = strchr(cur, '/')) == NULL)
                goto parse_failed;
        *delim = 0;
-       np->remote_ip = ntohl(in_aton(cur));
+       np->remote_ip = in_aton(cur);
        cur = delim + 1;
 
-       printk(KERN_INFO "%s: remote IP %d.%d.%d.%d\n",
-              np->name, HIPQUAD(np->remote_ip));
-
        if (*cur != 0) {
                /* MAC address */
                if ((delim = strchr(cur, ':')) == NULL)
@@ -589,52 +726,42 @@ int netpoll_parse_options(struct netpoll *np, char *opt)
                np->remote_mac[5] = simple_strtol(cur, NULL, 16);
        }
 
-       printk(KERN_INFO "%s: remote ethernet address "
-              "%02x:%02x:%02x:%02x:%02x:%02x\n",
-              np->name,
-              np->remote_mac[0],
-              np->remote_mac[1],
-              np->remote_mac[2],
-              np->remote_mac[3],
-              np->remote_mac[4],
-              np->remote_mac[5]);
+       netpoll_print_options(np);
 
        return 0;
 
  parse_failed:
-       printk(KERN_INFO "%s: couldn't parse config at %s!\n",
+       printk(KERN_INFO "%s: couldn't parse config at '%s'!\n",
               np->name, cur);
        return -1;
 }
+EXPORT_SYMBOL(netpoll_parse_options);
 
-int netpoll_setup(struct netpoll *np)
+int __netpoll_setup(struct netpoll *np)
 {
-       struct net_device *ndev = NULL;
-       struct in_device *in_dev;
+       struct net_device *ndev = np->dev;
        struct netpoll_info *npinfo;
+       const struct net_device_ops *ops;
        unsigned long flags;
        int err;
 
-       if (np->dev_name)
-               ndev = dev_get_by_name(np->dev_name);
-       if (!ndev) {
-               printk(KERN_ERR "%s: %s doesn't exist, aborting.\n",
+       if ((ndev->priv_flags & IFF_DISABLE_NETPOLL) ||
+           !ndev->netdev_ops->ndo_poll_controller) {
+               printk(KERN_ERR "%s: %s doesn't support polling, aborting.\n",
                       np->name, np->dev_name);
-               return -ENODEV;
+               err = -ENOTSUPP;
+               goto out;
        }
 
-       np->dev = ndev;
        if (!ndev->npinfo) {
                npinfo = kmalloc(sizeof(*npinfo), GFP_KERNEL);
                if (!npinfo) {
                        err = -ENOMEM;
-                       goto release;
+                       goto out;
                }
 
                npinfo->rx_flags = 0;
-               npinfo->rx_np = NULL;
-               spin_lock_init(&npinfo->poll_lock);
-               npinfo->poll_owner = -1;
+               INIT_LIST_HEAD(&npinfo->rx_np);
 
                spin_lock_init(&npinfo->rx_lock);
                skb_queue_head_init(&npinfo->arp_tx);
@@ -642,16 +769,51 @@ int netpoll_setup(struct netpoll *np)
                INIT_DELAYED_WORK(&npinfo->tx_work, queue_process);
 
                atomic_set(&npinfo->refcnt, 1);
+
+               ops = np->dev->netdev_ops;
+               if (ops->ndo_netpoll_setup) {
+                       err = ops->ndo_netpoll_setup(ndev, npinfo);
+                       if (err)
+                               goto free_npinfo;
+               }
        } else {
                npinfo = ndev->npinfo;
                atomic_inc(&npinfo->refcnt);
        }
 
-       if (!ndev->poll_controller) {
-               printk(KERN_ERR "%s: %s doesn't support polling, aborting.\n",
+       npinfo->netpoll = np;
+
+       if (np->rx_hook) {
+               spin_lock_irqsave(&npinfo->rx_lock, flags);
+               npinfo->rx_flags |= NETPOLL_RX_ENABLED;
+               list_add_tail(&np->rx, &npinfo->rx_np);
+               spin_unlock_irqrestore(&npinfo->rx_lock, flags);
+       }
+
+       /* last thing to do is link it to the net device structure */
+       rcu_assign_pointer(ndev->npinfo, npinfo);
+
+       return 0;
+
+free_npinfo:
+       kfree(npinfo);
+out:
+       return err;
+}
+EXPORT_SYMBOL_GPL(__netpoll_setup);
+
+int netpoll_setup(struct netpoll *np)
+{
+       struct net_device *ndev = NULL;
+       struct in_device *in_dev;
+       int err;
+
+       if (np->dev_name)
+               ndev = dev_get_by_name(&init_net, np->dev_name);
+       if (!ndev) {
+               printk(KERN_ERR "%s: %s doesn't exist, aborting.\n",
                       np->name, np->dev_name);
-               err = -ENOTSUPP;
-               goto release;
+               return -ENODEV;
        }
 
        if (!netif_running(ndev)) {
@@ -667,11 +829,11 @@ int netpoll_setup(struct netpoll *np)
                if (err) {
                        printk(KERN_ERR "%s: failed to open %s\n",
                               np->name, ndev->name);
-                       goto release;
+                       goto put;
                }
 
                atleast = jiffies + HZ/10;
-               atmost = jiffies + 4*HZ;
+               atmost = jiffies + carrier_timeout * HZ;
                while (!netif_carrier_ok(ndev)) {
                        if (time_after(jiffies, atmost)) {
                                printk(KERN_NOTICE
@@ -679,7 +841,7 @@ int netpoll_setup(struct netpoll *np)
                                       np->name);
                                break;
                        }
-                       cond_resched();
+                       msleep(1);
                }
 
                /* If carrier appears to come up instantly, we don't
@@ -695,9 +857,6 @@ int netpoll_setup(struct netpoll *np)
                }
        }
 
-       if (is_zero_ether_addr(np->local_mac) && ndev->dev_addr)
-               memcpy(np->local_mac, ndev->dev_addr, 6);
-
        if (!np->local_ip) {
                rcu_read_lock();
                in_dev = __in_dev_get_rcu(ndev);
@@ -707,40 +866,33 @@ int netpoll_setup(struct netpoll *np)
                        printk(KERN_ERR "%s: no IP address for %s, aborting\n",
                               np->name, np->dev_name);
                        err = -EDESTADDRREQ;
-                       goto release;
+                       goto put;
                }
 
-               np->local_ip = ntohl(in_dev->ifa_list->ifa_local);
+               np->local_ip = in_dev->ifa_list->ifa_local;
                rcu_read_unlock();
-               printk(KERN_INFO "%s: local IP %d.%d.%d.%d\n",
-                      np->name, HIPQUAD(np->local_ip));
+               printk(KERN_INFO "%s: local IP %pI4\n", np->name, &np->local_ip);
        }
 
-       if (np->rx_hook) {
-               spin_lock_irqsave(&npinfo->rx_lock, flags);
-               npinfo->rx_flags |= NETPOLL_RX_ENABLED;
-               npinfo->rx_np = np;
-               spin_unlock_irqrestore(&npinfo->rx_lock, flags);
-       }
+       np->dev = ndev;
 
        /* fill up the skb queue */
        refill_skbs();
 
-       /* last thing to do is link it to the net device structure */
-       ndev->npinfo = npinfo;
+       rtnl_lock();
+       err = __netpoll_setup(np);
+       rtnl_unlock();
 
-       /* avoid racing with NAPI reading npinfo */
-       synchronize_rcu();
+       if (err)
+               goto put;
 
        return 0;
 
- release:
-       if (!ndev->npinfo)
-               kfree(npinfo);
-       np->dev = NULL;
+put:
        dev_put(ndev);
        return err;
 }
+EXPORT_SYMBOL(netpoll_setup);
 
 static int __init netpoll_init(void)
 {
@@ -749,42 +901,65 @@ static int __init netpoll_init(void)
 }
 core_initcall(netpoll_init);
 
-void netpoll_cleanup(struct netpoll *np)
+void __netpoll_cleanup(struct netpoll *np)
 {
        struct netpoll_info *npinfo;
        unsigned long flags;
 
-       if (np->dev) {
-               npinfo = np->dev->npinfo;
-               if (npinfo) {
-                       if (npinfo->rx_np == np) {
-                               spin_lock_irqsave(&npinfo->rx_lock, flags);
-                               npinfo->rx_np = NULL;
-                               npinfo->rx_flags &= ~NETPOLL_RX_ENABLED;
-                               spin_unlock_irqrestore(&npinfo->rx_lock, flags);
-                       }
+       npinfo = np->dev->npinfo;
+       if (!npinfo)
+               return;
+
+       if (!list_empty(&npinfo->rx_np)) {
+               spin_lock_irqsave(&npinfo->rx_lock, flags);
+               list_del(&np->rx);
+               if (list_empty(&npinfo->rx_np))
+                       npinfo->rx_flags &= ~NETPOLL_RX_ENABLED;
+               spin_unlock_irqrestore(&npinfo->rx_lock, flags);
+       }
 
-                       np->dev->npinfo = NULL;
-                       if (atomic_dec_and_test(&npinfo->refcnt)) {
-                               skb_queue_purge(&npinfo->arp_tx);
-                               skb_queue_purge(&npinfo->txq);
-                               cancel_rearming_delayed_work(&npinfo->tx_work);
-                               flush_scheduled_work();
+       if (atomic_dec_and_test(&npinfo->refcnt)) {
+               const struct net_device_ops *ops;
 
-                               kfree(npinfo);
-                       }
-               }
+               ops = np->dev->netdev_ops;
+               if (ops->ndo_netpoll_cleanup)
+                       ops->ndo_netpoll_cleanup(np->dev);
+
+               rcu_assign_pointer(np->dev->npinfo, NULL);
+
+               /* avoid racing with NAPI reading npinfo */
+               synchronize_rcu_bh();
+
+               skb_queue_purge(&npinfo->arp_tx);
+               skb_queue_purge(&npinfo->txq);
+               cancel_delayed_work_sync(&npinfo->tx_work);
 
-               dev_put(np->dev);
+               /* clean after last, unfinished work */
+               __skb_queue_purge(&npinfo->txq);
+               kfree(npinfo);
        }
+}
+EXPORT_SYMBOL_GPL(__netpoll_cleanup);
+
+void netpoll_cleanup(struct netpoll *np)
+{
+       if (!np->dev)
+               return;
+
+       rtnl_lock();
+       __netpoll_cleanup(np);
+       rtnl_unlock();
 
+       dev_put(np->dev);
        np->dev = NULL;
 }
+EXPORT_SYMBOL(netpoll_cleanup);
 
 int netpoll_trap(void)
 {
        return atomic_read(&trapped);
 }
+EXPORT_SYMBOL(netpoll_trap);
 
 void netpoll_set_trap(int trap)
 {
@@ -793,11 +968,4 @@ void netpoll_set_trap(int trap)
        else
                atomic_dec(&trapped);
 }
-
 EXPORT_SYMBOL(netpoll_set_trap);
-EXPORT_SYMBOL(netpoll_trap);
-EXPORT_SYMBOL(netpoll_parse_options);
-EXPORT_SYMBOL(netpoll_setup);
-EXPORT_SYMBOL(netpoll_cleanup);
-EXPORT_SYMBOL(netpoll_send_udp);
-EXPORT_SYMBOL(netpoll_poll);