slub: enforce MAX_ORDER
slub_max_order may not be equal to or greater than MAX_ORDER. Additionally, if a single object cannot be placed in a slab of slub_max_order, it still must allocate slabs below MAX_ORDER. Acked-by: Christoph Lameter <cl@linux-foundation.org> Signed-off-by: David Rientjes <rientjes@google.com> Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
This commit is contained in:
parent
f4efdd65b7
commit
818cf59097
1 changed files with 2 additions and 1 deletions
|
@ -1909,7 +1909,7 @@ static inline int calculate_order(int size)
|
|||
* Doh this slab cannot be placed using slub_max_order.
|
||||
*/
|
||||
order = slab_order(size, 1, MAX_ORDER, 1);
|
||||
if (order <= MAX_ORDER)
|
||||
if (order < MAX_ORDER)
|
||||
return order;
|
||||
return -ENOSYS;
|
||||
}
|
||||
|
@ -2522,6 +2522,7 @@ __setup("slub_min_order=", setup_slub_min_order);
|
|||
static int __init setup_slub_max_order(char *str)
|
||||
{
|
||||
get_option(&str, &slub_max_order);
|
||||
slub_max_order = min(slub_max_order, MAX_ORDER - 1);
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue