Commit 0fa8103b authored by Wanpeng Li's avatar Wanpeng Li Committed by Pekka Enberg
Browse files

mm/slab: Fix drain freelist excessively 



The drain_freelist is called to drain slabs_free lists for cache reap,
cache shrink, memory hotplug callback etc. The tofree parameter should
be the number of slab to free instead of the number of slab objects to
free.

This patch fix the callers that pass # of objects. Make sure they pass #
of slabs.

Acked-by: default avatarChristoph Lameter <cl@linux.com>
Signed-off-by: default avatarWanpeng Li <liwanp@linux.vnet.ibm.com>
Signed-off-by: default avatarPekka Enberg <penberg@kernel.org>
parent 069e2b35

mm/slab.c

+9 −3
Original line number Diff line number Diff line
@@ -1180,6 +1180,12 @@ static int init_cache_node_node(int node) 
	return 0;

}



static inline int slabs_tofree(struct kmem_cache *cachep,

						struct kmem_cache_node *n)

{

	return (n->free_objects + cachep->num - 1) / cachep->num;

}



static void __cpuinit cpuup_canceled(long cpu)

{

	struct kmem_cache *cachep;
@@ -1241,7 +1247,7 @@ free_array_cache: 
		n = cachep->node[node];

		if (!n)

			continue;

		drain_freelist(cachep, n, n->free_objects);

		drain_freelist(cachep, n, slabs_tofree(cachep, n));

	}

}
@@ -1408,7 +1414,7 @@ static int __meminit drain_cache_node_node(int node) 
		if (!n)

			continue;



		drain_freelist(cachep, n, n->free_objects);

		drain_freelist(cachep, n, slabs_tofree(cachep, n));



		if (!list_empty(&n->slabs_full) ||

		    !list_empty(&n->slabs_partial)) {
@@ -2534,7 +2540,7 @@ static int __cache_shrink(struct kmem_cache *cachep) 
		if (!n)

			continue;



		drain_freelist(cachep, n, n->free_objects);

		drain_freelist(cachep, n, slabs_tofree(cachep, n));



		ret += !list_empty(&n->slabs_full) ||

			!list_empty(&n->slabs_partial);

CRA Git | Maintained and supported by SUSTech CRA and CCSE