diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2012-09-26 16:21:08 +0200 |
|---|---|---|
| committer | Gary S. Robertson <gary.robertson@linaro.org> | 2014-06-06 15:24:11 -0500 |
| commit | 4d819dc9935a6d4131048460cda2b5cfe9ee5bf3 (patch) | |
| tree | dfef1ed0150b9680608699500cb85ea2f00fe612 | |
| parent | b010c4988f156bc43bb9ea9801f1914562f96852 (diff) | |
net: Another local_irq_disable/kmalloc headache
Replace it by a local lock. Though that's pretty inefficient :(
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| -rw-r--r-- | net/core/skbuff.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 90b96a11b974..3ef89d422cc1 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -62,6 +62,7 @@ #include <linux/scatterlist.h> #include <linux/errqueue.h> #include <linux/prefetch.h> +#include <linux/locallock.h> #include <net/protocol.h> #include <net/dst.h> @@ -335,6 +336,7 @@ struct netdev_alloc_cache { unsigned int pagecnt_bias; }; static DEFINE_PER_CPU(struct netdev_alloc_cache, netdev_alloc_cache); +static DEFINE_LOCAL_IRQ_LOCK(netdev_alloc_lock); static void *__netdev_alloc_frag(unsigned int fragsz, gfp_t gfp_mask) { @@ -343,7 +345,7 @@ static void *__netdev_alloc_frag(unsigned int fragsz, gfp_t gfp_mask) int order; unsigned long flags; - local_irq_save(flags); + local_lock_irqsave(netdev_alloc_lock, flags); nc = &__get_cpu_var(netdev_alloc_cache); if (unlikely(!nc->frag.page)) { refill: @@ -377,7 +379,7 @@ recycle: nc->frag.offset += fragsz; nc->pagecnt_bias--; end: - local_irq_restore(flags); + local_unlock_irqrestore(netdev_alloc_lock, flags); return data; } |