2020-07-22 10:25:56

by Jinyang He

[permalink] [raw]
Subject: [PATCH] MIPS: Fix unable to allocate memory for crashkernel

Use 0 as the align parameter in memblock_find_in_range() is
incorrect when we allocate memory for crashkernel. It's
finally used as by round_down(). Like this call tree:

mm/memblock.c

memblock_find_in_range
└── memblock_find_in_range_node
├── __memblock_find_range_bottom_up
│ └── round_down
└── __memblock_find_range_top_down
└── round_down

However, the round_down's second parameter must be a power of 2.
The author mean not align. So change it from 0 to 1.

Signed-off-by: Jinyang He <[email protected]>
---
arch/mips/kernel/setup.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c
index 7b537fa..588b212 100644
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -497,7 +497,7 @@ static void __init mips_parse_crashkernel(void)
if (ret != 0 || crash_size <= 0)
return;

- if (!memblock_find_in_range(crash_base, crash_base + crash_size, crash_size, 0)) {
+ if (!memblock_find_in_range(crash_base, crash_base + crash_size, crash_size, 1)) {
pr_warn("Invalid memory region reserved for crash kernel\n");
return;
}
--
2.1.0