Attachment 161198 Details for Bug 251978 – patch file

[patch] patch file

patch.6143381 (text/plain), 1.82 KB, created by Keshav Sharma on 2007-08-13 18:17:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Keshav Sharma

Created: 2007-08-13 18:17:24 UTC

Size: 1.82 KB

patch

obsolete

>--- linux-2.6.9/net/core/netpoll.c.orig
>+++ linux-2.6.9/net/core/netpoll.c      
>@ -97,6 +97,13 @@
>        if (test_bit(__LINK_STATE_RX_SCHED, &dev->state) &&
>            npinfo->poll_owner != smp_processor_id() &&
>            spin_trylock(&npinfo->poll_lock)) {
>+               /* When calling dev->poll from poll_napi, we may end up in
>+                * netif_rx_complete. However, only the CPU to which the
>+                * device was queued is allowed to remove it from poll_list.
>+                * Setting POLL_LIST_FROZEN tells netif_rx_complete
>+                * to leave the NAPI state alone.
>+                */
>+               set_bit(__LINK_STATE_POLL_LIST_FROZEN, &dev->state);
>                npinfo->rx_flags |= NETPOLL_RX_DROP;
>                atomic_inc(&trapped);
>.
>@ -104,6 +111,7 @@
>.
>                atomic_dec(&trapped);
>                npinfo->rx_flags &= ~NETPOLL_RX_DROP;
>+               clear_bit(__LINK_STATE_POLL_LIST_FROZEN, &dev->state);
>                spin_unlock(&npinfo->poll_lock);
>        }
> }
>--- linux-2.6.9/include/linux/netdevice.h.orig  
>+++ linux-2.6.9/include/linux/netdevice.h      
>@ -238,7 +238,9 @@
>        __LINK_STATE_SCHED,
>        __LINK_STATE_NOCARRIER,
>        __LINK_STATE_RX_SCHED,
>-       __LINK_STATE_LINKWATCH_PENDING
>+       __LINK_STATE_LINKWATCH_PENDING,
>+       /* Set by the netpoll NAPI code */
>+       __LINK_STATE_POLL_LIST_FROZEN,
> };
>.
>.
>@ -886,6 +888,14 @@
> {
>        unsigned long flags;
>.
>+#ifdef CONFIG_NETPOLL
>+       /* Prevent race with netpoll - yes, this is a kludge.
>+        * But at least it doesn't penalize the non-netpoll
>+        * code path. */
>+       if (test_bit(__LINK_STATE_POLL_LIST_FROZEN, &dev->state))
>+               return;
>+#endif
>+
>        local_irq_save(flags);
>        BUG_ON(!test_bit(__LINK_STATE_RX_SCHED, &dev->state));
>        list_del(&dev->poll_list);

Actions: View | Diff

Attachments on bug 251978: 161198 | 181601 | 183141 | 183961 | 185531 | 185541 | 186681 | 187461 | 187831 | 189261 | 190311 | 190351 | 194551