Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d32d9bb8 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

flowcache: restore a single flow_cache kmem_cache 



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: ca925cf1 ("flowcache: Make flow cache name space aware")
Reported-by: default avatarJakub Kicinski <moorray3@wp.pl>
Tested-by: default avatarJakub Kicinski <moorray3@wp.pl>
Tested-by: default avatarFan Du <fan.du@windriver.com>
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5812521b

include/net/netns/xfrm.h

+0 −1
Original line number Diff line number Diff line
@@ -64,7 +64,6 @@ struct netns_xfrm { 


	/* flow cache part */

	struct flow_cache	flow_cache_global;

	struct kmem_cache	*flow_cachep;

	atomic_t		flow_cache_genid;

	struct list_head	flow_cache_gc_list;

	spinlock_t		flow_cache_gc_lock;

net/core/flow.c

+8 −6
Original line number Diff line number Diff line
@@ -45,6 +45,8 @@ struct flow_flush_info { 
	struct completion		completion;

};



static struct kmem_cache *flow_cachep __read_mostly;



#define flow_cache_hash_size(cache)	(1 << (cache)->hash_shift)

#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)

		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)
@@ -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)

			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) {

			fle->net = net;

			fle->family = family;
@@ -435,8 +437,8 @@ int flow_cache_init(struct net *net) 
	int i;

	struct flow_cache *fc = &net->xfrm.flow_cache_global;



	/* Initialize per-net flow cache global variables here */

	net->xfrm.flow_cachep = kmem_cache_create("flow_cache",

	if (!flow_cachep)

		flow_cachep = kmem_cache_create("flow_cache",

						sizeof(struct flow_cache_entry),

						0, SLAB_PANIC, NULL);

	spin_lock_init(&net->xfrm.flow_cache_gc_lock);