kdump: arrange for paddr_vmcoreinfo_note() to return phys_addr_t

Russell King · sfrothwell · commit 8391635e1634 · 2016-06-08T09:38:42.000+10:00
On PAE systems (eg, ARM LPAE) the vmcore note may be located above 4GB physical on 32-bit architectures, so we need a wider type than "unsigned long" here. Arrange for paddr_vmcoreinfo_note() to return a phys_addr_t, thereby allowing it to be located above 4GB. This makes no difference for kexec-tools, as they already assume a 64-bit type when reading from this file. Link: http://lkml.kernel.org/r/E1b8koK-0004HS-K9@rmk-PC.armlinux.org.uk Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Reviewed-by: Pratyush Anand <panand@redhat.com> Acked-by: Baoquan He <bhe@redhat.com> Cc: Keerthy <j-keerthy@ti.com> Cc: Vitaly Andrianov <vitalya@ti.com> Cc: Eric Biederman <ebiederm@xmission.com> Cc: Dave Young <dyoung@redhat.com> Cc: Vivek Goyal <vgoyal@redhat.com> Cc: Simon Horman <horms@verge.net.au> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
diff --git a/arch/ia64/kernel/machine_kexec.c b/arch/ia64/kernel/machine_kexec.c
@@ -163,7 +163,7 @@ void arch_crash_save_vmcoreinfo(void)
 #endif
 }
 
-unsigned long paddr_vmcoreinfo_note(void)
+phys_addr_t paddr_vmcoreinfo_note(void)
 {
 	return ia64_tpa((unsigned long)(char *)&vmcoreinfo_note);
 }
diff --git a/include/linux/kexec.h b/include/linux/kexec.h
@@ -233,7 +233,7 @@ void crash_save_vmcoreinfo(void);
 void arch_crash_save_vmcoreinfo(void);
 __printf(1, 2)
 void vmcoreinfo_append_str(const char *fmt, ...);
-unsigned long paddr_vmcoreinfo_note(void);
+phys_addr_t paddr_vmcoreinfo_note(void);
 
 #define VMCOREINFO_OSRELEASE(value) \
 	vmcoreinfo_append_str("OSRELEASE=%s\n", value)
diff --git a/kernel/kexec_core.c b/kernel/kexec_core.c
@@ -1372,7 +1372,7 @@ void vmcoreinfo_append_str(const char *fmt, ...)
 void __weak arch_crash_save_vmcoreinfo(void)
 {}
 
-unsigned long __weak paddr_vmcoreinfo_note(void)
+phys_addr_t __weak paddr_vmcoreinfo_note(void)
 {
 	return __pa((unsigned long)(char *)&vmcoreinfo_note);
 }
diff --git a/kernel/ksysfs.c b/kernel/ksysfs.c
@@ -128,8 +128,8 @@ KERNEL_ATTR_RW(kexec_crash_size);
 static ssize_t vmcoreinfo_show(struct kobject *kobj,
 			       struct kobj_attribute *attr, char *buf)
 {
-	return sprintf(buf, "%lx %x\n",
-		       paddr_vmcoreinfo_note(),
+	phys_addr_t vmcore_base = paddr_vmcoreinfo_note();
+	return sprintf(buf, "%pa %x\n", &vmcore_base,
 		       (unsigned int)sizeof(vmcoreinfo_note));
 }
 KERNEL_ATTR_RO(vmcoreinfo);

Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ void arch_crash_save_vmcoreinfo(void)`
`163`	`163`	`#endif`
`164`	`164`	`}`
`165`	`165`
`166`		`-unsigned long paddr_vmcoreinfo_note(void)`
	`166`	`+phys_addr_t paddr_vmcoreinfo_note(void)`
`167`	`167`	`{`
`168`	`168`	`return ia64_tpa((unsigned long)(char *)&vmcoreinfo_note);`
`169`	`169`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1372,7 +1372,7 @@ void vmcoreinfo_append_str(const char *fmt, ...)`
`1372`	`1372`	`void __weak arch_crash_save_vmcoreinfo(void)`
`1373`	`1373`	`{}`
`1374`	`1374`
`1375`		`-unsigned long __weak paddr_vmcoreinfo_note(void)`
	`1375`	`+phys_addr_t __weak paddr_vmcoreinfo_note(void)`
`1376`	`1376`	`{`
`1377`	`1377`	`return __pa((unsigned long)(char *)&vmcoreinfo_note);`
`1378`	`1378`	`}`
Original file line number	Diff line number	Diff line change
`@@ -128,8 +128,8 @@ KERNEL_ATTR_RW(kexec_crash_size);`
`128`	`128`	`static ssize_t vmcoreinfo_show(struct kobject *kobj,`
`129`	`129`	`struct kobj_attribute attr, char buf)`
`130`	`130`	`{`
`131`		`- return sprintf(buf, "%lx %x\n",`
`132`		`- paddr_vmcoreinfo_note(),`
	`131`	`+ phys_addr_t vmcore_base = paddr_vmcoreinfo_note();`
	`132`	`+ return sprintf(buf, "%pa %x\n", &vmcore_base,`
`133`	`133`	`(unsigned int)sizeof(vmcoreinfo_note));`
`134`	`134`	`}`
`135`	`135`	`KERNEL_ATTR_RO(vmcoreinfo);`