Skip to contentSkip to conversation

kdump: make saved_max_pfn exlusive

PATCH Superseded HATAYAMA Daisuke 1 participant 5 messages Feb 4, 2013

Subsystems (6)
lore
Share & tools
lore
#0 lore raw

cover kdump: make saved_max_pfn exlusive

First, there are two kinds of notation to represent a map: inclusive and exclusive. Here are the examples:

1) [mem 0x0000000100000000-0x000000013fffffff]
2) [mem 0x0000000100000000-0x0000000140000000]

1) is inclusive and 2) is exclusive. In case of 1), the pfn calculated from the end address belongs to the map, while in case of 2), it doesn't.

Currently, saved_max_pfn is used in read_oldmem() as inclusive for a check to see if a given request is to within kernel's memory mapping regions.

	while (count) {
		pfn = *ppos / PAGE_SIZE;
		if (pfn > saved_max_pfn)
		   	return read;

Unfortunately, on x86 and ia64, there are bugs below:

- On the 1st kernel, saved_max_pfn is not initialized so 0. Then, read to pfn 0 is not guarded by the condition and the execution goes into ioremap path.

- On the 2nd kernel, x86 and ia64 wrongly initializes saved_max_pfn by exclusive value, on x86 as:

	saved_max_pfn = e820_end_of_ram_pfn();

by which via /dev/oldmem we can read max_pfn that is not kernel's memory.

To fix this, fixing x86 and ia64 part needs smaller change, but max_pfn is originally treated as exclusive so saved_max_pfn should normally be exclusive. Also, the memory map information passed from kexec is all exclusive on every architectures; it's possible to make saved_max_pfn exclusive now.

However, ppc and ppc64 on kexec doesn't increment end address now and this should be done as an insurance when map passed from firmware is inclusive, for which I'll post a patch later.

---

HATAYAMA Daisuke (4):
kdump, oldmem: compare with saved_max_pfn exclusively kdump, s390: make saved_max_pfn exclusive kdump, ppc: make saved_max_pfn exclusive kdump, mips: make saved_max_pfn exclusive

 arch/mips/kernel/crash_dump.c    |    2 +-
 arch/powerpc/kernel/crash_dump.c |    2 +-
 arch/s390/kernel/setup.c         |    4 ++--
 drivers/char/mem.c               |    2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
Signature · 2 lines
Thanks.
HATAYAMA, Daisuke
#1 lore raw

PATCH 1/4 kdump, mips: make saved_max_pfn exclusive

---

 arch/mips/kernel/crash_dump.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/mips/kernel/crash_dump.c +1 -1
index 35bed0d..6621211 100644
@@ -6,7 +6,7 @@
 static int __init parse_savemaxmem(char *p)
 {
 	if (p)
-		saved_max_pfn = (memparse(p, &p) >> PAGE_SHIFT) - 1;
+		saved_max_pfn = (memparse(p, &p) >> PAGE_SHIFT);
 
 	return 1;
 }

_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec

#2 lore raw

PATCH 2/4 kdump, ppc: make saved_max_pfn exclusive

In reply to HATAYAMA Daisuke

---

 arch/powerpc/kernel/crash_dump.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/powerpc/kernel/crash_dump.c +1 -1
index b3ba516..fa64170 100644
@@ -72,7 +72,7 @@ void __init setup_kdump_trampoline(void)
 static int __init parse_savemaxmem(char *p)
 {
 	if (p)
-		saved_max_pfn = (memparse(p, &p) >> PAGE_SHIFT) - 1;
+		saved_max_pfn = (memparse(p, &p) >> PAGE_SHIFT);
 
 	return 1;
 }

_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec

#3 lore raw

PATCH 3/4 kdump, s390: make saved_max_pfn exclusive

In reply to HATAYAMA Daisuke

---

 arch/s390/kernel/setup.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
arch/s390/kernel/setup.c +2 -2
index a5360de..3357566 100644
@@ -729,9 +729,9 @@ static void reserve_oldmem(void)
 	reserve_kdump_bootmem(OLDMEM_SIZE, memory_end - OLDMEM_SIZE,
 			      CHUNK_OLDMEM);
 	if (OLDMEM_BASE + OLDMEM_SIZE == real_memory_size)
-		saved_max_pfn = PFN_DOWN(OLDMEM_BASE) - 1;
+		saved_max_pfn = PFN_DOWN(OLDMEM_BASE);
 	else
-		saved_max_pfn = PFN_DOWN(real_memory_size) - 1;
+		saved_max_pfn = PFN_DOWN(real_memory_size);
 #endif
 }
 

_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec

#4 lore raw

PATCH 4/4 kdump, oldmem: compare with saved_max_pfn exclusively

In reply to HATAYAMA Daisuke

---

 drivers/char/mem.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/char/mem.c +1 -1
index c6fa3bc..5da737c 100644
@@ -369,7 +369,7 @@ static ssize_t read_oldmem(struct file *file, char __user *buf,
 
 	while (count) {
 		pfn = *ppos / PAGE_SIZE;
-		if (pfn > saved_max_pfn)
+		if (!(pfn < saved_max_pfn))
 			return read;
 
 		offset = (unsigned long)(*ppos % PAGE_SIZE);

_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec