2017-06-16 16:16:05

by Jiri Bohac

Subject: [PATCH] x86: fix lower bound of crash kernel low reservation

Commit 0212f9159694 (x86: Add Crash kernel low reservation)
introduced reserve_crashkernel_low. This is used to reserve
crash kernel memory either if crashkernel=size,low is given
on the command line or if the region reserved by
reserve_crashkernel is entirely above 4G.

reserve_crashkernel_low tries to find a block of low_size bytes.
But there seems to be no good reason to restrict the lower bound
of the range to low_size.

Make memblock_find_in_range search from the start of memory.

Signed-off-by: Jiri Bohac <[email protected]>
---
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index f81823695014..65622f07e633 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -503,7 +503,7 @@ static int __init reserve_crashkernel_low(void)
return 0;
}

- low_base = memblock_find_in_range(low_size, 1ULL << 32, low_size, CRASH_ALIGN);
+ low_base = memblock_find_in_range(0, 1ULL << 32, low_size, CRASH_ALIGN);
if (!low_base) {
pr_err("Cannot reserve %ldMB crashkernel low memory, please try smaller size.\n",
(unsigned long)(low_size >> 20));

--
Jiri Bohac <[email protected]>
SUSE Labs, Prague, Czechia

2017-06-22 11:14:46

by tip-bot for Vasyl Gomonovych

Subject: [tip:x86/boot] x86/debug: Extend the lower bound of crash kernel low reservations

Commit-ID: fe2d48b805d01e14ddb8144de01de43171eb516f
Gitweb: http://git.kernel.org/tip/fe2d48b805d01e14ddb8144de01de43171eb516f
Author: Jiri Bohac <[email protected]>
AuthorDate: Fri, 16 Jun 2017 18:16:02 +0200
Committer: Ingo Molnar <[email protected]>
CommitDate: Thu, 22 Jun 2017 11:10:23 +0200

x86/debug: Extend the lower bound of crash kernel low reservations

The following change in 2013:

0212f9159694 ("x86: Add Crash kernel low reservation")

... introduced reserve_crashkernel_low(). This function is used to
reserve crash kernel memory either if crashkernel=size,low is given
on the command line or if the region reserved by reserve_crashkernel
is entirely above 4G.

reserve_crashkernel_low() tries to find a block of 'low_size' bytes.
But there seems to be no good reason to restrict the lower bound
of the range to 'low_size'.

Make memblock_find_in_range() search from the start of memory.

Signed-off-by: Jiri Bohac <[email protected]>
Cc: Eric Biederman <[email protected]>
Cc: H. Peter Anvin <[email protected]>
Cc: Kees Cook <[email protected]>
Cc: Linus Torvalds <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: Yinghai Lu <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Ingo Molnar <[email protected]>
---
arch/x86/kernel/setup.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 0b4d3c6..848d048 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -503,7 +503,7 @@ static int __init reserve_crashkernel_low(void)
return 0;
}

- low_base = memblock_find_in_range(low_size, 1ULL << 32, low_size, CRASH_ALIGN);
+ low_base = memblock_find_in_range(0, 1ULL << 32, low_size, CRASH_ALIGN);
if (!low_base) {
pr_err("Cannot reserve %ldMB crashkernel low memory, please try smaller size.\n",
(unsigned long)(low_size >> 20));