* [PATCH 0/8] kdump: use generic functions to simplify crashkernel reservation in architectures
@ 2023-08-27 10:11 Baoquan He
2023-08-27 10:11 ` [PATCH 1/8] crash_core.c: remove unnecessary parameter of function Baoquan He
` (7 more replies)
0 siblings, 8 replies; 13+ messages in thread
From: Baoquan He @ 2023-08-27 10:11 UTC (permalink / raw)
To: linux-kernel
Cc: kexec, linux-arm-kernel, x86, linux-riscv, akpm, catalin.marinas,
thunder.leizhen, dyoung, prudo, Baoquan He
In the current arm64, crashkernel=,high support has been finished after
several rounds of posting and careful reviewing. The code in arm64 which
parses crashkernel kernel parameters firstly, then reserve memory can be
a good example for other ARCH to refer to.
Whereas in x86_64, the code mixing crashkernel parameter parsing and
memory reserving is twisted, and looks messy. Refactoring the code to
make it more readable maintainable is necessary.
Here, firstly abstract the crashkernel parameter parsing code into
parse_crashkernel() to make it be able to parse crashkernel=,high|low.
Then abstract the crashkernel memory reserving code into a generic
function reserve_crashkernel_generic(). Finally, in ARCH which
crashkernel=,high support is needed, a simple arch_reserve_crashkernel()
can be added to call above two functions. This can remove the duplicated
implmentation code in each ARCH, like arm64, x86_64.
I only change the arm64 and x86_64 implementation to make use of the
generic functions to simplify code. Risc-v can be done very easily refer
to the steps in arm64 and x86_64.
History:
- RFC patchset:
https://lore.kernel.org/all/20230619055951.45620-1-bhe@redhat.com/T/#u
[RFC PATCH 0/4] kdump: add generic functions to simplify crashkernel crashkernel in architecture
Dave and Philipp commented the old parse_crashkernel_common() and
parse_crashkernel_generic() are quite confusing. In this formal post,
I made change to address the concern by unifying all crashkernel
parsing into parse_crashkernel().
Baoquan He (8):
crash_core.c: remove unnecessary parameter of function
crash_core: change the prototype of function parse_crashkernel()
include/linux/kexec.h: move down crash_core.h including
crash_core: change parse_crashkernel() to support
crashkernel=,high|low parsing
crash_core: add generic function to do reservation
arm64: kdump: use generic interface to simplify crashkernel
reservation
x86: kdump: use generic interface to simplify crashkernel reservation
code
crash_core.c: remove unneeded functions
arch/arm/kernel/setup.c | 3 +-
arch/arm64/Kconfig | 3 +
arch/arm64/include/asm/kexec.h | 5 +
arch/arm64/mm/init.c | 140 ++--------------------
arch/ia64/kernel/setup.c | 2 +-
arch/loongarch/kernel/setup.c | 4 +-
arch/mips/kernel/setup.c | 3 +-
arch/powerpc/kernel/fadump.c | 2 +-
arch/powerpc/kexec/core.c | 2 +-
arch/powerpc/mm/nohash/kaslr_booke.c | 2 +-
arch/riscv/mm/init.c | 2 +-
arch/s390/kernel/setup.c | 4 +-
arch/sh/kernel/machine_kexec.c | 2 +-
arch/x86/Kconfig | 3 +
arch/x86/include/asm/kexec.h | 32 +++++
arch/x86/kernel/setup.c | 143 +++-------------------
include/linux/crash_core.h | 35 +++++-
include/linux/kexec.h | 14 +--
kernel/crash_core.c | 170 +++++++++++++++++++++++----
19 files changed, 266 insertions(+), 305 deletions(-)
--
2.41.0
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 1/8] crash_core.c: remove unnecessary parameter of function
2023-08-27 10:11 [PATCH 0/8] kdump: use generic functions to simplify crashkernel reservation in architectures Baoquan He
@ 2023-08-27 10:11 ` Baoquan He
2023-08-27 10:11 ` [PATCH 2/8] crash_core: change the prototype of function parse_crashkernel() Baoquan He
` (6 subsequent siblings)
7 siblings, 0 replies; 13+ messages in thread
From: Baoquan He @ 2023-08-27 10:11 UTC (permalink / raw)
To: linux-kernel
Cc: kexec, linux-arm-kernel, x86, linux-riscv, akpm, catalin.marinas,
thunder.leizhen, dyoung, prudo, Baoquan He
In all call sites of __parse_crashkernel(), the parameter 'name' is
hardcoded as "crashkernel=". So remove the unnecessary parameter 'name',
add local varibale 'name' inside __parse_crashkernel() instead.
Signed-off-by: Baoquan He <bhe@redhat.com>
---
kernel/crash_core.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/kernel/crash_core.c b/kernel/crash_core.c
index 90ce1dfd591c..f27b4e45d410 100644
--- a/kernel/crash_core.c
+++ b/kernel/crash_core.c
@@ -241,11 +241,11 @@ static int __init __parse_crashkernel(char *cmdline,
unsigned long long system_ram,
unsigned long long *crash_size,
unsigned long long *crash_base,
- const char *name,
const char *suffix)
{
char *first_colon, *first_space;
char *ck_cmdline;
+ char *name = "crashkernel=";
BUG_ON(!crash_size || !crash_base);
*crash_size = 0;
@@ -283,7 +283,7 @@ int __init parse_crashkernel(char *cmdline,
unsigned long long *crash_base)
{
return __parse_crashkernel(cmdline, system_ram, crash_size, crash_base,
- "crashkernel=", NULL);
+ NULL);
}
int __init parse_crashkernel_high(char *cmdline,
@@ -292,7 +292,7 @@ int __init parse_crashkernel_high(char *cmdline,
unsigned long long *crash_base)
{
return __parse_crashkernel(cmdline, system_ram, crash_size, crash_base,
- "crashkernel=", suffix_tbl[SUFFIX_HIGH]);
+ suffix_tbl[SUFFIX_HIGH]);
}
int __init parse_crashkernel_low(char *cmdline,
@@ -301,7 +301,7 @@ int __init parse_crashkernel_low(char *cmdline,
unsigned long long *crash_base)
{
return __parse_crashkernel(cmdline, system_ram, crash_size, crash_base,
- "crashkernel=", suffix_tbl[SUFFIX_LOW]);
+ suffix_tbl[SUFFIX_LOW]);
}
/*
--
2.41.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 2/8] crash_core: change the prototype of function parse_crashkernel()
2023-08-27 10:11 [PATCH 0/8] kdump: use generic functions to simplify crashkernel reservation in architectures Baoquan He
2023-08-27 10:11 ` [PATCH 1/8] crash_core.c: remove unnecessary parameter of function Baoquan He
@ 2023-08-27 10:11 ` Baoquan He
2023-08-27 10:11 ` [PATCH 3/8] include/linux/kexec.h: move down crash_core.h including Baoquan He
` (5 subsequent siblings)
7 siblings, 0 replies; 13+ messages in thread
From: Baoquan He @ 2023-08-27 10:11 UTC (permalink / raw)
To: linux-kernel
Cc: kexec, linux-arm-kernel, x86, linux-riscv, akpm, catalin.marinas,
thunder.leizhen, dyoung, prudo, Baoquan He
Add two parameters 'low_size' and 'high' to function parse_crashkernel(),
later crashkernel=,high|low parsing will be added. Make adjustments in all
call sites of parse_crashkernel() in arch.
Signed-off-by: Baoquan He <bhe@redhat.com>
---
arch/arm/kernel/setup.c | 3 ++-
arch/arm64/mm/init.c | 2 +-
arch/ia64/kernel/setup.c | 2 +-
arch/loongarch/kernel/setup.c | 4 +++-
arch/mips/kernel/setup.c | 3 ++-
arch/powerpc/kernel/fadump.c | 2 +-
arch/powerpc/kexec/core.c | 2 +-
arch/powerpc/mm/nohash/kaslr_booke.c | 2 +-
arch/riscv/mm/init.c | 2 +-
arch/s390/kernel/setup.c | 4 ++--
arch/sh/kernel/machine_kexec.c | 2 +-
arch/x86/kernel/setup.c | 3 ++-
include/linux/crash_core.h | 3 ++-
kernel/crash_core.c | 15 ++++++++++++---
14 files changed, 32 insertions(+), 17 deletions(-)
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index c66b560562b3..e2bb7afd0683 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -1010,7 +1010,8 @@ static void __init reserve_crashkernel(void)
total_mem = get_total_mem();
ret = parse_crashkernel(boot_command_line, total_mem,
- &crash_size, &crash_base);
+ &crash_size, &crash_base,
+ NULL, NULL);
/* invalid value specified or crashkernel=0 */
if (ret || !crash_size)
return;
diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
index d31c3a9290c5..36967b82c150 100644
--- a/arch/arm64/mm/init.c
+++ b/arch/arm64/mm/init.c
@@ -115,7 +115,7 @@ static void __init reserve_crashkernel(void)
/* crashkernel=X[@offset] */
ret = parse_crashkernel(cmdline, memblock_phys_mem_size(),
- &crash_size, &crash_base);
+ &crash_size, &crash_base, NULL, NULL);
if (ret == -ENOENT) {
ret = parse_crashkernel_high(cmdline, 0, &crash_size, &crash_base);
if (ret || !crash_size)
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
index 5a55ac82c13a..4faea2d2cf07 100644
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
@@ -277,7 +277,7 @@ static void __init setup_crashkernel(unsigned long total, int *n)
int ret;
ret = parse_crashkernel(boot_command_line, total,
- &size, &base);
+ &size, &base, NULL, NULL);
if (ret == 0 && size > 0) {
if (!base) {
sort_regions(rsvd_region, *n);
diff --git a/arch/loongarch/kernel/setup.c b/arch/loongarch/kernel/setup.c
index 9d830ab4e302..776a068d8718 100644
--- a/arch/loongarch/kernel/setup.c
+++ b/arch/loongarch/kernel/setup.c
@@ -267,7 +267,9 @@ static void __init arch_parse_crashkernel(void)
unsigned long long crash_base, crash_size;
total_mem = memblock_phys_mem_size();
- ret = parse_crashkernel(boot_command_line, total_mem, &crash_size, &crash_base);
+ ret = parse_crashkernel(boot_command_line, total_mem,
+ &crash_size, &crash_base,
+ NULL, NULL);
if (ret < 0 || crash_size <= 0)
return;
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c
index cb871eb784a7..08321c945ac4 100644
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -460,7 +460,8 @@ static void __init mips_parse_crashkernel(void)
total_mem = memblock_phys_mem_size();
ret = parse_crashkernel(boot_command_line, total_mem,
- &crash_size, &crash_base);
+ &crash_size, &crash_base,
+ NULL, NULL);
if (ret != 0 || crash_size <= 0)
return;
diff --git a/arch/powerpc/kernel/fadump.c b/arch/powerpc/kernel/fadump.c
index ea0a073abd96..7dbdeba56e74 100644
--- a/arch/powerpc/kernel/fadump.c
+++ b/arch/powerpc/kernel/fadump.c
@@ -313,7 +313,7 @@ static __init u64 fadump_calculate_reserve_size(void)
* memory at a predefined offset.
*/
ret = parse_crashkernel(boot_command_line, memblock_phys_mem_size(),
- &size, &base);
+ &size, &base, NULL, NULL);
if (ret == 0 && size > 0) {
unsigned long max_size;
diff --git a/arch/powerpc/kexec/core.c b/arch/powerpc/kexec/core.c
index de64c7962991..9346c960b296 100644
--- a/arch/powerpc/kexec/core.c
+++ b/arch/powerpc/kexec/core.c
@@ -109,7 +109,7 @@ void __init reserve_crashkernel(void)
total_mem_sz = memory_limit ? memory_limit : memblock_phys_mem_size();
/* use common parsing */
ret = parse_crashkernel(boot_command_line, total_mem_sz,
- &crash_size, &crash_base);
+ &crash_size, &crash_base, NULL, NULL);
if (ret == 0 && crash_size > 0) {
crashk_res.start = crash_base;
crashk_res.end = crash_base + crash_size - 1;
diff --git a/arch/powerpc/mm/nohash/kaslr_booke.c b/arch/powerpc/mm/nohash/kaslr_booke.c
index 2fb3edafe9ab..b4f2786a7d2b 100644
--- a/arch/powerpc/mm/nohash/kaslr_booke.c
+++ b/arch/powerpc/mm/nohash/kaslr_booke.c
@@ -178,7 +178,7 @@ static void __init get_crash_kernel(void *fdt, unsigned long size)
int ret;
ret = parse_crashkernel(boot_command_line, size, &crash_size,
- &crash_base);
+ &crash_base, NULL, NULL);
if (ret != 0 || crash_size == 0)
return;
if (crash_base == 0)
diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c
index e4c35ac2357f..a9ef0824f905 100644
--- a/arch/riscv/mm/init.c
+++ b/arch/riscv/mm/init.c
@@ -1332,7 +1332,7 @@ static void __init reserve_crashkernel(void)
}
ret = parse_crashkernel(boot_command_line, memblock_phys_mem_size(),
- &crash_size, &crash_base);
+ &crash_size, &crash_base, NULL, NULL);
if (ret || !crash_size)
return;
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index 00d76448319d..386a36181ceb 100644
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -625,8 +625,8 @@ static void __init reserve_crashkernel(void)
phys_addr_t low, high;
int rc;
- rc = parse_crashkernel(boot_command_line, ident_map_size, &crash_size,
- &crash_base);
+ rc = parse_crashkernel(boot_command_line, ident_map_size,
+ &crash_size, &crash_base, NULL, NULL);
crash_base = ALIGN(crash_base, KEXEC_CRASH_MEM_ALIGN);
crash_size = ALIGN(crash_size, KEXEC_CRASH_MEM_ALIGN);
diff --git a/arch/sh/kernel/machine_kexec.c b/arch/sh/kernel/machine_kexec.c
index 223c14f44af7..fa3a7b36190a 100644
--- a/arch/sh/kernel/machine_kexec.c
+++ b/arch/sh/kernel/machine_kexec.c
@@ -154,7 +154,7 @@ void __init reserve_crashkernel(void)
int ret;
ret = parse_crashkernel(boot_command_line, memblock_phys_mem_size(),
- &crash_size, &crash_base);
+ &crash_size, &crash_base, NULL, NULL);
if (ret == 0 && crash_size > 0) {
crashk_res.start = crash_base;
crashk_res.end = crash_base + crash_size - 1;
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index fd975a4a5200..382c66d2cf71 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -558,7 +558,8 @@ static void __init reserve_crashkernel(void)
total_mem = memblock_phys_mem_size();
/* crashkernel=XM */
- ret = parse_crashkernel(boot_command_line, total_mem, &crash_size, &crash_base);
+ ret = parse_crashkernel(boot_command_line, total_mem,
+ &crash_size, &crash_base, NULL, NULL);
if (ret != 0 || crash_size <= 0) {
/* crashkernel=X,high */
ret = parse_crashkernel_high(boot_command_line, total_mem,
diff --git a/include/linux/crash_core.h b/include/linux/crash_core.h
index de62a722431e..2e76289699ff 100644
--- a/include/linux/crash_core.h
+++ b/include/linux/crash_core.h
@@ -78,7 +78,8 @@ Elf_Word *append_elf_note(Elf_Word *buf, char *name, unsigned int type,
void final_note(Elf_Word *buf);
int __init parse_crashkernel(char *cmdline, unsigned long long system_ram,
- unsigned long long *crash_size, unsigned long long *crash_base);
+ unsigned long long *crash_size, unsigned long long *crash_base,
+ unsigned long long *low_size, bool *high);
int parse_crashkernel_high(char *cmdline, unsigned long long system_ram,
unsigned long long *crash_size, unsigned long long *crash_base);
int parse_crashkernel_low(char *cmdline, unsigned long long system_ram,
diff --git a/kernel/crash_core.c b/kernel/crash_core.c
index f27b4e45d410..f6a5c219e2e1 100644
--- a/kernel/crash_core.c
+++ b/kernel/crash_core.c
@@ -280,10 +280,19 @@ static int __init __parse_crashkernel(char *cmdline,
int __init parse_crashkernel(char *cmdline,
unsigned long long system_ram,
unsigned long long *crash_size,
- unsigned long long *crash_base)
+ unsigned long long *crash_base,
+ unsigned long long *low_size,
+ bool *high)
{
- return __parse_crashkernel(cmdline, system_ram, crash_size, crash_base,
- NULL);
+ int ret;
+
+ /* crashkernel=X[@offset] */
+ ret = __parse_crashkernel(cmdline, system_ram, crash_size,
+ crash_base, NULL);
+ if (!high)
+ return ret;
+
+ return 0;
}
int __init parse_crashkernel_high(char *cmdline,
--
2.41.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 3/8] include/linux/kexec.h: move down crash_core.h including
2023-08-27 10:11 [PATCH 0/8] kdump: use generic functions to simplify crashkernel reservation in architectures Baoquan He
2023-08-27 10:11 ` [PATCH 1/8] crash_core.c: remove unnecessary parameter of function Baoquan He
2023-08-27 10:11 ` [PATCH 2/8] crash_core: change the prototype of function parse_crashkernel() Baoquan He
@ 2023-08-27 10:11 ` Baoquan He
2023-08-27 10:11 ` [PATCH 4/8] crash_core: change parse_crashkernel() to support crashkernel=,high|low parsing Baoquan He
` (4 subsequent siblings)
7 siblings, 0 replies; 13+ messages in thread
From: Baoquan He @ 2023-08-27 10:11 UTC (permalink / raw)
To: linux-kernel
Cc: kexec, linux-arm-kernel, x86, linux-riscv, akpm, catalin.marinas,
thunder.leizhen, dyoung, prudo, Baoquan He
Later generic macros related to crash_core will be added into
<linux/crash_core.h>, and the corresponding arch specific macros will be
added to override them if needed. And Kconfig option KEXEC_CORE selects
CRASH_CORE. So move <linux/crash_core.h> including after <asm/kexec.h>.
And also move the crash_res|low_res and crash_notes delcarations after
<linux/crash_core.h> including because they are all defined in
kernel/kexec_core.c, and note_buf_t is definied in crash_core.h.
This is a preparation patch.
Signed-off-by: Baoquan He <bhe@redhat.com>
---
include/linux/kexec.h | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/include/linux/kexec.h b/include/linux/kexec.h
index 22b5cd24f581..8768fd9e2a66 100644
--- a/include/linux/kexec.h
+++ b/include/linux/kexec.h
@@ -15,25 +15,25 @@
#if !defined(__ASSEMBLY__)
-#include <linux/crash_core.h>
#include <asm/io.h>
#include <linux/range.h>
#include <uapi/linux/kexec.h>
#include <linux/verification.h>
-/* Location of a reserved region to hold the crash kernel.
- */
-extern struct resource crashk_res;
-extern struct resource crashk_low_res;
-extern note_buf_t __percpu *crash_notes;
-
#ifdef CONFIG_KEXEC_CORE
#include <linux/list.h>
#include <linux/compat.h>
#include <linux/ioport.h>
#include <linux/module.h>
#include <asm/kexec.h>
+#include <linux/crash_core.h>
+
+/* Location of a reserved region to hold the crash kernel.
+ */
+extern struct resource crashk_res;
+extern struct resource crashk_low_res;
+extern note_buf_t __percpu *crash_notes;
/* Verify architecture specific macros are defined */
--
2.41.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 4/8] crash_core: change parse_crashkernel() to support crashkernel=,high|low parsing
2023-08-27 10:11 [PATCH 0/8] kdump: use generic functions to simplify crashkernel reservation in architectures Baoquan He
` (2 preceding siblings ...)
2023-08-27 10:11 ` [PATCH 3/8] include/linux/kexec.h: move down crash_core.h including Baoquan He
@ 2023-08-27 10:11 ` Baoquan He
2023-08-27 10:11 ` [PATCH 5/8] crash_core: add generic function to do reservation Baoquan He
` (3 subsequent siblings)
7 siblings, 0 replies; 13+ messages in thread
From: Baoquan He @ 2023-08-27 10:11 UTC (permalink / raw)
To: linux-kernel
Cc: kexec, linux-arm-kernel, x86, linux-riscv, akpm, catalin.marinas,
thunder.leizhen, dyoung, prudo, Baoquan He
Now parse_crashkernel() is a real entry point for all kinds of
crahskernel parsing on any architecture.
And wrap the crahskernel=,high|low handling inside
CONFIG_ARCH_HAS_GENERIC_CRASHKERNEL_RESERVATION ifdeffery scope.
Signed-off-by: Baoquan He <bhe@redhat.com>
---
include/linux/crash_core.h | 6 ++++++
kernel/crash_core.c | 28 +++++++++++++++++++++++++++-
2 files changed, 33 insertions(+), 1 deletion(-)
diff --git a/include/linux/crash_core.h b/include/linux/crash_core.h
index 2e76289699ff..85260bf4a734 100644
--- a/include/linux/crash_core.h
+++ b/include/linux/crash_core.h
@@ -77,6 +77,12 @@ Elf_Word *append_elf_note(Elf_Word *buf, char *name, unsigned int type,
void *data, size_t data_len);
void final_note(Elf_Word *buf);
+#ifdef CONFIG_ARCH_HAS_GENERIC_CRASHKERNEL_RESERVATION
+#ifndef DEFAULT_CRASH_KERNEL_LOW_SIZE
+#define DEFAULT_CRASH_KERNEL_LOW_SIZE (128UL << 20)
+#endif
+#endif
+
int __init parse_crashkernel(char *cmdline, unsigned long long system_ram,
unsigned long long *crash_size, unsigned long long *crash_base,
unsigned long long *low_size, bool *high);
diff --git a/kernel/crash_core.c b/kernel/crash_core.c
index f6a5c219e2e1..355b0ab5189c 100644
--- a/kernel/crash_core.c
+++ b/kernel/crash_core.c
@@ -276,6 +276,9 @@ static int __init __parse_crashkernel(char *cmdline,
/*
* That function is the entry point for command line parsing and should be
* called from the arch-specific code.
+ *
+ * If crashkernel=,high|low is supported on architecture, non-NULL values
+ * should be passed to parameters 'low_size' and 'high'.
*/
int __init parse_crashkernel(char *cmdline,
unsigned long long system_ram,
@@ -291,7 +294,30 @@ int __init parse_crashkernel(char *cmdline,
crash_base, NULL);
if (!high)
return ret;
-
+#ifdef CONFIG_ARCH_HAS_GENERIC_CRASHKERNEL_RESERVATION
+ else if (ret == -ENOENT) {
+ ret = __parse_crashkernel(cmdline, 0, crash_size,
+ crash_base, suffix_tbl[SUFFIX_HIGH]);
+ if (ret || !*crash_size)
+ return -1;
+
+ /*
+ * crashkernel=Y,low can be specified or not, but invalid value
+ * is not allowed.
+ */
+ ret = __parse_crashkernel(cmdline, 0, low_size,
+ crash_base, suffix_tbl[SUFFIX_LOW]);
+ if (ret == -ENOENT)
+ *low_size = DEFAULT_CRASH_KERNEL_LOW_SIZE;
+ else if (ret)
+ return -1;
+
+ *high = true;
+ } else if (ret || !*crash_size) {
+ /* The specified value is invalid */
+ return -1;
+ }
+#endif
return 0;
}
--
2.41.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 5/8] crash_core: add generic function to do reservation
2023-08-27 10:11 [PATCH 0/8] kdump: use generic functions to simplify crashkernel reservation in architectures Baoquan He
` (3 preceding siblings ...)
2023-08-27 10:11 ` [PATCH 4/8] crash_core: change parse_crashkernel() to support crashkernel=,high|low parsing Baoquan He
@ 2023-08-27 10:11 ` Baoquan He
2023-08-27 13:53 ` kernel test robot
2023-08-27 10:11 ` [PATCH 6/8] arm64: kdump: use generic interface to simplify crashkernel reservation Baoquan He
` (2 subsequent siblings)
7 siblings, 1 reply; 13+ messages in thread
From: Baoquan He @ 2023-08-27 10:11 UTC (permalink / raw)
To: linux-kernel
Cc: kexec, linux-arm-kernel, x86, linux-riscv, akpm, catalin.marinas,
thunder.leizhen, dyoung, prudo, Baoquan He
In architecture like x86_64, arm64 and riscv, they have vast virtual
address space and usually have huge physical memory RAM. Their
crashkernel reservation doesn't have to be limited under 4G RAM,
but can be extended to the whole physical memory via crashkernel=,high
support.
Now add function reserve_crashkernel_generic() to reserve crashkernel
memory if users specify any case of kernel pamameters, like
crashkernel=xM[@offset] or crashkernel=,high|low.
This is preparation to simplify code of crashkernel=,high support
in architecutures.
Signed-off-by: Baoquan He <bhe@redhat.com>
---
include/linux/crash_core.h | 34 ++++++++++--
kernel/crash_core.c | 109 ++++++++++++++++++++++++++++++++++++-
2 files changed, 136 insertions(+), 7 deletions(-)
diff --git a/include/linux/crash_core.h b/include/linux/crash_core.h
index 85260bf4a734..2f732493e922 100644
--- a/include/linux/crash_core.h
+++ b/include/linux/crash_core.h
@@ -77,12 +77,6 @@ Elf_Word *append_elf_note(Elf_Word *buf, char *name, unsigned int type,
void *data, size_t data_len);
void final_note(Elf_Word *buf);
-#ifdef CONFIG_ARCH_HAS_GENERIC_CRASHKERNEL_RESERVATION
-#ifndef DEFAULT_CRASH_KERNEL_LOW_SIZE
-#define DEFAULT_CRASH_KERNEL_LOW_SIZE (128UL << 20)
-#endif
-#endif
-
int __init parse_crashkernel(char *cmdline, unsigned long long system_ram,
unsigned long long *crash_size, unsigned long long *crash_base,
unsigned long long *low_size, bool *high);
@@ -91,4 +85,32 @@ int parse_crashkernel_high(char *cmdline, unsigned long long system_ram,
int parse_crashkernel_low(char *cmdline, unsigned long long system_ram,
unsigned long long *crash_size, unsigned long long *crash_base);
+#ifdef CONFIG_ARCH_HAS_GENERIC_CRASHKERNEL_RESERVATION
+#ifndef DEFAULT_CRASH_KERNEL_LOW_SIZE
+#define DEFAULT_CRASH_KERNEL_LOW_SIZE (128UL << 20)
+#endif
+#ifndef CRASH_ALIGN
+#define CRASH_ALIGN SZ_2M
+#endif
+#ifndef CRASH_ADDR_LOW_MAX
+#define CRASH_ADDR_LOW_MAX SZ_4G
+#endif
+#ifndef CRASH_ADDR_HIGH_MAX
+#define CRASH_ADDR_HIGH_MAX memblock_end_of_DRAM()
+#endif
+
+void __init reserve_crashkernel_generic(char *cmdline,
+ unsigned long long crash_size,
+ unsigned long long crash_base,
+ unsigned long long crash_low_size,
+ bool high);
+#else
+static inline void __init reserve_crashkernel_generic(char *cmdline,
+ unsigned long long crash_size,
+ unsigned long long crash_base,
+ unsigned long long crash_low_size,
+ bool high)
+{}
+#endif
+
#endif /* LINUX_CRASH_CORE_H */
diff --git a/kernel/crash_core.c b/kernel/crash_core.c
index 355b0ab5189c..6bc00cc390b5 100644
--- a/kernel/crash_core.c
+++ b/kernel/crash_core.c
@@ -5,11 +5,13 @@
*/
#include <linux/buildid.h>
-#include <linux/crash_core.h>
#include <linux/init.h>
#include <linux/utsname.h>
#include <linux/vmalloc.h>
#include <linux/sizes.h>
+#include <linux/memblock.h>
+#include <linux/kexec.h>
+#include <linux/kmemleak.h>
#include <asm/page.h>
#include <asm/sections.h>
@@ -349,6 +351,111 @@ static int __init parse_crashkernel_dummy(char *arg)
}
early_param("crashkernel", parse_crashkernel_dummy);
+#ifdef CONFIG_ARCH_HAS_GENERIC_CRASHKERNEL_RESERVATION
+static int __init reserve_crashkernel_low(unsigned long long low_size)
+{
+#ifdef CONFIG_64BIT
+ unsigned long long low_base;
+
+ low_base = memblock_phys_alloc_range(low_size, CRASH_ALIGN, 0, CRASH_ADDR_LOW_MAX);
+ if (!low_base) {
+ pr_err("cannot allocate crashkernel low memory (size:0x%llx).\n", low_size);
+ return -ENOMEM;
+ }
+
+ pr_info("crashkernel low memory reserved: 0x%08llx - 0x%08llx (%lld MB)\n",
+ low_base, low_base + low_size, low_size >> 20);
+
+ crashk_low_res.start = low_base;
+ crashk_low_res.end = low_base + low_size - 1;
+ insert_resource(&iomem_resource, &crashk_low_res);
+#endif
+ return 0;
+}
+
+void __init reserve_crashkernel_generic(char *cmdline,
+ unsigned long long crash_size,
+ unsigned long long crash_base,
+ unsigned long long crash_low_size,
+ bool high)
+{
+ unsigned long long search_end = CRASH_ADDR_LOW_MAX, search_base = 0;
+ bool fixed_base = false;
+
+ /* User specifies base address explicitly. */
+ if (crash_base) {
+ fixed_base = true;
+ search_base = crash_base;
+ search_end = crash_base + crash_size;
+ }
+
+ if (high) {
+ search_base = CRASH_ADDR_LOW_MAX;
+ search_end = CRASH_ADDR_HIGH_MAX;
+ }
+
+retry:
+ crash_base = memblock_phys_alloc_range(crash_size, CRASH_ALIGN,
+ search_base, search_end);
+ if (!crash_base) {
+ /*
+ * For crashkernel=size[KMG]@offset[KMG], print out failure
+ * message if can't reserve the specified region.
+ */
+ if (fixed_base) {
+ pr_warn("crashkernel reservation failed - memory is in use.\n");
+ return;
+ }
+
+ /*
+ * For crashkernel=size[KMG], if the first attempt was for
+ * low memory, fall back to high memory, the minimum required
+ * low memory will be reserved later.
+ */
+ if (!high && search_end == CRASH_ADDR_LOW_MAX) {
+ search_end = CRASH_ADDR_HIGH_MAX;
+ search_base = CRASH_ADDR_LOW_MAX;
+ crash_low_size = DEFAULT_CRASH_KERNEL_LOW_SIZE;
+ goto retry;
+ }
+
+ /*
+ * For crashkernel=size[KMG],high, if the first attempt was
+ * for high memory, fall back to low memory.
+ */
+ if (high && search_end == CRASH_ADDR_HIGH_MAX) {
+ search_end = CRASH_ADDR_LOW_MAX;
+ search_base = 0;
+ goto retry;
+ }
+ pr_warn("cannot allocate crashkernel (size:0x%llx)\n",
+ crash_size);
+ return;
+ }
+
+ if ((crash_base > CRASH_ADDR_LOW_MAX) &&
+ crash_low_size && reserve_crashkernel_low(crash_low_size)) {
+ memblock_phys_free(crash_base, crash_size);
+ return;
+ }
+
+ pr_info("crashkernel reserved: 0x%016llx - 0x%016llx (%lld MB)\n",
+ crash_base, crash_base + crash_size, crash_size >> 20);
+
+ /*
+ * The crashkernel memory will be removed from the kernel linear
+ * map. Inform kmemleak so that it won't try to access it.
+ */
+ kmemleak_ignore_phys(crash_base);
+ if (crashk_low_res.end)
+ kmemleak_ignore_phys(crashk_low_res.start);
+
+ crashk_res.start = crash_base;
+ crashk_res.end = crash_base + crash_size - 1;
+ insert_resource(&iomem_resource, &crashk_res);
+}
+#endif
+
Elf_Word *append_elf_note(Elf_Word *buf, char *name, unsigned int type,
void *data, size_t data_len)
{
--
2.41.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 6/8] arm64: kdump: use generic interface to simplify crashkernel reservation
2023-08-27 10:11 [PATCH 0/8] kdump: use generic functions to simplify crashkernel reservation in architectures Baoquan He
` (4 preceding siblings ...)
2023-08-27 10:11 ` [PATCH 5/8] crash_core: add generic function to do reservation Baoquan He
@ 2023-08-27 10:11 ` Baoquan He
2023-08-27 10:11 ` [PATCH 7/8] x86: kdump: use generic interface to simplify crashkernel reservation code Baoquan He
2023-08-27 10:11 ` [PATCH 8/8] crash_core.c: remove unneeded functions Baoquan He
7 siblings, 0 replies; 13+ messages in thread
From: Baoquan He @ 2023-08-27 10:11 UTC (permalink / raw)
To: linux-kernel
Cc: kexec, linux-arm-kernel, x86, linux-riscv, akpm, catalin.marinas,
thunder.leizhen, dyoung, prudo, Baoquan He
With the help of newly changed function parse_crashkernel() and
generic reserve_crashkernel_generic(), crashkernel reservation can be
simplified by steps:
1) Provide CRASH_ALIGN, CRASH_ADDR_LOW_MAX, CRASH_ADDR_HIGH_MAX and
DEFAULT_CRASH_KERNEL_LOW_SIZE in <asm/kexec.h>;
2) Add arch_reserve_crashkernel() to call parse_crashkernel() and
reserve_crashkernel_generic();
3) Add ARCH_HAS_GENERIC_CRASHKERNEL_RESERVATION Kconfig in
arch/arm64/Kconfig.
The old reserve_crashkernel_low() and reserve_crashkernel() can be
removed.
Signed-off-by: Baoquan He <bhe@redhat.com>
---
arch/arm64/Kconfig | 3 +
arch/arm64/include/asm/kexec.h | 5 ++
arch/arm64/mm/init.c | 140 ++-------------------------------
3 files changed, 16 insertions(+), 132 deletions(-)
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index a2511b30d0f6..6739e7b456b9 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -1481,6 +1481,9 @@ config KEXEC_FILE
for kernel and initramfs as opposed to list of segments as
accepted by previous system call.
+config ARCH_HAS_GENERIC_CRASHKERNEL_RESERVATION
+ def_bool CRASH_CORE
+
config KEXEC_SIG
bool "Verify kernel signature during kexec_file_load() syscall"
depends on KEXEC_FILE
diff --git a/arch/arm64/include/asm/kexec.h b/arch/arm64/include/asm/kexec.h
index 9ac9572a3bbe..442fc13588a2 100644
--- a/arch/arm64/include/asm/kexec.h
+++ b/arch/arm64/include/asm/kexec.h
@@ -132,4 +132,9 @@ extern int load_other_segments(struct kimage *image,
#endif /* __ASSEMBLY__ */
+/* Current arm64 boot protocol requires 2MB alignment */
+#define CRASH_ALIGN SZ_2M
+
+#define CRASH_ADDR_LOW_MAX arm64_dma_phys_limit
+#define CRASH_ADDR_HIGH_MAX (PHYS_MASK + 1)
#endif
diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
index 36967b82c150..2e63954a2574 100644
--- a/arch/arm64/mm/init.c
+++ b/arch/arm64/mm/init.c
@@ -64,149 +64,25 @@ EXPORT_SYMBOL(memstart_addr);
*/
phys_addr_t __ro_after_init arm64_dma_phys_limit;
-/* Current arm64 boot protocol requires 2MB alignment */
-#define CRASH_ALIGN SZ_2M
-
-#define CRASH_ADDR_LOW_MAX arm64_dma_phys_limit
-#define CRASH_ADDR_HIGH_MAX (PHYS_MASK + 1)
-#define CRASH_HIGH_SEARCH_BASE SZ_4G
-
-#define DEFAULT_CRASH_KERNEL_LOW_SIZE (128UL << 20)
-
-static int __init reserve_crashkernel_low(unsigned long long low_size)
-{
- unsigned long long low_base;
-
- low_base = memblock_phys_alloc_range(low_size, CRASH_ALIGN, 0, CRASH_ADDR_LOW_MAX);
- if (!low_base) {
- pr_err("cannot allocate crashkernel low memory (size:0x%llx).\n", low_size);
- return -ENOMEM;
- }
-
- pr_info("crashkernel low memory reserved: 0x%08llx - 0x%08llx (%lld MB)\n",
- low_base, low_base + low_size, low_size >> 20);
-
- crashk_low_res.start = low_base;
- crashk_low_res.end = low_base + low_size - 1;
- insert_resource(&iomem_resource, &crashk_low_res);
-
- return 0;
-}
-
-/*
- * reserve_crashkernel() - reserves memory for crash kernel
- *
- * This function reserves memory area given in "crashkernel=" kernel command
- * line parameter. The memory reserved is used by dump capture kernel when
- * primary kernel is crashing.
- */
-static void __init reserve_crashkernel(void)
+static void __init arch_reserve_crashkernel(void)
{
- unsigned long long crash_low_size = 0, search_base = 0;
- unsigned long long crash_max = CRASH_ADDR_LOW_MAX;
+ unsigned long long low_size = 0;
unsigned long long crash_base, crash_size;
char *cmdline = boot_command_line;
- bool fixed_base = false;
bool high = false;
int ret;
if (!IS_ENABLED(CONFIG_KEXEC_CORE))
return;
- /* crashkernel=X[@offset] */
ret = parse_crashkernel(cmdline, memblock_phys_mem_size(),
- &crash_size, &crash_base, NULL, NULL);
- if (ret == -ENOENT) {
- ret = parse_crashkernel_high(cmdline, 0, &crash_size, &crash_base);
- if (ret || !crash_size)
- return;
-
- /*
- * crashkernel=Y,low can be specified or not, but invalid value
- * is not allowed.
- */
- ret = parse_crashkernel_low(cmdline, 0, &crash_low_size, &crash_base);
- if (ret == -ENOENT)
- crash_low_size = DEFAULT_CRASH_KERNEL_LOW_SIZE;
- else if (ret)
- return;
-
- search_base = CRASH_HIGH_SEARCH_BASE;
- crash_max = CRASH_ADDR_HIGH_MAX;
- high = true;
- } else if (ret || !crash_size) {
- /* The specified value is invalid */
+ &crash_size, &crash_base,
+ &low_size, &high);
+ if (ret)
return;
- }
-
- crash_size = PAGE_ALIGN(crash_size);
-
- /* User specifies base address explicitly. */
- if (crash_base) {
- fixed_base = true;
- search_base = crash_base;
- crash_max = crash_base + crash_size;
- }
-
-retry:
- crash_base = memblock_phys_alloc_range(crash_size, CRASH_ALIGN,
- search_base, crash_max);
- if (!crash_base) {
- /*
- * For crashkernel=size[KMG]@offset[KMG], print out failure
- * message if can't reserve the specified region.
- */
- if (fixed_base) {
- pr_warn("crashkernel reservation failed - memory is in use.\n");
- return;
- }
-
- /*
- * For crashkernel=size[KMG], if the first attempt was for
- * low memory, fall back to high memory, the minimum required
- * low memory will be reserved later.
- */
- if (!high && crash_max == CRASH_ADDR_LOW_MAX) {
- crash_max = CRASH_ADDR_HIGH_MAX;
- search_base = CRASH_ADDR_LOW_MAX;
- crash_low_size = DEFAULT_CRASH_KERNEL_LOW_SIZE;
- goto retry;
- }
-
- /*
- * For crashkernel=size[KMG],high, if the first attempt was
- * for high memory, fall back to low memory.
- */
- if (high && crash_max == CRASH_ADDR_HIGH_MAX) {
- crash_max = CRASH_ADDR_LOW_MAX;
- search_base = 0;
- goto retry;
- }
- pr_warn("cannot allocate crashkernel (size:0x%llx)\n",
- crash_size);
- return;
- }
-
- if ((crash_base >= CRASH_ADDR_LOW_MAX) && crash_low_size &&
- reserve_crashkernel_low(crash_low_size)) {
- memblock_phys_free(crash_base, crash_size);
- return;
- }
-
- pr_info("crashkernel reserved: 0x%016llx - 0x%016llx (%lld MB)\n",
- crash_base, crash_base + crash_size, crash_size >> 20);
-
- /*
- * The crashkernel memory will be removed from the kernel linear
- * map. Inform kmemleak so that it won't try to access it.
- */
- kmemleak_ignore_phys(crash_base);
- if (crashk_low_res.end)
- kmemleak_ignore_phys(crashk_low_res.start);
- crashk_res.start = crash_base;
- crashk_res.end = crash_base + crash_size - 1;
- insert_resource(&iomem_resource, &crashk_res);
+ reserve_crashkernel_generic(cmdline, crash_size, crash_base,
+ low_size, high);
}
/*
@@ -454,7 +330,7 @@ void __init bootmem_init(void)
* request_standard_resources() depends on crashkernel's memory being
* reserved, so do it here.
*/
- reserve_crashkernel();
+ arch_reserve_crashkernel();
memblock_dump_all();
}
--
2.41.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 7/8] x86: kdump: use generic interface to simplify crashkernel reservation code
2023-08-27 10:11 [PATCH 0/8] kdump: use generic functions to simplify crashkernel reservation in architectures Baoquan He
` (5 preceding siblings ...)
2023-08-27 10:11 ` [PATCH 6/8] arm64: kdump: use generic interface to simplify crashkernel reservation Baoquan He
@ 2023-08-27 10:11 ` Baoquan He
2023-08-27 10:11 ` [PATCH 8/8] crash_core.c: remove unneeded functions Baoquan He
7 siblings, 0 replies; 13+ messages in thread
From: Baoquan He @ 2023-08-27 10:11 UTC (permalink / raw)
To: linux-kernel
Cc: kexec, linux-arm-kernel, x86, linux-riscv, akpm, catalin.marinas,
thunder.leizhen, dyoung, prudo, Baoquan He
With the help of newly changed function parse_crashkernel() and
generic reserve_crashkernel_generic(), crashkernel reservation can be
simplified by steps:
1) Provide CRASH_ALIGN, CRASH_ADDR_LOW_MAX, CRASH_ADDR_HIGH_MAX and
DEFAULT_CRASH_KERNEL_LOW_SIZE in <asm/kexec.h>;
2) Add arch_reserve_crashkernel() to call parse_crashkernel() and
reserve_crashkernel_generic(), and do the ARCH specific work if
needed.
3) Add ARCH_HAS_GENERIC_CRASHKERNEL_RESERVATION Kconfig in
arch/x86/Kconfig.
When adding DEFAULT_CRASH_KERNEL_LOW_SIZE, add crash_low_size_default()
to calculate crashkernel low memory because x86_64 has special
requirement.
The old reserve_crashkernel_low() and reserve_crashkernel() can be
removed.
Signed-off-by: Baoquan He <bhe@redhat.com>
---
arch/x86/Kconfig | 3 +
arch/x86/include/asm/kexec.h | 32 ++++++++
arch/x86/kernel/setup.c | 144 ++++-------------------------------
3 files changed, 51 insertions(+), 128 deletions(-)
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index e36261b4ea14..31515b3ef55b 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -2073,6 +2073,9 @@ config KEXEC_FILE
config ARCH_HAS_KEXEC_PURGATORY
def_bool KEXEC_FILE
+config ARCH_HAS_GENERIC_CRASHKERNEL_RESERVATION
+ def_bool CRASH_CORE
+
config KEXEC_SIG
bool "Verify kernel signature during kexec_file_load() syscall"
depends on KEXEC_FILE
diff --git a/arch/x86/include/asm/kexec.h b/arch/x86/include/asm/kexec.h
index 5b77bbc28f96..84a7d1f6f153 100644
--- a/arch/x86/include/asm/kexec.h
+++ b/arch/x86/include/asm/kexec.h
@@ -66,6 +66,37 @@ struct kimage;
# define KEXEC_ARCH KEXEC_ARCH_X86_64
#endif
+/*
+ * --------- Crashkernel reservation ------------------------------
+ */
+
+/* 16M alignment for crash kernel regions */
+#define CRASH_ALIGN SZ_16M
+
+/*
+ * Keep the crash kernel below this limit.
+ *
+ * Earlier 32-bits kernels would limit the kernel to the low 512 MB range
+ * due to mapping restrictions.
+ *
+ * 64-bit kdump kernels need to be restricted to be under 64 TB, which is
+ * the upper limit of system RAM in 4-level paging mode. Since the kdump
+ * jump could be from 5-level paging to 4-level paging, the jump will fail if
+ * the kernel is put above 64 TB, and during the 1st kernel bootup there's
+ * no good way to detect the paging mode of the target kernel which will be
+ * loaded for dumping.
+ */
+
+#ifdef CONFIG_X86_32
+# define CRASH_ADDR_LOW_MAX SZ_512M
+# define CRASH_ADDR_HIGH_MAX SZ_512M
+#else
+# define CRASH_ADDR_LOW_MAX SZ_4G
+# define CRASH_ADDR_HIGH_MAX SZ_64T
+#endif
+
+# define DEFAULT_CRASH_KERNEL_LOW_SIZE crash_low_size_default()
+
/*
* This function is responsible for capturing register states if coming
* via panic otherwise just fix up the ss and sp if coming via kernel
@@ -209,6 +240,7 @@ typedef void crash_vmclear_fn(void);
extern crash_vmclear_fn __rcu *crash_vmclear_loaded_vmcss;
extern void kdump_nmi_shootdown_cpus(void);
+extern unsigned long crash_low_size_default(void);
#endif /* __ASSEMBLY__ */
#endif /* _ASM_X86_KEXEC_H */
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 382c66d2cf71..559a5c4141db 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -474,152 +474,40 @@ static void __init memblock_x86_reserve_range_setup_data(void)
/*
* --------- Crashkernel reservation ------------------------------
*/
-
-/* 16M alignment for crash kernel regions */
-#define CRASH_ALIGN SZ_16M
-
-/*
- * Keep the crash kernel below this limit.
- *
- * Earlier 32-bits kernels would limit the kernel to the low 512 MB range
- * due to mapping restrictions.
- *
- * 64-bit kdump kernels need to be restricted to be under 64 TB, which is
- * the upper limit of system RAM in 4-level paging mode. Since the kdump
- * jump could be from 5-level paging to 4-level paging, the jump will fail if
- * the kernel is put above 64 TB, and during the 1st kernel bootup there's
- * no good way to detect the paging mode of the target kernel which will be
- * loaded for dumping.
- */
-#ifdef CONFIG_X86_32
-# define CRASH_ADDR_LOW_MAX SZ_512M
-# define CRASH_ADDR_HIGH_MAX SZ_512M
-#else
-# define CRASH_ADDR_LOW_MAX SZ_4G
-# define CRASH_ADDR_HIGH_MAX SZ_64T
-#endif
-
-static int __init reserve_crashkernel_low(void)
+unsigned long crash_low_size_default(void)
{
#ifdef CONFIG_X86_64
- unsigned long long base, low_base = 0, low_size = 0;
- unsigned long low_mem_limit;
- int ret;
-
- low_mem_limit = min(memblock_phys_mem_size(), CRASH_ADDR_LOW_MAX);
-
- /* crashkernel=Y,low */
- ret = parse_crashkernel_low(boot_command_line, low_mem_limit, &low_size, &base);
- if (ret) {
- /*
- * two parts from kernel/dma/swiotlb.c:
- * -swiotlb size: user-specified with swiotlb= or default.
- *
- * -swiotlb overflow buffer: now hardcoded to 32k. We round it
- * to 8M for other buffers that may need to stay low too. Also
- * make sure we allocate enough extra low memory so that we
- * don't run out of DMA buffers for 32-bit devices.
- */
- low_size = max(swiotlb_size_or_default() + (8UL << 20), 256UL << 20);
- } else {
- /* passed with crashkernel=0,low ? */
- if (!low_size)
- return 0;
- }
-
- low_base = memblock_phys_alloc_range(low_size, CRASH_ALIGN, 0, CRASH_ADDR_LOW_MAX);
- if (!low_base) {
- pr_err("Cannot reserve %ldMB crashkernel low memory, please try smaller size.\n",
- (unsigned long)(low_size >> 20));
- return -ENOMEM;
- }
-
- pr_info("Reserving %ldMB of low memory at %ldMB for crashkernel (low RAM limit: %ldMB)\n",
- (unsigned long)(low_size >> 20),
- (unsigned long)(low_base >> 20),
- (unsigned long)(low_mem_limit >> 20));
-
- crashk_low_res.start = low_base;
- crashk_low_res.end = low_base + low_size - 1;
- insert_resource(&iomem_resource, &crashk_low_res);
-#endif
+ return max(swiotlb_size_or_default() + (8UL << 20), 256UL << 20);
+#else
return 0;
+#endif
}
-static void __init reserve_crashkernel(void)
+static void __init arch_reserve_crashkernel(void)
{
- unsigned long long crash_size, crash_base, total_mem;
+ unsigned long long crash_base, crash_size, low_size = 0;
+ char *cmdline = boot_command_line;
bool high = false;
int ret;
if (!IS_ENABLED(CONFIG_KEXEC_CORE))
return;
- total_mem = memblock_phys_mem_size();
-
- /* crashkernel=XM */
- ret = parse_crashkernel(boot_command_line, total_mem,
- &crash_size, &crash_base, NULL, NULL);
- if (ret != 0 || crash_size <= 0) {
- /* crashkernel=X,high */
- ret = parse_crashkernel_high(boot_command_line, total_mem,
- &crash_size, &crash_base);
- if (ret != 0 || crash_size <= 0)
- return;
- high = true;
- }
+ ret = parse_crashkernel(cmdline, memblock_phys_mem_size(),
+ &crash_size, &crash_base,
+ &low_size, &high);
+ if (ret)
+ return;
if (xen_pv_domain()) {
pr_info("Ignoring crashkernel for a Xen PV domain\n");
return;
}
- /* 0 means: find the address automatically */
- if (!crash_base) {
- /*
- * Set CRASH_ADDR_LOW_MAX upper bound for crash memory,
- * crashkernel=x,high reserves memory over 4G, also allocates
- * 256M extra low memory for DMA buffers and swiotlb.
- * But the extra memory is not required for all machines.
- * So try low memory first and fall back to high memory
- * unless "crashkernel=size[KMG],high" is specified.
- */
- if (!high)
- crash_base = memblock_phys_alloc_range(crash_size,
- CRASH_ALIGN, CRASH_ALIGN,
- CRASH_ADDR_LOW_MAX);
- if (!crash_base)
- crash_base = memblock_phys_alloc_range(crash_size,
- CRASH_ALIGN, CRASH_ALIGN,
- CRASH_ADDR_HIGH_MAX);
- if (!crash_base) {
- pr_info("crashkernel reservation failed - No suitable area found.\n");
- return;
- }
- } else {
- unsigned long long start;
-
- start = memblock_phys_alloc_range(crash_size, SZ_1M, crash_base,
- crash_base + crash_size);
- if (start != crash_base) {
- pr_info("crashkernel reservation failed - memory is in use.\n");
- return;
- }
- }
-
- if (crash_base >= (1ULL << 32) && reserve_crashkernel_low()) {
- memblock_phys_free(crash_base, crash_size);
- return;
- }
-
- pr_info("Reserving %ldMB of memory at %ldMB for crashkernel (System RAM: %ldMB)\n",
- (unsigned long)(crash_size >> 20),
- (unsigned long)(crash_base >> 20),
- (unsigned long)(total_mem >> 20));
+ reserve_crashkernel_generic(cmdline, crash_size, crash_base,
+ low_size, high);
- crashk_res.start = crash_base;
- crashk_res.end = crash_base + crash_size - 1;
- insert_resource(&iomem_resource, &crashk_res);
+ return;
}
static struct resource standard_io_resources[] = {
@@ -1231,7 +1119,7 @@ void __init setup_arch(char **cmdline_p)
* Reserve memory for crash kernel after SRAT is parsed so that it
* won't consume hotpluggable memory.
*/
- reserve_crashkernel();
+ arch_reserve_crashkernel();
memblock_find_dma_reserve();
--
2.41.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 8/8] crash_core.c: remove unneeded functions
2023-08-27 10:11 [PATCH 0/8] kdump: use generic functions to simplify crashkernel reservation in architectures Baoquan He
` (6 preceding siblings ...)
2023-08-27 10:11 ` [PATCH 7/8] x86: kdump: use generic interface to simplify crashkernel reservation code Baoquan He
@ 2023-08-27 10:11 ` Baoquan He
2023-08-28 5:26 ` Samuel Holland
7 siblings, 1 reply; 13+ messages in thread
From: Baoquan He @ 2023-08-27 10:11 UTC (permalink / raw)
To: linux-kernel
Cc: kexec, linux-arm-kernel, x86, linux-riscv, akpm, catalin.marinas,
thunder.leizhen, dyoung, prudo, Baoquan He
So far, nobody calls functions parse_crashkernel_high() and
parse_crashkernel_high(), remove both of them.
Signed-off-by: Baoquan He <bhe@redhat.com>
---
include/linux/crash_core.h | 4 ----
kernel/crash_core.c | 18 ------------------
2 files changed, 22 deletions(-)
diff --git a/include/linux/crash_core.h b/include/linux/crash_core.h
index 2f732493e922..0c512a80a768 100644
--- a/include/linux/crash_core.h
+++ b/include/linux/crash_core.h
@@ -80,10 +80,6 @@ void final_note(Elf_Word *buf);
int __init parse_crashkernel(char *cmdline, unsigned long long system_ram,
unsigned long long *crash_size, unsigned long long *crash_base,
unsigned long long *low_size, bool *high);
-int parse_crashkernel_high(char *cmdline, unsigned long long system_ram,
- unsigned long long *crash_size, unsigned long long *crash_base);
-int parse_crashkernel_low(char *cmdline, unsigned long long system_ram,
- unsigned long long *crash_size, unsigned long long *crash_base);
#ifdef CONFIG_ARCH_HAS_GENERIC_CRASHKERNEL_RESERVATION
#ifndef DEFAULT_CRASH_KERNEL_LOW_SIZE
diff --git a/kernel/crash_core.c b/kernel/crash_core.c
index 6bc00cc390b5..61a8ea3b23a2 100644
--- a/kernel/crash_core.c
+++ b/kernel/crash_core.c
@@ -323,24 +323,6 @@ int __init parse_crashkernel(char *cmdline,
return 0;
}
-int __init parse_crashkernel_high(char *cmdline,
- unsigned long long system_ram,
- unsigned long long *crash_size,
- unsigned long long *crash_base)
-{
- return __parse_crashkernel(cmdline, system_ram, crash_size, crash_base,
- suffix_tbl[SUFFIX_HIGH]);
-}
-
-int __init parse_crashkernel_low(char *cmdline,
- unsigned long long system_ram,
- unsigned long long *crash_size,
- unsigned long long *crash_base)
-{
- return __parse_crashkernel(cmdline, system_ram, crash_size, crash_base,
- suffix_tbl[SUFFIX_LOW]);
-}
-
/*
* Add a dummy early_param handler to mark crashkernel= as a known command line
* parameter and suppress incorrect warnings in init/main.c.
--
2.41.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH 5/8] crash_core: add generic function to do reservation
2023-08-27 10:11 ` [PATCH 5/8] crash_core: add generic function to do reservation Baoquan He
@ 2023-08-27 13:53 ` kernel test robot
2023-08-28 12:57 ` Baoquan He
0 siblings, 1 reply; 13+ messages in thread
From: kernel test robot @ 2023-08-27 13:53 UTC (permalink / raw)
To: Baoquan He, linux-kernel
Cc: oe-kbuild-all, kexec, linux-arm-kernel, x86, linux-riscv, akpm,
catalin.marinas, thunder.leizhen, dyoung, prudo, Baoquan He
Hi Baoquan,
kernel test robot noticed the following build errors:
[auto build test ERROR on tip/x86/core]
[also build test ERROR on powerpc/next powerpc/fixes linus/master v6.5-rc7]
[cannot apply to arm64/for-next/core next-20230825]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Baoquan-He/crash_core-c-remove-unnecessary-parameter-of-function/20230827-181555
base: tip/x86/core
patch link: https://lore.kernel.org/r/20230827101128.70931-6-bhe%40redhat.com
patch subject: [PATCH 5/8] crash_core: add generic function to do reservation
config: csky-defconfig (https://download.01.org/0day-ci/archive/20230827/202308272150.p3kRkMoF-lkp@intel.com/config)
compiler: csky-linux-gcc (GCC) 13.2.0
reproduce: (https://download.01.org/0day-ci/archive/20230827/202308272150.p3kRkMoF-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202308272150.p3kRkMoF-lkp@intel.com/
All errors (new ones prefixed by >>):
537 | void __weak arch_crash_save_vmcoreinfo(void)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~
kernel/crash_core.c:540:20: warning: no previous prototype for 'paddr_vmcoreinfo_note' [-Wmissing-prototypes]
540 | phys_addr_t __weak paddr_vmcoreinfo_note(void)
| ^~~~~~~~~~~~~~~~~~~~~
kernel/crash_core.c: In function 'crash_save_vmcoreinfo_init':
kernel/crash_core.c:554:45: error: 'VMCOREINFO_NOTE_SIZE' undeclared (first use in this function)
554 | vmcoreinfo_note = alloc_pages_exact(VMCOREINFO_NOTE_SIZE,
| ^~~~~~~~~~~~~~~~~~~~
kernel/crash_core.c:563:9: error: implicit declaration of function 'VMCOREINFO_OSRELEASE' [-Werror=implicit-function-declaration]
563 | VMCOREINFO_OSRELEASE(init_uts_ns.name.release);
| ^~~~~~~~~~~~~~~~~~~~
kernel/crash_core.c:564:9: error: implicit declaration of function 'VMCOREINFO_BUILD_ID' [-Werror=implicit-function-declaration]
564 | VMCOREINFO_BUILD_ID();
| ^~~~~~~~~~~~~~~~~~~
kernel/crash_core.c:565:9: error: implicit declaration of function 'VMCOREINFO_PAGESIZE' [-Werror=implicit-function-declaration]
565 | VMCOREINFO_PAGESIZE(PAGE_SIZE);
| ^~~~~~~~~~~~~~~~~~~
kernel/crash_core.c:567:9: error: implicit declaration of function 'VMCOREINFO_SYMBOL' [-Werror=implicit-function-declaration]
567 | VMCOREINFO_SYMBOL(init_uts_ns);
| ^~~~~~~~~~~~~~~~~
kernel/crash_core.c:568:9: error: implicit declaration of function 'VMCOREINFO_OFFSET' [-Werror=implicit-function-declaration]
568 | VMCOREINFO_OFFSET(uts_namespace, name);
| ^~~~~~~~~~~~~~~~~
kernel/crash_core.c:568:27: error: 'uts_namespace' undeclared (first use in this function)
568 | VMCOREINFO_OFFSET(uts_namespace, name);
| ^~~~~~~~~~~~~
kernel/crash_core.c:568:42: error: 'name' undeclared (first use in this function)
568 | VMCOREINFO_OFFSET(uts_namespace, name);
| ^~~~
kernel/crash_core.c:571:9: error: implicit declaration of function 'VMCOREINFO_SYMBOL_ARRAY' [-Werror=implicit-function-declaration]
571 | VMCOREINFO_SYMBOL_ARRAY(swapper_pg_dir);
| ^~~~~~~~~~~~~~~~~~~~~~~
kernel/crash_core.c:588:9: error: implicit declaration of function 'VMCOREINFO_STRUCT_SIZE' [-Werror=implicit-function-declaration]
588 | VMCOREINFO_STRUCT_SIZE(page);
| ^~~~~~~~~~~~~~~~~~~~~~
kernel/crash_core.c:588:32: error: 'page' undeclared (first use in this function)
588 | VMCOREINFO_STRUCT_SIZE(page);
| ^~~~
kernel/crash_core.c:589:32: error: 'pglist_data' undeclared (first use in this function)
589 | VMCOREINFO_STRUCT_SIZE(pglist_data);
| ^~~~~~~~~~~
kernel/crash_core.c:590:32: error: 'zone' undeclared (first use in this function)
590 | VMCOREINFO_STRUCT_SIZE(zone);
| ^~~~
kernel/crash_core.c:591:32: error: 'free_area' undeclared (first use in this function)
591 | VMCOREINFO_STRUCT_SIZE(free_area);
| ^~~~~~~~~
kernel/crash_core.c:592:32: error: 'list_head' undeclared (first use in this function)
592 | VMCOREINFO_STRUCT_SIZE(list_head);
| ^~~~~~~~~
kernel/crash_core.c:593:9: error: implicit declaration of function 'VMCOREINFO_SIZE' [-Werror=implicit-function-declaration]
593 | VMCOREINFO_SIZE(nodemask_t);
| ^~~~~~~~~~~~~~~
kernel/crash_core.c:593:25: error: expected expression before 'nodemask_t'
593 | VMCOREINFO_SIZE(nodemask_t);
| ^~~~~~~~~~
kernel/crash_core.c:594:33: error: 'flags' undeclared (first use in this function); did you mean 'fls'?
594 | VMCOREINFO_OFFSET(page, flags);
| ^~~~~
| fls
kernel/crash_core.c:595:33: error: '_refcount' undeclared (first use in this function); did you mean 'seqcount'?
595 | VMCOREINFO_OFFSET(page, _refcount);
| ^~~~~~~~~
| seqcount
kernel/crash_core.c:596:33: error: 'mapping' undeclared (first use in this function)
596 | VMCOREINFO_OFFSET(page, mapping);
| ^~~~~~~
kernel/crash_core.c:597:33: error: 'lru' undeclared (first use in this function)
597 | VMCOREINFO_OFFSET(page, lru);
| ^~~
kernel/crash_core.c:598:33: error: '_mapcount' undeclared (first use in this function); did you mean 'nmi_count'?
598 | VMCOREINFO_OFFSET(page, _mapcount);
| ^~~~~~~~~
| nmi_count
kernel/crash_core.c:599:33: error: 'private' undeclared (first use in this function); did you mean 'PG_private'?
599 | VMCOREINFO_OFFSET(page, private);
| ^~~~~~~
| PG_private
kernel/crash_core.c:600:27: error: 'folio' undeclared (first use in this function)
600 | VMCOREINFO_OFFSET(folio, _folio_dtor);
| ^~~~~
kernel/crash_core.c:600:34: error: '_folio_dtor' undeclared (first use in this function)
600 | VMCOREINFO_OFFSET(folio, _folio_dtor);
| ^~~~~~~~~~~
kernel/crash_core.c:601:34: error: '_folio_order' undeclared (first use in this function); did you mean 'folio_order'?
601 | VMCOREINFO_OFFSET(folio, _folio_order);
| ^~~~~~~~~~~~
| folio_order
kernel/crash_core.c:602:33: error: 'compound_head' undeclared (first use in this function); did you mean '_compound_head'?
602 | VMCOREINFO_OFFSET(page, compound_head);
| ^~~~~~~~~~~~~
| _compound_head
kernel/crash_core.c:603:40: error: 'node_zones' undeclared (first use in this function); did you mean 'node_zonelist'?
603 | VMCOREINFO_OFFSET(pglist_data, node_zones);
| ^~~~~~~~~~
| node_zonelist
kernel/crash_core.c:604:40: error: 'nr_zones' undeclared (first use in this function)
604 | VMCOREINFO_OFFSET(pglist_data, nr_zones);
| ^~~~~~~~
>> kernel/crash_core.c:606:40: error: 'node_mem_map' undeclared (first use in this function); did you mean 'node_remap'?
606 | VMCOREINFO_OFFSET(pglist_data, node_mem_map);
| ^~~~~~~~~~~~
| node_remap
kernel/crash_core.c:608:40: error: 'node_start_pfn' undeclared (first use in this function)
608 | VMCOREINFO_OFFSET(pglist_data, node_start_pfn);
| ^~~~~~~~~~~~~~
kernel/crash_core.c:609:40: error: 'node_spanned_pages' undeclared (first use in this function); did you mean 'zone_managed_pages'?
609 | VMCOREINFO_OFFSET(pglist_data, node_spanned_pages);
| ^~~~~~~~~~~~~~~~~~
| zone_managed_pages
kernel/crash_core.c:610:40: error: 'node_id' undeclared (first use in this function)
610 | VMCOREINFO_OFFSET(pglist_data, node_id);
| ^~~~~~~
kernel/crash_core.c:612:33: error: 'vm_stat' undeclared (first use in this function); did you mean 'vfs_stat'?
612 | VMCOREINFO_OFFSET(zone, vm_stat);
| ^~~~~~~
| vfs_stat
kernel/crash_core.c:613:33: error: 'spanned_pages' undeclared (first use in this function); did you mean 'shake_page'?
613 | VMCOREINFO_OFFSET(zone, spanned_pages);
| ^~~~~~~~~~~~~
| shake_page
kernel/crash_core.c:614:38: error: 'free_list' undeclared (first use in this function); did you mean 'kfree_link'?
614 | VMCOREINFO_OFFSET(free_area, free_list);
| ^~~~~~~~~
| kfree_link
kernel/crash_core.c:615:38: error: 'next' undeclared (first use in this function); did you mean 'net'?
615 | VMCOREINFO_OFFSET(list_head, next);
| ^~~~
| net
kernel/crash_core.c:616:38: error: 'prev' undeclared (first use in this function)
616 | VMCOREINFO_OFFSET(list_head, prev);
| ^~~~
kernel/crash_core.c:617:27: error: 'vmap_area' undeclared (first use in this function)
617 | VMCOREINFO_OFFSET(vmap_area, va_start);
| ^~~~~~~~~
kernel/crash_core.c:617:38: error: 'va_start' undeclared (first use in this function); did you mean '_start'?
617 | VMCOREINFO_OFFSET(vmap_area, va_start);
| ^~~~~~~~
| _start
kernel/crash_core.c:618:38: error: 'list' undeclared (first use in this function)
618 | VMCOREINFO_OFFSET(vmap_area, list);
| ^~~~
kernel/crash_core.c:619:9: error: implicit declaration of function 'VMCOREINFO_LENGTH' [-Werror=implicit-function-declaration]
619 | VMCOREINFO_LENGTH(zone.free_area, MAX_ORDER + 1);
| ^~~~~~~~~~~~~~~~~
kernel/crash_core.c:622:9: error: implicit declaration of function 'VMCOREINFO_NUMBER' [-Werror=implicit-function-declaration]
622 | VMCOREINFO_NUMBER(NR_FREE_PAGES);
| ^~~~~~~~~~~~~~~~~
cc1: some warnings being treated as errors
vim +606 kernel/crash_core.c
692f66f26a4c19d Hari Bathini 2017-05-08 545
692f66f26a4c19d Hari Bathini 2017-05-08 546 static int __init crash_save_vmcoreinfo_init(void)
692f66f26a4c19d Hari Bathini 2017-05-08 547 {
203e9e41219b4e7 Xunlei Pang 2017-07-12 548 vmcoreinfo_data = (unsigned char *)get_zeroed_page(GFP_KERNEL);
203e9e41219b4e7 Xunlei Pang 2017-07-12 549 if (!vmcoreinfo_data) {
203e9e41219b4e7 Xunlei Pang 2017-07-12 550 pr_warn("Memory allocation for vmcoreinfo_data failed\n");
203e9e41219b4e7 Xunlei Pang 2017-07-12 551 return -ENOMEM;
203e9e41219b4e7 Xunlei Pang 2017-07-12 552 }
203e9e41219b4e7 Xunlei Pang 2017-07-12 553
203e9e41219b4e7 Xunlei Pang 2017-07-12 554 vmcoreinfo_note = alloc_pages_exact(VMCOREINFO_NOTE_SIZE,
203e9e41219b4e7 Xunlei Pang 2017-07-12 555 GFP_KERNEL | __GFP_ZERO);
203e9e41219b4e7 Xunlei Pang 2017-07-12 556 if (!vmcoreinfo_note) {
203e9e41219b4e7 Xunlei Pang 2017-07-12 557 free_page((unsigned long)vmcoreinfo_data);
203e9e41219b4e7 Xunlei Pang 2017-07-12 558 vmcoreinfo_data = NULL;
203e9e41219b4e7 Xunlei Pang 2017-07-12 559 pr_warn("Memory allocation for vmcoreinfo_note failed\n");
203e9e41219b4e7 Xunlei Pang 2017-07-12 560 return -ENOMEM;
203e9e41219b4e7 Xunlei Pang 2017-07-12 561 }
203e9e41219b4e7 Xunlei Pang 2017-07-12 562
692f66f26a4c19d Hari Bathini 2017-05-08 563 VMCOREINFO_OSRELEASE(init_uts_ns.name.release);
44e8a5e9120bf4f Stephen Boyd 2021-07-07 564 VMCOREINFO_BUILD_ID();
692f66f26a4c19d Hari Bathini 2017-05-08 565 VMCOREINFO_PAGESIZE(PAGE_SIZE);
692f66f26a4c19d Hari Bathini 2017-05-08 566
692f66f26a4c19d Hari Bathini 2017-05-08 567 VMCOREINFO_SYMBOL(init_uts_ns);
ca4a9241cc5e718 Alexander Egorenkov 2020-12-15 568 VMCOREINFO_OFFSET(uts_namespace, name);
692f66f26a4c19d Hari Bathini 2017-05-08 569 VMCOREINFO_SYMBOL(node_online_map);
692f66f26a4c19d Hari Bathini 2017-05-08 570 #ifdef CONFIG_MMU
eff4345e7fba0aa Omar Sandoval 2018-08-21 571 VMCOREINFO_SYMBOL_ARRAY(swapper_pg_dir);
692f66f26a4c19d Hari Bathini 2017-05-08 572 #endif
692f66f26a4c19d Hari Bathini 2017-05-08 573 VMCOREINFO_SYMBOL(_stext);
692f66f26a4c19d Hari Bathini 2017-05-08 574 VMCOREINFO_SYMBOL(vmap_area_list);
692f66f26a4c19d Hari Bathini 2017-05-08 575
a9ee6cf5c60ed10 Mike Rapoport 2021-06-28 576 #ifndef CONFIG_NUMA
692f66f26a4c19d Hari Bathini 2017-05-08 577 VMCOREINFO_SYMBOL(mem_map);
692f66f26a4c19d Hari Bathini 2017-05-08 578 VMCOREINFO_SYMBOL(contig_page_data);
692f66f26a4c19d Hari Bathini 2017-05-08 579 #endif
692f66f26a4c19d Hari Bathini 2017-05-08 580 #ifdef CONFIG_SPARSEMEM
a0b1280368d1e91 Kirill A. Shutemov 2018-01-12 581 VMCOREINFO_SYMBOL_ARRAY(mem_section);
692f66f26a4c19d Hari Bathini 2017-05-08 582 VMCOREINFO_LENGTH(mem_section, NR_SECTION_ROOTS);
692f66f26a4c19d Hari Bathini 2017-05-08 583 VMCOREINFO_STRUCT_SIZE(mem_section);
692f66f26a4c19d Hari Bathini 2017-05-08 584 VMCOREINFO_OFFSET(mem_section, section_mem_map);
4f5aecdff25f59f Pingfan Liu 2021-06-15 585 VMCOREINFO_NUMBER(SECTION_SIZE_BITS);
1d50e5d0c505244 Bhupesh Sharma 2020-05-14 586 VMCOREINFO_NUMBER(MAX_PHYSMEM_BITS);
692f66f26a4c19d Hari Bathini 2017-05-08 587 #endif
692f66f26a4c19d Hari Bathini 2017-05-08 588 VMCOREINFO_STRUCT_SIZE(page);
692f66f26a4c19d Hari Bathini 2017-05-08 589 VMCOREINFO_STRUCT_SIZE(pglist_data);
692f66f26a4c19d Hari Bathini 2017-05-08 590 VMCOREINFO_STRUCT_SIZE(zone);
692f66f26a4c19d Hari Bathini 2017-05-08 591 VMCOREINFO_STRUCT_SIZE(free_area);
692f66f26a4c19d Hari Bathini 2017-05-08 592 VMCOREINFO_STRUCT_SIZE(list_head);
692f66f26a4c19d Hari Bathini 2017-05-08 593 VMCOREINFO_SIZE(nodemask_t);
692f66f26a4c19d Hari Bathini 2017-05-08 594 VMCOREINFO_OFFSET(page, flags);
692f66f26a4c19d Hari Bathini 2017-05-08 595 VMCOREINFO_OFFSET(page, _refcount);
692f66f26a4c19d Hari Bathini 2017-05-08 596 VMCOREINFO_OFFSET(page, mapping);
692f66f26a4c19d Hari Bathini 2017-05-08 597 VMCOREINFO_OFFSET(page, lru);
692f66f26a4c19d Hari Bathini 2017-05-08 598 VMCOREINFO_OFFSET(page, _mapcount);
692f66f26a4c19d Hari Bathini 2017-05-08 599 VMCOREINFO_OFFSET(page, private);
1c5509be58f636a Matthew Wilcox (Oracle 2023-01-11 600) VMCOREINFO_OFFSET(folio, _folio_dtor);
1c5509be58f636a Matthew Wilcox (Oracle 2023-01-11 601) VMCOREINFO_OFFSET(folio, _folio_order);
692f66f26a4c19d Hari Bathini 2017-05-08 602 VMCOREINFO_OFFSET(page, compound_head);
692f66f26a4c19d Hari Bathini 2017-05-08 603 VMCOREINFO_OFFSET(pglist_data, node_zones);
692f66f26a4c19d Hari Bathini 2017-05-08 604 VMCOREINFO_OFFSET(pglist_data, nr_zones);
43b02ba93b25b1c Mike Rapoport 2021-06-28 605 #ifdef CONFIG_FLATMEM
692f66f26a4c19d Hari Bathini 2017-05-08 @606 VMCOREINFO_OFFSET(pglist_data, node_mem_map);
692f66f26a4c19d Hari Bathini 2017-05-08 607 #endif
692f66f26a4c19d Hari Bathini 2017-05-08 608 VMCOREINFO_OFFSET(pglist_data, node_start_pfn);
692f66f26a4c19d Hari Bathini 2017-05-08 609 VMCOREINFO_OFFSET(pglist_data, node_spanned_pages);
692f66f26a4c19d Hari Bathini 2017-05-08 610 VMCOREINFO_OFFSET(pglist_data, node_id);
692f66f26a4c19d Hari Bathini 2017-05-08 611 VMCOREINFO_OFFSET(zone, free_area);
692f66f26a4c19d Hari Bathini 2017-05-08 612 VMCOREINFO_OFFSET(zone, vm_stat);
692f66f26a4c19d Hari Bathini 2017-05-08 613 VMCOREINFO_OFFSET(zone, spanned_pages);
692f66f26a4c19d Hari Bathini 2017-05-08 614 VMCOREINFO_OFFSET(free_area, free_list);
692f66f26a4c19d Hari Bathini 2017-05-08 615 VMCOREINFO_OFFSET(list_head, next);
692f66f26a4c19d Hari Bathini 2017-05-08 616 VMCOREINFO_OFFSET(list_head, prev);
692f66f26a4c19d Hari Bathini 2017-05-08 617 VMCOREINFO_OFFSET(vmap_area, va_start);
692f66f26a4c19d Hari Bathini 2017-05-08 618 VMCOREINFO_OFFSET(vmap_area, list);
23baf831a32c04f Kirill A. Shutemov 2023-03-15 619 VMCOREINFO_LENGTH(zone.free_area, MAX_ORDER + 1);
692f66f26a4c19d Hari Bathini 2017-05-08 620 log_buf_vmcoreinfo_setup();
692f66f26a4c19d Hari Bathini 2017-05-08 621 VMCOREINFO_LENGTH(free_area.free_list, MIGRATE_TYPES);
692f66f26a4c19d Hari Bathini 2017-05-08 622 VMCOREINFO_NUMBER(NR_FREE_PAGES);
692f66f26a4c19d Hari Bathini 2017-05-08 623 VMCOREINFO_NUMBER(PG_lru);
692f66f26a4c19d Hari Bathini 2017-05-08 624 VMCOREINFO_NUMBER(PG_private);
692f66f26a4c19d Hari Bathini 2017-05-08 625 VMCOREINFO_NUMBER(PG_swapcache);
1cbf29da3628b66 Petr Tesarik 2018-04-13 626 VMCOREINFO_NUMBER(PG_swapbacked);
692f66f26a4c19d Hari Bathini 2017-05-08 627 VMCOREINFO_NUMBER(PG_slab);
692f66f26a4c19d Hari Bathini 2017-05-08 628 #ifdef CONFIG_MEMORY_FAILURE
692f66f26a4c19d Hari Bathini 2017-05-08 629 VMCOREINFO_NUMBER(PG_hwpoison);
692f66f26a4c19d Hari Bathini 2017-05-08 630 #endif
692f66f26a4c19d Hari Bathini 2017-05-08 631 VMCOREINFO_NUMBER(PG_head_mask);
6e292b9be7f4358 Matthew Wilcox 2018-06-07 632 #define PAGE_BUDDY_MAPCOUNT_VALUE (~PG_buddy)
692f66f26a4c19d Hari Bathini 2017-05-08 633 VMCOREINFO_NUMBER(PAGE_BUDDY_MAPCOUNT_VALUE);
692f66f26a4c19d Hari Bathini 2017-05-08 634 #ifdef CONFIG_HUGETLB_PAGE
692f66f26a4c19d Hari Bathini 2017-05-08 635 VMCOREINFO_NUMBER(HUGETLB_PAGE_DTOR);
e04b742f74c2362 David Hildenbrand 2019-03-05 636 #define PAGE_OFFLINE_MAPCOUNT_VALUE (~PG_offline)
e04b742f74c2362 David Hildenbrand 2019-03-05 637 VMCOREINFO_NUMBER(PAGE_OFFLINE_MAPCOUNT_VALUE);
692f66f26a4c19d Hari Bathini 2017-05-08 638 #endif
692f66f26a4c19d Hari Bathini 2017-05-08 639
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 8/8] crash_core.c: remove unneeded functions
2023-08-27 10:11 ` [PATCH 8/8] crash_core.c: remove unneeded functions Baoquan He
@ 2023-08-28 5:26 ` Samuel Holland
2023-08-28 9:42 ` Baoquan He
0 siblings, 1 reply; 13+ messages in thread
From: Samuel Holland @ 2023-08-28 5:26 UTC (permalink / raw)
To: Baoquan He
Cc: kexec, linux-arm-kernel, x86, linux-riscv, akpm, catalin.marinas,
thunder.leizhen, dyoung, prudo, linux-kernel
Hi Baoquan,
On 2023-08-27 5:11 AM, Baoquan He wrote:
> So far, nobody calls functions parse_crashkernel_high() and
> parse_crashkernel_high(), remove both of them.
minor typo: should be parse_crashkernel_low().
Regards,
Samuel
> Signed-off-by: Baoquan He <bhe@redhat.com>
> ---
> include/linux/crash_core.h | 4 ----
> kernel/crash_core.c | 18 ------------------
> 2 files changed, 22 deletions(-)
>
> diff --git a/include/linux/crash_core.h b/include/linux/crash_core.h
> index 2f732493e922..0c512a80a768 100644
> --- a/include/linux/crash_core.h
> +++ b/include/linux/crash_core.h
> @@ -80,10 +80,6 @@ void final_note(Elf_Word *buf);
> int __init parse_crashkernel(char *cmdline, unsigned long long system_ram,
> unsigned long long *crash_size, unsigned long long *crash_base,
> unsigned long long *low_size, bool *high);
> -int parse_crashkernel_high(char *cmdline, unsigned long long system_ram,
> - unsigned long long *crash_size, unsigned long long *crash_base);
> -int parse_crashkernel_low(char *cmdline, unsigned long long system_ram,
> - unsigned long long *crash_size, unsigned long long *crash_base);
>
> #ifdef CONFIG_ARCH_HAS_GENERIC_CRASHKERNEL_RESERVATION
> #ifndef DEFAULT_CRASH_KERNEL_LOW_SIZE
> diff --git a/kernel/crash_core.c b/kernel/crash_core.c
> index 6bc00cc390b5..61a8ea3b23a2 100644
> --- a/kernel/crash_core.c
> +++ b/kernel/crash_core.c
> @@ -323,24 +323,6 @@ int __init parse_crashkernel(char *cmdline,
> return 0;
> }
>
> -int __init parse_crashkernel_high(char *cmdline,
> - unsigned long long system_ram,
> - unsigned long long *crash_size,
> - unsigned long long *crash_base)
> -{
> - return __parse_crashkernel(cmdline, system_ram, crash_size, crash_base,
> - suffix_tbl[SUFFIX_HIGH]);
> -}
> -
> -int __init parse_crashkernel_low(char *cmdline,
> - unsigned long long system_ram,
> - unsigned long long *crash_size,
> - unsigned long long *crash_base)
> -{
> - return __parse_crashkernel(cmdline, system_ram, crash_size, crash_base,
> - suffix_tbl[SUFFIX_LOW]);
> -}
> -
> /*
> * Add a dummy early_param handler to mark crashkernel= as a known command line
> * parameter and suppress incorrect warnings in init/main.c.
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 8/8] crash_core.c: remove unneeded functions
2023-08-28 5:26 ` Samuel Holland
@ 2023-08-28 9:42 ` Baoquan He
0 siblings, 0 replies; 13+ messages in thread
From: Baoquan He @ 2023-08-28 9:42 UTC (permalink / raw)
To: Samuel Holland
Cc: kexec, linux-arm-kernel, x86, linux-riscv, akpm, catalin.marinas,
thunder.leizhen, dyoung, prudo, linux-kernel
On 08/28/23 at 12:26am, Samuel Holland wrote:
> Hi Baoquan,
>
> On 2023-08-27 5:11 AM, Baoquan He wrote:
> > So far, nobody calls functions parse_crashkernel_high() and
> > parse_crashkernel_high(), remove both of them.
>
> minor typo: should be parse_crashkernel_low().
Good catch, will update. Thanks.
>
> > Signed-off-by: Baoquan He <bhe@redhat.com>
> > ---
> > include/linux/crash_core.h | 4 ----
> > kernel/crash_core.c | 18 ------------------
> > 2 files changed, 22 deletions(-)
> >
> > diff --git a/include/linux/crash_core.h b/include/linux/crash_core.h
> > index 2f732493e922..0c512a80a768 100644
> > --- a/include/linux/crash_core.h
> > +++ b/include/linux/crash_core.h
> > @@ -80,10 +80,6 @@ void final_note(Elf_Word *buf);
> > int __init parse_crashkernel(char *cmdline, unsigned long long system_ram,
> > unsigned long long *crash_size, unsigned long long *crash_base,
> > unsigned long long *low_size, bool *high);
> > -int parse_crashkernel_high(char *cmdline, unsigned long long system_ram,
> > - unsigned long long *crash_size, unsigned long long *crash_base);
> > -int parse_crashkernel_low(char *cmdline, unsigned long long system_ram,
> > - unsigned long long *crash_size, unsigned long long *crash_base);
> >
> > #ifdef CONFIG_ARCH_HAS_GENERIC_CRASHKERNEL_RESERVATION
> > #ifndef DEFAULT_CRASH_KERNEL_LOW_SIZE
> > diff --git a/kernel/crash_core.c b/kernel/crash_core.c
> > index 6bc00cc390b5..61a8ea3b23a2 100644
> > --- a/kernel/crash_core.c
> > +++ b/kernel/crash_core.c
> > @@ -323,24 +323,6 @@ int __init parse_crashkernel(char *cmdline,
> > return 0;
> > }
> >
> > -int __init parse_crashkernel_high(char *cmdline,
> > - unsigned long long system_ram,
> > - unsigned long long *crash_size,
> > - unsigned long long *crash_base)
> > -{
> > - return __parse_crashkernel(cmdline, system_ram, crash_size, crash_base,
> > - suffix_tbl[SUFFIX_HIGH]);
> > -}
> > -
> > -int __init parse_crashkernel_low(char *cmdline,
> > - unsigned long long system_ram,
> > - unsigned long long *crash_size,
> > - unsigned long long *crash_base)
> > -{
> > - return __parse_crashkernel(cmdline, system_ram, crash_size, crash_base,
> > - suffix_tbl[SUFFIX_LOW]);
> > -}
> > -
> > /*
> > * Add a dummy early_param handler to mark crashkernel= as a known command line
> > * parameter and suppress incorrect warnings in init/main.c.
>
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 5/8] crash_core: add generic function to do reservation
2023-08-27 13:53 ` kernel test robot
@ 2023-08-28 12:57 ` Baoquan He
0 siblings, 0 replies; 13+ messages in thread
From: Baoquan He @ 2023-08-28 12:57 UTC (permalink / raw)
To: kernel test robot
Cc: linux-kernel, oe-kbuild-all, kexec, linux-arm-kernel, x86,
linux-riscv, akpm, catalin.marinas, thunder.leizhen, dyoung,
prudo
On 08/27/23 at 09:53pm, kernel test robot wrote:
> Hi Baoquan,
>
> kernel test robot noticed the following build errors:
>
> [auto build test ERROR on tip/x86/core]
> [also build test ERROR on powerpc/next powerpc/fixes linus/master v6.5-rc7]
> [cannot apply to arm64/for-next/core next-20230825]
> [If your patch is applied to the wrong git tree, kindly drop us a note.
> And when submitting patch, we suggest to use '--base' as documented in
> https://git-scm.com/docs/git-format-patch#_base_tree_information]
>
> url: https://github.com/intel-lab-lkp/linux/commits/Baoquan-He/crash_core-c-remove-unnecessary-parameter-of-function/20230827-181555
> base: tip/x86/core
> patch link: https://lore.kernel.org/r/20230827101128.70931-6-bhe%40redhat.com
> patch subject: [PATCH 5/8] crash_core: add generic function to do reservation
> config: csky-defconfig (https://download.01.org/0day-ci/archive/20230827/202308272150.p3kRkMoF-lkp@intel.com/config)
> compiler: csky-linux-gcc (GCC) 13.2.0
> reproduce: (https://download.01.org/0day-ci/archive/20230827/202308272150.p3kRkMoF-lkp@intel.com/reproduce)
>
> If you fix the issue in a separate patch/commit (i.e. not just a new version of
> the same patch/commit), kindly add following tags
> | Reported-by: kernel test robot <lkp@intel.com>
> | Closes: https://lore.kernel.org/oe-kbuild-all/202308272150.p3kRkMoF-lkp@intel.com/
Thanks for reporting this. The error is caused by patch 3:
[PATCH 3/8] include/linux/kexec.h: move down crash_core.h including
In this lkp's config, CONFIG_CRASH_CORE=y and CONFIG_KEXEC_CORE=n, the
moving down of crash_core.h including will triger the error. I will
think of another way to fix this.
>
> All errors (new ones prefixed by >>):
>
> 537 | void __weak arch_crash_save_vmcoreinfo(void)
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~
> kernel/crash_core.c:540:20: warning: no previous prototype for 'paddr_vmcoreinfo_note' [-Wmissing-prototypes]
> 540 | phys_addr_t __weak paddr_vmcoreinfo_note(void)
> | ^~~~~~~~~~~~~~~~~~~~~
> kernel/crash_core.c: In function 'crash_save_vmcoreinfo_init':
> kernel/crash_core.c:554:45: error: 'VMCOREINFO_NOTE_SIZE' undeclared (first use in this function)
> 554 | vmcoreinfo_note = alloc_pages_exact(VMCOREINFO_NOTE_SIZE,
> | ^~~~~~~~~~~~~~~~~~~~
> kernel/crash_core.c:563:9: error: implicit declaration of function 'VMCOREINFO_OSRELEASE' [-Werror=implicit-function-declaration]
> 563 | VMCOREINFO_OSRELEASE(init_uts_ns.name.release);
> | ^~~~~~~~~~~~~~~~~~~~
> kernel/crash_core.c:564:9: error: implicit declaration of function 'VMCOREINFO_BUILD_ID' [-Werror=implicit-function-declaration]
> 564 | VMCOREINFO_BUILD_ID();
> | ^~~~~~~~~~~~~~~~~~~
> kernel/crash_core.c:565:9: error: implicit declaration of function 'VMCOREINFO_PAGESIZE' [-Werror=implicit-function-declaration]
> 565 | VMCOREINFO_PAGESIZE(PAGE_SIZE);
> | ^~~~~~~~~~~~~~~~~~~
> kernel/crash_core.c:567:9: error: implicit declaration of function 'VMCOREINFO_SYMBOL' [-Werror=implicit-function-declaration]
> 567 | VMCOREINFO_SYMBOL(init_uts_ns);
> | ^~~~~~~~~~~~~~~~~
> kernel/crash_core.c:568:9: error: implicit declaration of function 'VMCOREINFO_OFFSET' [-Werror=implicit-function-declaration]
> 568 | VMCOREINFO_OFFSET(uts_namespace, name);
> | ^~~~~~~~~~~~~~~~~
> kernel/crash_core.c:568:27: error: 'uts_namespace' undeclared (first use in this function)
> 568 | VMCOREINFO_OFFSET(uts_namespace, name);
> | ^~~~~~~~~~~~~
> kernel/crash_core.c:568:42: error: 'name' undeclared (first use in this function)
> 568 | VMCOREINFO_OFFSET(uts_namespace, name);
> | ^~~~
> kernel/crash_core.c:571:9: error: implicit declaration of function 'VMCOREINFO_SYMBOL_ARRAY' [-Werror=implicit-function-declaration]
> 571 | VMCOREINFO_SYMBOL_ARRAY(swapper_pg_dir);
> | ^~~~~~~~~~~~~~~~~~~~~~~
> kernel/crash_core.c:588:9: error: implicit declaration of function 'VMCOREINFO_STRUCT_SIZE' [-Werror=implicit-function-declaration]
> 588 | VMCOREINFO_STRUCT_SIZE(page);
> | ^~~~~~~~~~~~~~~~~~~~~~
> kernel/crash_core.c:588:32: error: 'page' undeclared (first use in this function)
> 588 | VMCOREINFO_STRUCT_SIZE(page);
> | ^~~~
> kernel/crash_core.c:589:32: error: 'pglist_data' undeclared (first use in this function)
> 589 | VMCOREINFO_STRUCT_SIZE(pglist_data);
> | ^~~~~~~~~~~
> kernel/crash_core.c:590:32: error: 'zone' undeclared (first use in this function)
> 590 | VMCOREINFO_STRUCT_SIZE(zone);
> | ^~~~
> kernel/crash_core.c:591:32: error: 'free_area' undeclared (first use in this function)
> 591 | VMCOREINFO_STRUCT_SIZE(free_area);
> | ^~~~~~~~~
> kernel/crash_core.c:592:32: error: 'list_head' undeclared (first use in this function)
> 592 | VMCOREINFO_STRUCT_SIZE(list_head);
> | ^~~~~~~~~
> kernel/crash_core.c:593:9: error: implicit declaration of function 'VMCOREINFO_SIZE' [-Werror=implicit-function-declaration]
> 593 | VMCOREINFO_SIZE(nodemask_t);
> | ^~~~~~~~~~~~~~~
> kernel/crash_core.c:593:25: error: expected expression before 'nodemask_t'
> 593 | VMCOREINFO_SIZE(nodemask_t);
> | ^~~~~~~~~~
> kernel/crash_core.c:594:33: error: 'flags' undeclared (first use in this function); did you mean 'fls'?
> 594 | VMCOREINFO_OFFSET(page, flags);
> | ^~~~~
> | fls
> kernel/crash_core.c:595:33: error: '_refcount' undeclared (first use in this function); did you mean 'seqcount'?
> 595 | VMCOREINFO_OFFSET(page, _refcount);
> | ^~~~~~~~~
> | seqcount
> kernel/crash_core.c:596:33: error: 'mapping' undeclared (first use in this function)
> 596 | VMCOREINFO_OFFSET(page, mapping);
> | ^~~~~~~
> kernel/crash_core.c:597:33: error: 'lru' undeclared (first use in this function)
> 597 | VMCOREINFO_OFFSET(page, lru);
> | ^~~
> kernel/crash_core.c:598:33: error: '_mapcount' undeclared (first use in this function); did you mean 'nmi_count'?
> 598 | VMCOREINFO_OFFSET(page, _mapcount);
> | ^~~~~~~~~
> | nmi_count
> kernel/crash_core.c:599:33: error: 'private' undeclared (first use in this function); did you mean 'PG_private'?
> 599 | VMCOREINFO_OFFSET(page, private);
> | ^~~~~~~
> | PG_private
> kernel/crash_core.c:600:27: error: 'folio' undeclared (first use in this function)
> 600 | VMCOREINFO_OFFSET(folio, _folio_dtor);
> | ^~~~~
> kernel/crash_core.c:600:34: error: '_folio_dtor' undeclared (first use in this function)
> 600 | VMCOREINFO_OFFSET(folio, _folio_dtor);
> | ^~~~~~~~~~~
> kernel/crash_core.c:601:34: error: '_folio_order' undeclared (first use in this function); did you mean 'folio_order'?
> 601 | VMCOREINFO_OFFSET(folio, _folio_order);
> | ^~~~~~~~~~~~
> | folio_order
> kernel/crash_core.c:602:33: error: 'compound_head' undeclared (first use in this function); did you mean '_compound_head'?
> 602 | VMCOREINFO_OFFSET(page, compound_head);
> | ^~~~~~~~~~~~~
> | _compound_head
> kernel/crash_core.c:603:40: error: 'node_zones' undeclared (first use in this function); did you mean 'node_zonelist'?
> 603 | VMCOREINFO_OFFSET(pglist_data, node_zones);
> | ^~~~~~~~~~
> | node_zonelist
> kernel/crash_core.c:604:40: error: 'nr_zones' undeclared (first use in this function)
> 604 | VMCOREINFO_OFFSET(pglist_data, nr_zones);
> | ^~~~~~~~
> >> kernel/crash_core.c:606:40: error: 'node_mem_map' undeclared (first use in this function); did you mean 'node_remap'?
> 606 | VMCOREINFO_OFFSET(pglist_data, node_mem_map);
> | ^~~~~~~~~~~~
> | node_remap
> kernel/crash_core.c:608:40: error: 'node_start_pfn' undeclared (first use in this function)
> 608 | VMCOREINFO_OFFSET(pglist_data, node_start_pfn);
> | ^~~~~~~~~~~~~~
> kernel/crash_core.c:609:40: error: 'node_spanned_pages' undeclared (first use in this function); did you mean 'zone_managed_pages'?
> 609 | VMCOREINFO_OFFSET(pglist_data, node_spanned_pages);
> | ^~~~~~~~~~~~~~~~~~
> | zone_managed_pages
> kernel/crash_core.c:610:40: error: 'node_id' undeclared (first use in this function)
> 610 | VMCOREINFO_OFFSET(pglist_data, node_id);
> | ^~~~~~~
> kernel/crash_core.c:612:33: error: 'vm_stat' undeclared (first use in this function); did you mean 'vfs_stat'?
> 612 | VMCOREINFO_OFFSET(zone, vm_stat);
> | ^~~~~~~
> | vfs_stat
> kernel/crash_core.c:613:33: error: 'spanned_pages' undeclared (first use in this function); did you mean 'shake_page'?
> 613 | VMCOREINFO_OFFSET(zone, spanned_pages);
> | ^~~~~~~~~~~~~
> | shake_page
> kernel/crash_core.c:614:38: error: 'free_list' undeclared (first use in this function); did you mean 'kfree_link'?
> 614 | VMCOREINFO_OFFSET(free_area, free_list);
> | ^~~~~~~~~
> | kfree_link
> kernel/crash_core.c:615:38: error: 'next' undeclared (first use in this function); did you mean 'net'?
> 615 | VMCOREINFO_OFFSET(list_head, next);
> | ^~~~
> | net
> kernel/crash_core.c:616:38: error: 'prev' undeclared (first use in this function)
> 616 | VMCOREINFO_OFFSET(list_head, prev);
> | ^~~~
> kernel/crash_core.c:617:27: error: 'vmap_area' undeclared (first use in this function)
> 617 | VMCOREINFO_OFFSET(vmap_area, va_start);
> | ^~~~~~~~~
> kernel/crash_core.c:617:38: error: 'va_start' undeclared (first use in this function); did you mean '_start'?
> 617 | VMCOREINFO_OFFSET(vmap_area, va_start);
> | ^~~~~~~~
> | _start
> kernel/crash_core.c:618:38: error: 'list' undeclared (first use in this function)
> 618 | VMCOREINFO_OFFSET(vmap_area, list);
> | ^~~~
> kernel/crash_core.c:619:9: error: implicit declaration of function 'VMCOREINFO_LENGTH' [-Werror=implicit-function-declaration]
> 619 | VMCOREINFO_LENGTH(zone.free_area, MAX_ORDER + 1);
> | ^~~~~~~~~~~~~~~~~
> kernel/crash_core.c:622:9: error: implicit declaration of function 'VMCOREINFO_NUMBER' [-Werror=implicit-function-declaration]
> 622 | VMCOREINFO_NUMBER(NR_FREE_PAGES);
> | ^~~~~~~~~~~~~~~~~
> cc1: some warnings being treated as errors
>
>
> vim +606 kernel/crash_core.c
>
> 692f66f26a4c19d Hari Bathini 2017-05-08 545
> 692f66f26a4c19d Hari Bathini 2017-05-08 546 static int __init crash_save_vmcoreinfo_init(void)
> 692f66f26a4c19d Hari Bathini 2017-05-08 547 {
> 203e9e41219b4e7 Xunlei Pang 2017-07-12 548 vmcoreinfo_data = (unsigned char *)get_zeroed_page(GFP_KERNEL);
> 203e9e41219b4e7 Xunlei Pang 2017-07-12 549 if (!vmcoreinfo_data) {
> 203e9e41219b4e7 Xunlei Pang 2017-07-12 550 pr_warn("Memory allocation for vmcoreinfo_data failed\n");
> 203e9e41219b4e7 Xunlei Pang 2017-07-12 551 return -ENOMEM;
> 203e9e41219b4e7 Xunlei Pang 2017-07-12 552 }
> 203e9e41219b4e7 Xunlei Pang 2017-07-12 553
> 203e9e41219b4e7 Xunlei Pang 2017-07-12 554 vmcoreinfo_note = alloc_pages_exact(VMCOREINFO_NOTE_SIZE,
> 203e9e41219b4e7 Xunlei Pang 2017-07-12 555 GFP_KERNEL | __GFP_ZERO);
> 203e9e41219b4e7 Xunlei Pang 2017-07-12 556 if (!vmcoreinfo_note) {
> 203e9e41219b4e7 Xunlei Pang 2017-07-12 557 free_page((unsigned long)vmcoreinfo_data);
> 203e9e41219b4e7 Xunlei Pang 2017-07-12 558 vmcoreinfo_data = NULL;
> 203e9e41219b4e7 Xunlei Pang 2017-07-12 559 pr_warn("Memory allocation for vmcoreinfo_note failed\n");
> 203e9e41219b4e7 Xunlei Pang 2017-07-12 560 return -ENOMEM;
> 203e9e41219b4e7 Xunlei Pang 2017-07-12 561 }
> 203e9e41219b4e7 Xunlei Pang 2017-07-12 562
> 692f66f26a4c19d Hari Bathini 2017-05-08 563 VMCOREINFO_OSRELEASE(init_uts_ns.name.release);
> 44e8a5e9120bf4f Stephen Boyd 2021-07-07 564 VMCOREINFO_BUILD_ID();
> 692f66f26a4c19d Hari Bathini 2017-05-08 565 VMCOREINFO_PAGESIZE(PAGE_SIZE);
> 692f66f26a4c19d Hari Bathini 2017-05-08 566
> 692f66f26a4c19d Hari Bathini 2017-05-08 567 VMCOREINFO_SYMBOL(init_uts_ns);
> ca4a9241cc5e718 Alexander Egorenkov 2020-12-15 568 VMCOREINFO_OFFSET(uts_namespace, name);
> 692f66f26a4c19d Hari Bathini 2017-05-08 569 VMCOREINFO_SYMBOL(node_online_map);
> 692f66f26a4c19d Hari Bathini 2017-05-08 570 #ifdef CONFIG_MMU
> eff4345e7fba0aa Omar Sandoval 2018-08-21 571 VMCOREINFO_SYMBOL_ARRAY(swapper_pg_dir);
> 692f66f26a4c19d Hari Bathini 2017-05-08 572 #endif
> 692f66f26a4c19d Hari Bathini 2017-05-08 573 VMCOREINFO_SYMBOL(_stext);
> 692f66f26a4c19d Hari Bathini 2017-05-08 574 VMCOREINFO_SYMBOL(vmap_area_list);
> 692f66f26a4c19d Hari Bathini 2017-05-08 575
> a9ee6cf5c60ed10 Mike Rapoport 2021-06-28 576 #ifndef CONFIG_NUMA
> 692f66f26a4c19d Hari Bathini 2017-05-08 577 VMCOREINFO_SYMBOL(mem_map);
> 692f66f26a4c19d Hari Bathini 2017-05-08 578 VMCOREINFO_SYMBOL(contig_page_data);
> 692f66f26a4c19d Hari Bathini 2017-05-08 579 #endif
> 692f66f26a4c19d Hari Bathini 2017-05-08 580 #ifdef CONFIG_SPARSEMEM
> a0b1280368d1e91 Kirill A. Shutemov 2018-01-12 581 VMCOREINFO_SYMBOL_ARRAY(mem_section);
> 692f66f26a4c19d Hari Bathini 2017-05-08 582 VMCOREINFO_LENGTH(mem_section, NR_SECTION_ROOTS);
> 692f66f26a4c19d Hari Bathini 2017-05-08 583 VMCOREINFO_STRUCT_SIZE(mem_section);
> 692f66f26a4c19d Hari Bathini 2017-05-08 584 VMCOREINFO_OFFSET(mem_section, section_mem_map);
> 4f5aecdff25f59f Pingfan Liu 2021-06-15 585 VMCOREINFO_NUMBER(SECTION_SIZE_BITS);
> 1d50e5d0c505244 Bhupesh Sharma 2020-05-14 586 VMCOREINFO_NUMBER(MAX_PHYSMEM_BITS);
> 692f66f26a4c19d Hari Bathini 2017-05-08 587 #endif
> 692f66f26a4c19d Hari Bathini 2017-05-08 588 VMCOREINFO_STRUCT_SIZE(page);
> 692f66f26a4c19d Hari Bathini 2017-05-08 589 VMCOREINFO_STRUCT_SIZE(pglist_data);
> 692f66f26a4c19d Hari Bathini 2017-05-08 590 VMCOREINFO_STRUCT_SIZE(zone);
> 692f66f26a4c19d Hari Bathini 2017-05-08 591 VMCOREINFO_STRUCT_SIZE(free_area);
> 692f66f26a4c19d Hari Bathini 2017-05-08 592 VMCOREINFO_STRUCT_SIZE(list_head);
> 692f66f26a4c19d Hari Bathini 2017-05-08 593 VMCOREINFO_SIZE(nodemask_t);
> 692f66f26a4c19d Hari Bathini 2017-05-08 594 VMCOREINFO_OFFSET(page, flags);
> 692f66f26a4c19d Hari Bathini 2017-05-08 595 VMCOREINFO_OFFSET(page, _refcount);
> 692f66f26a4c19d Hari Bathini 2017-05-08 596 VMCOREINFO_OFFSET(page, mapping);
> 692f66f26a4c19d Hari Bathini 2017-05-08 597 VMCOREINFO_OFFSET(page, lru);
> 692f66f26a4c19d Hari Bathini 2017-05-08 598 VMCOREINFO_OFFSET(page, _mapcount);
> 692f66f26a4c19d Hari Bathini 2017-05-08 599 VMCOREINFO_OFFSET(page, private);
> 1c5509be58f636a Matthew Wilcox (Oracle 2023-01-11 600) VMCOREINFO_OFFSET(folio, _folio_dtor);
> 1c5509be58f636a Matthew Wilcox (Oracle 2023-01-11 601) VMCOREINFO_OFFSET(folio, _folio_order);
> 692f66f26a4c19d Hari Bathini 2017-05-08 602 VMCOREINFO_OFFSET(page, compound_head);
> 692f66f26a4c19d Hari Bathini 2017-05-08 603 VMCOREINFO_OFFSET(pglist_data, node_zones);
> 692f66f26a4c19d Hari Bathini 2017-05-08 604 VMCOREINFO_OFFSET(pglist_data, nr_zones);
> 43b02ba93b25b1c Mike Rapoport 2021-06-28 605 #ifdef CONFIG_FLATMEM
> 692f66f26a4c19d Hari Bathini 2017-05-08 @606 VMCOREINFO_OFFSET(pglist_data, node_mem_map);
> 692f66f26a4c19d Hari Bathini 2017-05-08 607 #endif
> 692f66f26a4c19d Hari Bathini 2017-05-08 608 VMCOREINFO_OFFSET(pglist_data, node_start_pfn);
> 692f66f26a4c19d Hari Bathini 2017-05-08 609 VMCOREINFO_OFFSET(pglist_data, node_spanned_pages);
> 692f66f26a4c19d Hari Bathini 2017-05-08 610 VMCOREINFO_OFFSET(pglist_data, node_id);
> 692f66f26a4c19d Hari Bathini 2017-05-08 611 VMCOREINFO_OFFSET(zone, free_area);
> 692f66f26a4c19d Hari Bathini 2017-05-08 612 VMCOREINFO_OFFSET(zone, vm_stat);
> 692f66f26a4c19d Hari Bathini 2017-05-08 613 VMCOREINFO_OFFSET(zone, spanned_pages);
> 692f66f26a4c19d Hari Bathini 2017-05-08 614 VMCOREINFO_OFFSET(free_area, free_list);
> 692f66f26a4c19d Hari Bathini 2017-05-08 615 VMCOREINFO_OFFSET(list_head, next);
> 692f66f26a4c19d Hari Bathini 2017-05-08 616 VMCOREINFO_OFFSET(list_head, prev);
> 692f66f26a4c19d Hari Bathini 2017-05-08 617 VMCOREINFO_OFFSET(vmap_area, va_start);
> 692f66f26a4c19d Hari Bathini 2017-05-08 618 VMCOREINFO_OFFSET(vmap_area, list);
> 23baf831a32c04f Kirill A. Shutemov 2023-03-15 619 VMCOREINFO_LENGTH(zone.free_area, MAX_ORDER + 1);
> 692f66f26a4c19d Hari Bathini 2017-05-08 620 log_buf_vmcoreinfo_setup();
> 692f66f26a4c19d Hari Bathini 2017-05-08 621 VMCOREINFO_LENGTH(free_area.free_list, MIGRATE_TYPES);
> 692f66f26a4c19d Hari Bathini 2017-05-08 622 VMCOREINFO_NUMBER(NR_FREE_PAGES);
> 692f66f26a4c19d Hari Bathini 2017-05-08 623 VMCOREINFO_NUMBER(PG_lru);
> 692f66f26a4c19d Hari Bathini 2017-05-08 624 VMCOREINFO_NUMBER(PG_private);
> 692f66f26a4c19d Hari Bathini 2017-05-08 625 VMCOREINFO_NUMBER(PG_swapcache);
> 1cbf29da3628b66 Petr Tesarik 2018-04-13 626 VMCOREINFO_NUMBER(PG_swapbacked);
> 692f66f26a4c19d Hari Bathini 2017-05-08 627 VMCOREINFO_NUMBER(PG_slab);
> 692f66f26a4c19d Hari Bathini 2017-05-08 628 #ifdef CONFIG_MEMORY_FAILURE
> 692f66f26a4c19d Hari Bathini 2017-05-08 629 VMCOREINFO_NUMBER(PG_hwpoison);
> 692f66f26a4c19d Hari Bathini 2017-05-08 630 #endif
> 692f66f26a4c19d Hari Bathini 2017-05-08 631 VMCOREINFO_NUMBER(PG_head_mask);
> 6e292b9be7f4358 Matthew Wilcox 2018-06-07 632 #define PAGE_BUDDY_MAPCOUNT_VALUE (~PG_buddy)
> 692f66f26a4c19d Hari Bathini 2017-05-08 633 VMCOREINFO_NUMBER(PAGE_BUDDY_MAPCOUNT_VALUE);
> 692f66f26a4c19d Hari Bathini 2017-05-08 634 #ifdef CONFIG_HUGETLB_PAGE
> 692f66f26a4c19d Hari Bathini 2017-05-08 635 VMCOREINFO_NUMBER(HUGETLB_PAGE_DTOR);
> e04b742f74c2362 David Hildenbrand 2019-03-05 636 #define PAGE_OFFLINE_MAPCOUNT_VALUE (~PG_offline)
> e04b742f74c2362 David Hildenbrand 2019-03-05 637 VMCOREINFO_NUMBER(PAGE_OFFLINE_MAPCOUNT_VALUE);
> 692f66f26a4c19d Hari Bathini 2017-05-08 638 #endif
> 692f66f26a4c19d Hari Bathini 2017-05-08 639
>
> --
> 0-DAY CI Kernel Test Service
> https://github.com/intel/lkp-tests/wiki
>
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2023-08-28 12:59 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-08-27 10:11 [PATCH 0/8] kdump: use generic functions to simplify crashkernel reservation in architectures Baoquan He
2023-08-27 10:11 ` [PATCH 1/8] crash_core.c: remove unnecessary parameter of function Baoquan He
2023-08-27 10:11 ` [PATCH 2/8] crash_core: change the prototype of function parse_crashkernel() Baoquan He
2023-08-27 10:11 ` [PATCH 3/8] include/linux/kexec.h: move down crash_core.h including Baoquan He
2023-08-27 10:11 ` [PATCH 4/8] crash_core: change parse_crashkernel() to support crashkernel=,high|low parsing Baoquan He
2023-08-27 10:11 ` [PATCH 5/8] crash_core: add generic function to do reservation Baoquan He
2023-08-27 13:53 ` kernel test robot
2023-08-28 12:57 ` Baoquan He
2023-08-27 10:11 ` [PATCH 6/8] arm64: kdump: use generic interface to simplify crashkernel reservation Baoquan He
2023-08-27 10:11 ` [PATCH 7/8] x86: kdump: use generic interface to simplify crashkernel reservation code Baoquan He
2023-08-27 10:11 ` [PATCH 8/8] crash_core.c: remove unneeded functions Baoquan He
2023-08-28 5:26 ` Samuel Holland
2023-08-28 9:42 ` Baoquan He
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).