iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

flowcache: restore a single flow_cache kmem_cache

Browse Source 
It is not legal to create multiple kmem_cache having the same name.

flowcache can use a single kmem_cache, no need for a per netns
one.

Fixes: ca925cf1534e ("flowcache: Make flow cache name space aware")
Reported-by: Jakub Kicinski <moorray3@wp.pl>
Tested-by: Jakub Kicinski <moorray3@wp.pl>
Tested-by: Fan Du <fan.du@windriver.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eric Dumazet 2014-03-10 07:09:07 -07:00 committed by David S. Miller
parent 5812521be0
commit d32d9bb85c
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/net/netns/xfrm.h
View File

@ -64,7 +64,6 @@ struct netns_xfrm {
/* flow cache part */ /* flow cache part */
struct flow_cache flow_cache_global; struct flow_cache flow_cache_global;
struct kmem_cache *flow_cachep;
atomic_t flow_cache_genid; atomic_t flow_cache_genid;
struct list_head flow_cache_gc_list; struct list_head flow_cache_gc_list;
spinlock_t flow_cache_gc_lock; spinlock_t flow_cache_gc_lock;

14
net/core/flow.c
View File

@ -45,6 +45,8 @@ struct flow_flush_info {
struct completion completion; struct completion completion;
}; };
static struct kmem_cache *flow_cachep __read_mostly;
#define flow_cache_hash_size(cache) (1 << (cache)->hash_shift) #define flow_cache_hash_size(cache) (1 << (cache)->hash_shift)
#define FLOW_HASH_RND_PERIOD (10 * 60 * HZ) #define FLOW_HASH_RND_PERIOD (10 * 60 * HZ)
@ -75,7 +77,7 @@ static void flow_entry_kill(struct flow_cache_entry *fle,
{ {
if (fle->object) if (fle->object)
fle->object->ops->delete(fle->object); fle->object->ops->delete(fle->object);
kmem_cache_free(xfrm->flow_cachep, fle); kmem_cache_free(flow_cachep, fle);
} }
static void flow_cache_gc_task(struct work_struct *work) static void flow_cache_gc_task(struct work_struct *work)
@ -230,7 +232,7 @@ flow_cache_lookup(struct net *net, const struct flowi *key, u16 family, u8 dir,
if (fcp->hash_count > fc->high_watermark) if (fcp->hash_count > fc->high_watermark)
flow_cache_shrink(fc, fcp); flow_cache_shrink(fc, fcp);
fle = kmem_cache_alloc(net->xfrm.flow_cachep, GFP_ATOMIC); fle = kmem_cache_alloc(flow_cachep, GFP_ATOMIC);
if (fle) { if (fle) {
fle->net = net; fle->net = net;
fle->family = family; fle->family = family;
@ -435,10 +437,10 @@ int flow_cache_init(struct net *net)
int i; int i;
struct flow_cache *fc = &net->xfrm.flow_cache_global; struct flow_cache *fc = &net->xfrm.flow_cache_global;
/* Initialize per-net flow cache global variables here */ if (!flow_cachep)
net->xfrm.flow_cachep = kmem_cache_create("flow_cache", flow_cachep = kmem_cache_create("flow_cache",
sizeof(struct flow_cache_entry), sizeof(struct flow_cache_entry),
0, SLAB_PANIC, NULL); 0, SLAB_PANIC, NULL);
spin_lock_init(&net->xfrm.flow_cache_gc_lock); spin_lock_init(&net->xfrm.flow_cache_gc_lock);
INIT_LIST_HEAD(&net->xfrm.flow_cache_gc_list); INIT_LIST_HEAD(&net->xfrm.flow_cache_gc_list);
INIT_WORK(&net->xfrm.flow_cache_gc_work, flow_cache_gc_task); INIT_WORK(&net->xfrm.flow_cache_gc_work, flow_cache_gc_task);