memmap: Parse "Reserved" together with "reserved"
Subsystems (2)
PATCH 1/1 memmap: Parse "Reserved" together with "reserved"
For x86 with recent kernel after
commit 640e1b38b0 ("x86/boot/e820: Basic cleanup of e820.c")
change "reserved" to "Reserved" in /sys firmware memmap and /proc/iomem.
So here, we add handling for that too.
--- kexec/arch/i386/crashdump-x86.c | 2 ++ kexec/arch/ia64/kexec-ia64.c | 2 ++ kexec/arch/mips/kexec-mips.c | 2 ++ kexec/firmware_memmap.c | 2 ++ 4 files changed, 8 insertions(+)
kexec/arch/i386/crashdump-x86.c +2 -0
@@ -323,6 +323,8 @@ static int get_crash_memory_ranges(struc type =RANGE_PMEM ; }else if (memcmp (str,"reserved\n" ,9 ) ==0 ) { type =RANGE_RESERVED ; + }else if (memcmp (str,"Reserved\n" ,9 ) ==0 ) { + type =RANGE_RESERVED ; }else if (memcmp (str,"GART\n" ,5 ) ==0 ) { gart_start = start; gart_end = end;
kexec/arch/ia64/kexec-ia64.c +2 -0
@@ -117,6 +117,8 @@ int get_memory_ranges(struct memory_rang }else if (memcmp (str,"reserved\n" ,9 ) ==0 ) { type =RANGE_RESERVED ; + else if (memcmp(str, "Reserved\n", 9) == 0) { + type = RANGE_RESERVED; } else if (memcmp(str, "Crash kernel\n", 13) == 0) { /* Redefine the memory region boundaries if kernel
kexec/arch/mips/kexec-mips.c +2 -0
@@ -57,6 +57,8 @@ int get_memory_ranges(struct memory_rang type =RANGE_RAM ; }else if (memcmp (str,"reserved\n" ,9 ) ==0 ) { type =RANGE_RESERVED ; + }else if (memcmp (str,"Reserved\n" ,9 ) ==0 ) { + type =RANGE_RESERVED ; }else {continue ; }
kexec/firmware_memmap.c +2 -0
@@ -164,6 +164,8 @@ static int parse_memmap_entry(const char range->type =RANGE_RESERVED ; else if (strcmp(type, "reserved") == 0) range->type = RANGE_RESERVED; + else if (strcmp(type, "Reserved") == 0) + range->type = RANGE_RESERVED; else if (strcmp(type, "ACPI Non-volatile Storage") == 0) range->type =RANGE_ACPI_NVS ; else if (strcmp(type, "Uncached RAM") == 0)
_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
Quoted 2 lines · Yinghai Lu
For x86 with recent kernel after
commit640e1b38b0("x86/boot/e820: Basic cleanup ofe820.c")
Need to mention that this is not in mainline yet.
Quoted 10 lines
change "reserved" to "Reserved" in /sys firmware memmap and
/proc/iomem.So here, we add handling for that too.
Signed-off-by Yinghai Lu <[email protected]>--- kexec/arch/i386/crashdump-x86.c | 2 ++ kexec/arch/ia64/kexec-ia64.c | 2 ++ kexec/arch/mips/kexec-mips.c | 2 ++
The tip commit only changes x86, so mips and ia64 are not needed here?
Quoted 56 lines
kexec/firmware_memmap.c | 2 ++ 4 files changed, 8 insertions(+)Index:
kexec-tools/kexec/arch/i386/crashdump-x86.c
===================================================================kexec/arch/i386/crashdump-x86.c +2
-0@@ -323,6 +323,8 @@ static int get_crash_memory_ranges(struc type =RANGE_PMEM ; }else if (memcmp (str,"reserved\n" ,9 ) ==0 ) { type =RANGE_RESERVED ; + }else if (memcmp (str,"Reserved\n" ,9 ) ==0 ) { + type =RANGE_RESERVED ; }else if (memcmp (str,"GART\n" ,5 ) ==0 ) { gart_start = start; gart_end = end;Index:
kexec-tools/kexec/arch/ia64/kexec-ia64.c
===================================================================kexec/arch/ia64/kexec-ia64.c +2
-0@@ -117,6 +117,8 @@ int get_memory_ranges(struct memory_rang }else if (memcmp (str,"reserved\n" ,9 ) ==0 ) { type =RANGE_RESERVED ; + else if (memcmp(str, "Reserved\n", 9) == 0) { + type = RANGE_RESERVED; } else if (memcmp(str, "Crash kernel\n", 13) == 0) { /* Redefine the memory region boundaries if kernelIndex:
kexec-tools/kexec/arch/mips/kexec-mips.c
===================================================================kexec/arch/mips/kexec-mips.c +2
-0@@ -57,6 +57,8 @@ int get_memory_ranges(struct memory_rang type =RANGE_RAM ; }else if (memcmp (str,"reserved\n" ,9 ) ==0 ) { type =RANGE_RESERVED ; + }else if (memcmp (str,"Reserved\n" ,9 ) ==0 ) { + type =RANGE_RESERVED ; }else {continue ; }Index:
kexec-tools/kexec/firmware_memmap.c
===================================================================kexec/firmware_memmap.c +2
-0@@ -164,6 +164,8 @@ static int parse_memmap_entry(const char range->type =RANGE_RESERVED ; else if (strcmp(type, "reserved") == 0) range->type = RANGE_RESERVED; + else if (strcmp(type, "Reserved") == 0) + range->type = RANGE_RESERVED; else if (strcmp(type, "ACPI Non-volatile Storage") == 0) range->type =RANGE_ACPI_NVS ; else if (strcmp(type, "Uncached RAM") == 0)
Quoted 4 lines
_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
Thanks
Dave
_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
Quoted 6 lines · Yinghai Lu
For x86 with recent kernel after
commit640e1b38b0("x86/boot/e820: Basic cleanup ofe820.c")
change "reserved" to "Reserved" in /sys firmware memmap and/proc/iomem.So here, we add handling for that too.
Quoted 8 lines
Signed-off-by Yinghai Lu <[email protected]>--- kexec/arch/i386/crashdump-x86.c | 2 ++ kexec/arch/ia64/kexec-ia64.c | 2 ++ kexec/arch/mips/kexec-mips.c | 2 ++ kexec/firmware_memmap.c | 2 ++ 4 files changed, 8 insertions(+)
I'd rather fix the bug I introduced and undo the reserved->Reserved string change in e820.c: I didn't realize that it's exposed in sysfs and had quasi-ABI consequences for kexec.
Agreed?
Thanks,
Ingo
Quoted 11 lines · Ingo Molnar
Quoted 8 lines · Yinghai Lu
For x86 with recent kernel after
commit640e1b38b0("x86/boot/e820: Basic cleanup ofe820.c")
change "reserved" to "Reserved" in /sys firmware memmap and/proc/iomem.So here, we add handling for that too.
Signed-off-by Yinghai Lu <[email protected]>
Quoted 8 lines
Quoted 6 lines
--- kexec/arch/i386/crashdump-x86.c | 2 ++ kexec/arch/ia64/kexec-ia64.c | 2 ++ kexec/arch/mips/kexec-mips.c | 2 ++ kexec/firmware_memmap.c | 2 ++ 4 files changed, 8 insertions(+)I'd rather fix the bug I introduced and undo the
reserved->Reservedstring change
This patch parses both 'reserved' and 'Reserved' it should be fine, but reverting the change in kernel sounds better..
Quoted 5 lines
in
e820.c: I didn't realize that it's exposed in sysfs and had quasi-ABI consequences for kexec.Agreed?
Quoted 8 lines
Thanks,
Ingo
_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
Thanks
Dave
Quoted 19 lines · Dave Young
Quoted 18 lines · Ingo Molnar
Quoted 14 lines · Yinghai Lu
For x86 with recent kernel after
commit640e1b38b0("x86/boot/e820: Basic cleanup ofe820.c")
change "reserved" to "Reserved" in /sys firmware memmap and/proc/iomem.So here, we add handling for that too.
Signed-off-by Yinghai Lu <[email protected]>--- kexec/arch/i386/crashdump-x86.c | 2 ++ kexec/arch/ia64/kexec-ia64.c | 2 ++ kexec/arch/mips/kexec-mips.c | 2 ++ kexec/firmware_memmap.c | 2 ++ 4 files changed, 8 insertions(+)
Quoted 4 lines
Quoted 1 line
I'd rather fix the bug I introduced and undo the
reserved->Reservedstring changeThis patch parses both 'reserved' and 'Reserved' it should be fine, but reverting the change in kernel sounds better..
Hmm, after press sending I noticed old kexec-tools with new kernel, it is still a problem, so we'd better to revert the kernel changes.
Quoted 17 lines
Quoted 6 lines
in
e820.c: I didn't realize that it's exposed in sysfs and had quasi-ABI consequences for kexec.Agreed?
Quoted 8 lines
Thanks,
Ingo
_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexecThanks
Dave
Quoted 20 lines · Dave Young
Quoted 19 lines · Dave Young
Quoted 18 lines · Ingo Molnar
Quoted 14 lines · Yinghai Lu
For x86 with recent kernel after
commit640e1b38b0("x86/boot/e820: Basic cleanup ofe820.c")
change "reserved" to "Reserved" in /sys firmware memmap and/proc/iomem.So here, we add handling for that too.
Signed-off-by Yinghai Lu <[email protected]>--- kexec/arch/i386/crashdump-x86.c | 2 ++ kexec/arch/ia64/kexec-ia64.c | 2 ++ kexec/arch/mips/kexec-mips.c | 2 ++ kexec/firmware_memmap.c | 2 ++ 4 files changed, 8 insertions(+)
Quoted 7 lines
Quoted 4 lines
Quoted 1 line
I'd rather fix the bug I introduced and undo the
reserved->Reservedstring changeThis patch parses both 'reserved' and 'Reserved' it should be fine, but reverting the change in kernel sounds better..
Hmm, after press sending I noticed old kexec-tools with new kernel, it is still a problem, so we'd better to revert the kernel changes.
FWIW, if the kernel change hasn't hit a release then reverting (the reserved->Reserved portion of) it would be my preference.
Quoted 17 lines
Quoted 16 lines
Quoted 5 lines
in
e820.c: I didn't realize that it's exposed in sysfs and had quasi-ABI consequences for kexec.Agreed?
Quoted 8 lines
Thanks,
Ingo
_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexecThanks
Dave