Skip to content

Commit

Permalink
mm/slab: drain the free slab as much as possible
Browse files Browse the repository at this point in the history
slabs_tofree() implies freeing all free slab.  We can do it with just
providing INT_MAX.

Signed-off-by: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Acked-by: Christoph Lameter <cl@linux.com>
Cc: Jesper Dangaard Brouer <brouer@redhat.com>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: David Rientjes <rientjes@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Joonsoo Kim authored and Linus Torvalds committed May 20, 2016
1 parent 8888177 commit a5aa63a
Showing 1 changed file with 3 additions and 9 deletions.
12 changes: 3 additions & 9 deletions mm/slab.c
Original file line number Diff line number Diff line change
Expand Up @@ -895,12 +895,6 @@ 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 cpuup_canceled(long cpu)
{
struct kmem_cache *cachep;
Expand Down Expand Up @@ -965,7 +959,7 @@ static void cpuup_canceled(long cpu)
n = get_node(cachep, node);
if (!n)
continue;
drain_freelist(cachep, n, slabs_tofree(cachep, n));
drain_freelist(cachep, n, INT_MAX);
}
}

Expand Down Expand Up @@ -1117,7 +1111,7 @@ static int __meminit drain_cache_node_node(int node)
if (!n)
continue;

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

if (!list_empty(&n->slabs_full) ||
!list_empty(&n->slabs_partial)) {
Expand Down Expand Up @@ -2311,7 +2305,7 @@ int __kmem_cache_shrink(struct kmem_cache *cachep, bool deactivate)

check_irq_on();
for_each_kmem_cache_node(cachep, node, n) {
drain_freelist(cachep, n, slabs_tofree(cachep, n));
drain_freelist(cachep, n, INT_MAX);

ret += !list_empty(&n->slabs_full) ||
!list_empty(&n->slabs_partial);
Expand Down

0 comments on commit a5aa63a

Please sign in to comment.