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

Commit c17dda40 authored by Christoph Lameter's avatar Christoph Lameter Committed by Pekka Enberg
Browse files

slub: Separate out kmem_cache_cpu processing from deactivate_slab 



Processing on fields of kmem_cache_cpu is cleaner if code working on fields
of this struct is taken out of deactivate_slab().

Acked-by: default avatarDavid Rientjes <rientjes@google.com>
Signed-off-by: default avatarChristoph Lameter <cl@linux.com>
Signed-off-by: default avatarPekka Enberg <penberg@kernel.org>
parent ec3ab083

mm/slub.c

+12 −12
Original line number Diff line number Diff line
@@ -1729,14 +1729,12 @@ void init_kmem_cache_cpus(struct kmem_cache *s) 
/*

 * Remove the cpu slab

 */

static void deactivate_slab(struct kmem_cache *s, struct kmem_cache_cpu *c)

static void deactivate_slab(struct kmem_cache *s, struct page *page, void *freelist)

{

	enum slab_modes { M_NONE, M_PARTIAL, M_FULL, M_FREE };

	struct page *page = c->page;

	struct kmem_cache_node *n = get_node(s, page_to_nid(page));

	int lock = 0;

	enum slab_modes l = M_NONE, m = M_NONE;

	void *freelist;

	void *nextfree;

	int tail = DEACTIVATE_TO_HEAD;

	struct page new;
@@ -1747,11 +1745,6 @@ static void deactivate_slab(struct kmem_cache *s, struct kmem_cache_cpu *c) 
		tail = DEACTIVATE_TO_TAIL;

	}



	c->tid = next_tid(c->tid);

	c->page = NULL;

	freelist = c->freelist;

	c->freelist = NULL;



	/*

	 * Stage one: Free all available per cpu objects back

	 * to the page freelist while it is still frozen. Leave the
@@ -2009,7 +2002,11 @@ int put_cpu_partial(struct kmem_cache *s, struct page *page, int drain) 
static inline void flush_slab(struct kmem_cache *s, struct kmem_cache_cpu *c)

{

	stat(s, CPUSLAB_FLUSH);

	deactivate_slab(s, c);

	deactivate_slab(s, c->page, c->freelist);



	c->tid = next_tid(c->tid);

	c->page = NULL;

	c->freelist = NULL;

}



/*
@@ -2229,7 +2226,9 @@ static void *__slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node, 


	if (unlikely(!node_match(c, node))) {

		stat(s, ALLOC_NODE_MISMATCH);

		deactivate_slab(s, c);

		deactivate_slab(s, c->page, c->freelist);

		c->page = NULL;

		c->freelist = NULL;

		goto new_slab;

	}
@@ -2289,8 +2288,9 @@ static void *__slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node, 
	if (!alloc_debug_processing(s, c->page, freelist, addr))

		goto new_slab;	/* Slab failed checks. Next slab needed */



	c->freelist = get_freepointer(s, freelist);

	deactivate_slab(s, c);

	deactivate_slab(s, c->page, get_freepointer(s, freelist));

	c->page = NULL;

	c->freelist = NULL;

	local_irq_restore(flags);

	return freelist;

}