FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-03 13:13:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mm/slab: Fix drain freelist excessively

Browse Source 
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: Christoph Lameter <cl@linux.com>
Signed-off-by: Wanpeng Li <liwanp@linux.vnet.ibm.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
This commit is contained in:
Wanpeng Li 2013-07-04 08:33:22 +08:00 committed by Pekka Enberg
parent 069e2b351d
commit 0fa8103be4
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mm/slab.c
View File

@ -1180,6 +1180,12 @@ static int init_cache_node_node(int node)
return 0; 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) static void __cpuinit cpuup_canceled(long cpu)
{ {
struct kmem_cache *cachep; struct kmem_cache *cachep;
@ -1241,7 +1247,7 @@ free_array_cache:
n = cachep->node[node]; n = cachep->node[node];
if (!n) if (!n)
continue; 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) if (!n)
continue; continue;
drain_freelist(cachep, n, n->free_objects); drain_freelist(cachep, n, slabs_tofree(cachep, n));
if (!list_empty(&n->slabs_full) || if (!list_empty(&n->slabs_full) ||
!list_empty(&n->slabs_partial)) { !list_empty(&n->slabs_partial)) {
@ -2534,7 +2540,7 @@ static int __cache_shrink(struct kmem_cache *cachep)
if (!n) if (!n)
continue; continue;
drain_freelist(cachep, n, n->free_objects); drain_freelist(cachep, n, slabs_tofree(cachep, n));
ret += !list_empty(&n->slabs_full) || ret += !list_empty(&n->slabs_full) ||
!list_empty(&n->slabs_partial); !list_empty(&n->slabs_partial);