Commit 94f3d3af authored by Vineet Gupta's avatar Vineet Gupta Committed by Linus Torvalds
Browse files

memblock: add assertion for zero allocation alignment

This came to light when calling memblock allocator from arc port (for
copying flattended DT).  If a "0" alignment is passed, the allocator
round_up() call incorrectly rounds up the size to 0.

round_up(num, alignto) => ((num - 1) | (alignto -1)) + 1

While the obvious allocation failure causes kernel to panic, it is better
to warn the caller to fix the code.

Tejun suggested that instead of BUG_ON(!align) - which might be
ineffective due to pending console init and such, it is better to WARN_ON,
and continue the boot with a reasonable default align.

Caller passing @size need not be handled similarly as the subsequent
panic will indicate that anyhow.

Signed-off-by: default avatarVineet Gupta <>
Cc: Yinghai Lu <>
Cc: Wanpeng Li <>
Cc: Ingo Molnar <>
Acked-by: default avatarTejun Heo <>
Signed-off-by: default avatarAndrew Morton <>
Signed-off-by: default avatarLinus Torvalds <>
parent 369a713e
......@@ -771,6 +771,9 @@ static phys_addr_t __init memblock_alloc_base_nid(phys_addr_t size,
phys_addr_t found;
if (WARN_ON(!align))
align = __alignof__(long long);
/* align @size to avoid excessive fragmentation on reserved array */
size = round_up(size, align);
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment