1 files changed, 36 insertions, 11 deletions

diff --git a/net/core/dev.c b/net/core/dev.c
index f51f940a077c..f15346b7b5ba 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2064,11 +2064,12 @@ gso:
            Either shot noqueue qdisc, it is even simpler 8)
          */
         if (dev->flags & IFF_UP) {
-                int cpu = smp_processor_id(); /* ok because BHs are off */
-
-                if (txq->xmit_lock_owner != cpu) {
+                /*
+                 * No need to check for recursion with threaded interrupts:
+                 */
+                if (!netif_tx_lock_recursion(txq)) {
 
-                        HARD_TX_LOCK(dev, txq, cpu);
+                        HARD_TX_LOCK(dev, txq);
 
                         if (!netif_tx_queue_stopped(txq)) {
                                 rc = dev_hard_start_xmit(skb, dev, txq);
@@ -2173,8 +2174,8 @@ int netif_rx_ni(struct sk_buff *skb)
 {
         int err;
 
-        preempt_disable();
         err = netif_rx(skb);
+        preempt_disable();
         if (local_softirq_pending())
                 do_softirq();
         preempt_enable();
@@ -2185,7 +2186,8 @@ EXPORT_SYMBOL(netif_rx_ni);
 
 static void net_tx_action(struct softirq_action *h)
 {
-        struct softnet_data *sd = &__get_cpu_var(softnet_data);
+        struct softnet_data *sd = &per_cpu(softnet_data,
+                                           raw_smp_processor_id());
 
         if (sd->completion_queue) {
                 struct sk_buff *clist;
@@ -2201,6 +2203,11 @@ static void net_tx_action(struct softirq_action *h)
 
                         WARN_ON(atomic_read(&skb->users));
                         __kfree_skb(skb);
+                        /*
+                         * Safe to reschedule - the list is private
+                         * at this point.
+                         */
+                        cond_resched_softirq_context();
                 }
         }
 
@@ -2219,6 +2226,22 @@ static void net_tx_action(struct softirq_action *h)
                         head = head->next_sched;
 
                         root_lock = qdisc_lock(q);
+                        /*
+                         * We are executing in softirq context here, and
+                         * if softirqs are preemptible, we must avoid
+                         * infinite reactivation of the softirq by
+                         * either the tx handler, or by netif_schedule().
+                         * (it would result in an infinitely looping
+                         *  softirq context)
+                         * So we take the spinlock unconditionally.
+                         */
+#ifdef CONFIG_PREEMPT_SOFTIRQS
+                        spin_lock(root_lock);
+                        smp_mb__before_clear_bit();
+                        clear_bit(__QDISC_STATE_SCHED, &q->state);
+                        qdisc_run(q);
+                        spin_unlock(root_lock);
+#else
                         if (spin_trylock(root_lock)) {
                                 smp_mb__before_clear_bit();
                                 clear_bit(__QDISC_STATE_SCHED,
@@ -2235,6 +2258,7 @@ static void net_tx_action(struct softirq_action *h)
                                                   &q->state);
                                 }
                         }
+#endif
                 }
         }
 }
@@ -2449,7 +2473,7 @@ int netif_receive_skb(struct sk_buff *skb)
                         skb->dev = master;
         }
 
-        __get_cpu_var(netdev_rx_stat).total++;
+        per_cpu(netdev_rx_stat, raw_smp_processor_id()).total++;
 
         skb_reset_network_header(skb);
         skb_reset_transport_header(skb);
@@ -2835,9 +2859,10 @@ EXPORT_SYMBOL(napi_gro_frags);
 static int process_backlog(struct napi_struct *napi, int quota)
 {
         int work = 0;
-        struct softnet_data *queue = &__get_cpu_var(softnet_data);
+        struct softnet_data *queue;
         unsigned long start_time = jiffies;
 
+        queue = &per_cpu(softnet_data, raw_smp_processor_id());
         napi->weight = weight_p;
         do {
                 struct sk_buff *skb;
@@ -2869,7 +2894,7 @@ void __napi_schedule(struct napi_struct *n)
 
         local_irq_save(flags);
         list_add_tail(&n->poll_list, &__get_cpu_var(softnet_data).poll_list);
-        __raise_softirq_irqoff(NET_RX_SOFTIRQ);
+        raise_softirq_irqoff(NET_RX_SOFTIRQ);
         local_irq_restore(flags);
 }
 EXPORT_SYMBOL(__napi_schedule);
@@ -3023,7 +3048,7 @@ out:
 
 softnet_break:
         __get_cpu_var(netdev_rx_stat).time_squeeze++;
-        __raise_softirq_irqoff(NET_RX_SOFTIRQ);
+        raise_softirq_irqoff(NET_RX_SOFTIRQ);
         goto out;
 }
 
@@ -4855,7 +4880,7 @@ static void __netdev_init_queue_locks_one(struct net_device *dev,
 {
         spin_lock_init(&dev_queue->_xmit_lock);
         netdev_set_xmit_lockdep_class(&dev_queue->_xmit_lock, dev->type);
-        dev_queue->xmit_lock_owner = -1;
+        dev_queue->xmit_lock_owner = (void *)-1;
 }
 
 static void netdev_init_queue_locks(struct net_device *dev)