Attachment 186681 Details for Bug 251978 – patch forbids cross-cpu dev processing

[patch] patch forbids cross-cpu dev processing

net.patch (text/plain), 2.67 KB, created by Tina Yang on 2007-09-04 21:36:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tina Yang

Created: 2007-09-04 21:36:49 UTC

Size: 2.67 KB

patch

obsolete

>--- linux-2.6.9/include/linux/netpoll.h.orig    2007-06-28 00:53:27.841967000 -0700
>+++ linux-2.6.9/include/linux/netpoll.h 2007-09-04 14:14:43.888379000 -0700
>@@ -27,6 +27,7 @@ struct netpoll {
> struct netpoll_info {
>        spinlock_t poll_lock;
>        int poll_owner;
>+       int poll_list_owner;
>        int tries;
>        int rx_flags;
>        spinlock_t rx_lock;
>@@ -90,6 +91,24 @@ static inline void netpoll_poll_unlock(v
>        rcu_read_unlock();
> }
> 
>+static inline void *netpoll_set_list_owner(struct net_device *dev)
>+{
>+       struct net_device_wrapper *ndw = dev_wrapper(dev);
>+
>+       if (ndw && ndw->npinfo)
>+               ndw->npinfo->poll_list_owner = smp_processor_id();
>+       return NULL;
>+}
>+
>+static inline void *netpoll_unset_list_owner(struct net_device *dev)
>+{
>+       struct net_device_wrapper *ndw = dev_wrapper(dev);
>+
>+       if (ndw && ndw->npinfo)
>+               ndw->npinfo->poll_list_owner = -1;
>+       return NULL;
>+}
>+
> #else
> #define netpoll_rx(a) 0
> #define netpoll_poll_lock(a) NULL
>--- linux-2.6.9/include/linux/netdevice.h.orig  2007-06-28 00:53:51.164897000 -0700
>+++ linux-2.6.9/include/linux/netdevice.h       2007-09-04 14:23:28.769322000 -0700
>@@ -840,6 +840,7 @@ static inline void __netif_rx_schedule(s
>        local_irq_save(flags);
>        dev_hold(dev);
>        list_add_tail(&dev->poll_list, &__get_cpu_var(softnet_data).poll_list);
>+       netpoll_set_list_owner(dev);
>        if (dev->quota < 0)
>                dev->quota += dev->weight;
>        else
>@@ -887,6 +888,7 @@ static inline void netif_rx_complete(str
>        local_irq_save(flags);
>        BUG_ON(!test_bit(__LINK_STATE_RX_SCHED, &dev->state));
>        list_del(&dev->poll_list);
>+       netpoll_unset_list_owner(dev);
>        smp_mb__before_clear_bit();
>        clear_bit(__LINK_STATE_RX_SCHED, &dev->state);
>        local_irq_restore(flags);
>--- linux-2.6.9/net/core/netpoll.c.orig 2007-06-28 00:53:27.847957000 -0700
>+++ linux-2.6.9/net/core/netpoll.c      2007-09-04 14:19:14.956454000 -0700
>@@ -94,6 +94,7 @@ static void poll_napi(struct net_device 
>        npinfo = ndw->npinfo;
> 
>        if (test_bit(__LINK_STATE_RX_SCHED, &dev->state) &&
>+           npinfo->poll_list_owner == smp_processor_id() &&
>            npinfo->poll_owner != smp_processor_id() &&
>            spin_trylock(&npinfo->poll_lock)) {
>                npinfo->rx_flags |= NETPOLL_RX_DROP;
>@@ -629,6 +630,7 @@ int netpoll_setup(struct netpoll *np)
>                npinfo->rx_np = NULL;
>                spin_lock_init(&npinfo->poll_lock);
>                npinfo->poll_owner = -1;
>+               npinfo->poll_list_owner = -1;
>                npinfo->tries = MAX_RETRIES;
>                spin_lock_init(&npinfo->rx_lock);
>        } else

Actions: View | Diff

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