65 lines
1.9 KiB
Diff
65 lines
1.9 KiB
Diff
|
From 8a13788dc0fd158216b4d1cc59bb714f097b94bf Mon Sep 17 00:00:00 2001
|
||
|
|
From: Thomas Gleixner <tglx@linutronix.de>
|
||
|
|
Date: Wed, 26 Sep 2012 16:21:08 +0200
|
||
|
|
Subject: [PATCH 287/365] 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>
|
||
|
|
---
|
||
|
|
net/core/skbuff.c | 10 ++++++----
|
||
|
|
1 file changed, 6 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
|
||
|
|
index 5582a4ed7c2f..c89c40271856 100644
|
||
|
|
--- a/net/core/skbuff.c
|
||
|
|
+++ b/net/core/skbuff.c
|
||
|
|
@@ -64,6 +64,7 @@
|
||
|
|
#include <linux/errqueue.h>
|
||
|
|
#include <linux/prefetch.h>
|
||
|
|
#include <linux/if_vlan.h>
|
||
|
|
+#include <linux/locallock.h>
|
||
|
|
|
||
|
|
#include <net/protocol.h>
|
||
|
|
#include <net/dst.h>
|
||
|
|
@@ -360,6 +361,7 @@ struct napi_alloc_cache {
|
||
|
|
|
||
|
|
static DEFINE_PER_CPU(struct page_frag_cache, netdev_alloc_cache);
|
||
|
|
static DEFINE_PER_CPU(struct napi_alloc_cache, napi_alloc_cache);
|
||
|
|
+static DEFINE_LOCAL_IRQ_LOCK(netdev_alloc_lock);
|
||
|
|
|
||
|
|
static void *__netdev_alloc_frag(unsigned int fragsz, gfp_t gfp_mask)
|
||
|
|
{
|
||
|
|
@@ -367,10 +369,10 @@ static void *__netdev_alloc_frag(unsigned int fragsz, gfp_t gfp_mask)
|
||
|
|
unsigned long flags;
|
||
|
|
void *data;
|
||
|
|
|
||
|
|
- local_irq_save(flags);
|
||
|
|
+ local_lock_irqsave(netdev_alloc_lock, flags);
|
||
|
|
nc = this_cpu_ptr(&netdev_alloc_cache);
|
||
|
|
data = __alloc_page_frag(nc, fragsz, gfp_mask);
|
||
|
|
- local_irq_restore(flags);
|
||
|
|
+ local_unlock_irqrestore(netdev_alloc_lock, flags);
|
||
|
|
return data;
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -442,13 +444,13 @@ struct sk_buff *__netdev_alloc_skb(struct net_device *dev, unsigned int len,
|
||
|
|
if (sk_memalloc_socks())
|
||
|
|
gfp_mask |= __GFP_MEMALLOC;
|
||
|
|
|
||
|
|
- local_irq_save(flags);
|
||
|
|
+ local_lock_irqsave(netdev_alloc_lock, flags);
|
||
|
|
|
||
|
|
nc = this_cpu_ptr(&netdev_alloc_cache);
|
||
|
|
data = __alloc_page_frag(nc, len, gfp_mask);
|
||
|
|
pfmemalloc = nc->pfmemalloc;
|
||
|
|
|
||
|
|
- local_irq_restore(flags);
|
||
|
|
+ local_unlock_irqrestore(netdev_alloc_lock, flags);
|
||
|
|
|
||
|
|
if (unlikely(!data))
|
||
|
|
return NULL;
|
||
|
|
--
|
||
|
|
2.28.0
|
||
|
|
|