Skip to content

Commit

Permalink
SLUB slab validation: Move tracking information alloc outside of lock
Browse files Browse the repository at this point in the history
We currently have to do an GFP_ATOMIC allocation because the list_lock is
already taken when we first allocate memory for tracking allocation
information.  It would be better if we could avoid atomic allocations.

Allocate a size of the tracking table that is usually sufficient (one page)
before we take the list lock.  We will then only do the atomic allocation
if we need to resize the table to become larger than a page (mostly only
needed under large NUMA because of the tracking of cpus and nodes otherwise
the table stays small).

Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Christoph Lameter authored and Linus Torvalds committed Jul 17, 2007
1 parent 5b95a4a commit 68dff6a
Showing 1 changed file with 7 additions and 10 deletions.
17 changes: 7 additions & 10 deletions mm/slub.c
Original file line number Diff line number Diff line change
Expand Up @@ -2902,18 +2902,14 @@ static void free_loc_track(struct loc_track *t)
get_order(sizeof(struct location) * t->max));
}

static int alloc_loc_track(struct loc_track *t, unsigned long max)
static int alloc_loc_track(struct loc_track *t, unsigned long max, gfp_t flags)
{
struct location *l;
int order;

if (!max)
max = PAGE_SIZE / sizeof(struct location);

order = get_order(sizeof(struct location) * max);

l = (void *)__get_free_pages(GFP_ATOMIC, order);

l = (void *)__get_free_pages(flags, order);
if (!l)
return 0;

Expand Down Expand Up @@ -2979,7 +2975,7 @@ static int add_location(struct loc_track *t, struct kmem_cache *s,
/*
* Not found. Insert new tracking element.
*/
if (t->count >= t->max && !alloc_loc_track(t, 2 * t->max))
if (t->count >= t->max && !alloc_loc_track(t, 2 * t->max, GFP_ATOMIC))
return 0;

l = t->loc + pos;
Expand Down Expand Up @@ -3022,11 +3018,12 @@ static int list_locations(struct kmem_cache *s, char *buf,
{
int n = 0;
unsigned long i;
struct loc_track t;
struct loc_track t = { 0, 0, NULL };
int node;

t.count = 0;
t.max = 0;
if (!alloc_loc_track(&t, PAGE_SIZE / sizeof(struct location),
GFP_KERNEL))
return sprintf(buf, "Out of memory\n");

/* Push back cpu slabs */
flush_all(s);
Expand Down

0 comments on commit 68dff6a

Please sign in to comment.