- Allocate larger cache_cache if order 0 fails
PATCH 1/1 - Allocate larger cache_cache if order 0 fails
kmem_cache_init() incorrectly assumes that the cache_cache object will fit in an order 0 allocation. On very large systems, this is not true. Change the code to try larger order allocations if order 0 fails.
mm/slab.c +8 -3
@@ -1124,6 +1124,7 @@ void __init kmem_cache_init(void)struct cache_sizes *sizes;struct cache_names *names;int i; +int order;for (i =0 ; i <NUM_INIT_LISTS ; i++) {kmem_list3_init (&initkmem_list3[i]);
@@ -1167,11 +1168,15 @@ void __init kmem_cache_init(void) cache_cache.buffer_size =ALIGN (cache_cache.buffer_size,cache_line_size ()); -cache_estimate (0 , cache_cache.buffer_size,cache_line_size (),0 , - &left_over, &cache_cache.num); +for (order =0 ; order <MAX_ORDER ; order++) { +cache_estimate (order, cache_cache.buffer_size,cache_line_size (),0 , + &left_over, &cache_cache.num); +if (cache_cache.num) +break ; + }if (!cache_cache.num)BUG (); - + cache_cache.gfporder = order; cache_cache.colour = left_over / cache_cache.colour_off; cache_cache.slab_size =ALIGN (cache_cache.num *sizeof (kmem_bufctl_t) +sizeof (struct slab ),cache_line_size ());
Hi Jack,
mm/slab.c void __init kmem_cache_init(void) · line 1176
Quoted 8 lines · Jack Steiner
mm/slab.c +6
-2-cache_estimate (0 , cache_cache.buffer_size,cache_line_size (),0 , - &left_over, &cache_cache.num); +for (order =0 ; order <MAX_ORDER ; order++) { +cache_estimate (order, cache_cache.buffer_size,cache_line_size (),0 , + &left_over, &cache_cache.num); +if (cache_cache.num) +break ; + }
Any reason why you can't use calculate_slab_order() here?
Pekka
Quoted 12 lines · Pekka Enberg
Hi Jack,
mm/slab.c void __init kmem_cache_init(void) · line 1176
Quoted 8 lines · Jack Steiner
mm/slab.c +6
-2-cache_estimate (0 , cache_cache.buffer_size,cache_line_size (),0 , - &left_over, &cache_cache.num); +for (order =0 ; order <MAX_ORDER ; order++) { +cache_estimate (order, cache_cache.buffer_size,cache_line_size (),0 , + &left_over, &cache_cache.num); +if (cache_cache.num) +break ; + }
Quoted 3 lines
Any reason why you can't use
calculate_slab_order()here?Pekka
I think either will work & the amount of code is about the same.
I chose the above because it was easier to see that change had no effect on existing platforms.
Does anyone see a compelling reason for a different but equivalent implementation??
---
Jack
Quoted 1 line · Jack Steiner
Does anyone see a compelling reason for a different but equivalent implementation??
Less duplicate code?
Pekka