Skip to content

Commit

Permalink
slub: Determine gfpflags once and not every time a slab is allocated
Browse files Browse the repository at this point in the history
Currently we determine the gfp flags to pass to the page allocator
each time a slab is being allocated.

Determine the bits to be set at the time the slab is created. Store
in a new allocflags field and add the flags in allocate_slab().

Acked-by: Mel Gorman <mel@csn.ul.ie>
Reviewed-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Christoph Lameter <clameter@sgi.com>
  • Loading branch information
Christoph Lameter authored and Christoph Lameter committed Feb 14, 2008
1 parent dada123 commit b7a49f0
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 8 deletions.
1 change: 1 addition & 0 deletions include/linux/slub_def.h
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ struct kmem_cache {

/* Allocation and freeing of slabs */
int objects; /* Number of objects in slab */
gfp_t allocflags; /* gfp flags to use on each alloc */
int refcount; /* Refcount for slab cache destroy */
void (*ctor)(struct kmem_cache *, void *);
int inuse; /* Offset to metadata */
Expand Down
19 changes: 11 additions & 8 deletions mm/slub.c
Original file line number Diff line number Diff line change
Expand Up @@ -1078,14 +1078,7 @@ static struct page *allocate_slab(struct kmem_cache *s, gfp_t flags, int node)
struct page *page;
int pages = 1 << s->order;

if (s->order)
flags |= __GFP_COMP;

if (s->flags & SLAB_CACHE_DMA)
flags |= SLUB_DMA;

if (s->flags & SLAB_RECLAIM_ACCOUNT)
flags |= __GFP_RECLAIMABLE;
flags |= s->allocflags;

if (node == -1)
page = alloc_pages(flags, s->order);
Expand Down Expand Up @@ -2333,6 +2326,16 @@ static int calculate_sizes(struct kmem_cache *s)
if (s->order < 0)
return 0;

s->allocflags = 0;
if (s->order)
s->allocflags |= __GFP_COMP;

if (s->flags & SLAB_CACHE_DMA)
s->allocflags |= SLUB_DMA;

if (s->flags & SLAB_RECLAIM_ACCOUNT)
s->allocflags |= __GFP_RECLAIMABLE;

/*
* Determine the number of objects per slab
*/
Expand Down

0 comments on commit b7a49f0

Please sign in to comment.