Skip to contentSkip to conversation

Routines for copying dump pages

PATCH In review Vivek Goyal 1 participant 1 message Mar 28, 2005

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

PATCH 10/17 Routines for copying dump pages

From: "Vivek Goyal" <[email protected]>

o Moved architecture independent crash_dump.c and crash_dump.h file creation code from crashdump-memory-preserving-reboot-using-kexec.patch to here. This makes more logical sense.

From: "Eric W. Biederman" <[email protected]>

kernel/crash.c has been renamed kernel/crash_dump.c to clarify it's purpose.

From: Hariprasad Nellitheertha <[email protected]>

This patch provides the interfaces necessary to read the dump contents, treating it as a high memory device.

Signed off by Hariprasad Nellitheertha <[email protected]>

---

 linux-2.6.12-rc1-mm1-1M-root/arch/i386/mm/highmem.c     |   18 ++++++
 linux-2.6.12-rc1-mm1-1M-root/include/asm-i386/highmem.h |    1 
 linux-2.6.12-rc1-mm1-1M-root/include/linux/crash_dump.h |   12 ++++
 linux-2.6.12-rc1-mm1-1M-root/include/linux/highmem.h    |    1 
 linux-2.6.12-rc1-mm1-1M-root/kernel/Makefile            |    1 
 linux-2.6.12-rc1-mm1-1M-root/kernel/crash_dump.c        |   46 ++++++++++++++++
 6 files changed, 79 insertions(+)
arch/i386/mm/highmem.c renamed from arch/i386/mm/highmem.c~crashdump-routines-for-copying-dump-pages +18 -0
diff -puN arch/i386/mm/highmem.c~crashdump-routines-for-copying-dump-pages arch/i386/mm/highmem.c
@@ -74,6 +74,24 @@ void kunmap_atomic(void *kvaddr, enum km
 	preempt_check_resched();
 }
 
+/* This is the same as kmap_atomic() but can map memory that doesn't
+ * have a struct page associated with it.
+ */
+void *kmap_atomic_pfn(unsigned long pfn, enum km_type type)
+{
+	enum fixed_addresses idx;
+	unsigned long vaddr;
+
+	inc_preempt_count();
+
+	idx = type + KM_TYPE_NR*smp_processor_id();
+	vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
+	set_pte(kmap_pte-idx, pfn_pte(pfn, kmap_prot));
+	__flush_tlb_one(vaddr);
+
+	return (void*) vaddr;
+}
+
 struct page *kmap_atomic_to_page(void *ptr)
 {
 	unsigned long idx, vaddr = (unsigned long)ptr;
include/asm-i386/highmem.h renamed from include/asm-i386/highmem.h~crashdump-routines-for-copying-dump-pages +1 -0
diff -puN include/asm-i386/highmem.h~crashdump-routines-for-copying-dump-pages include/asm-i386/highmem.h
@@ -70,6 +70,7 @@ void *kmap(struct page *page);
 void kunmap(struct page *page);
 void *kmap_atomic(struct page *page, enum km_type type);
 void kunmap_atomic(void *kvaddr, enum km_type type);
+void *kmap_atomic_pfn(unsigned long pfn, enum km_type type);
 struct page *kmap_atomic_to_page(void *ptr);
 
 #define flush_cache_kmaps()	do { } while (0)
include/linux/crash_dump.h new file +12 -0
diff -puN /dev/null include/linux/crash_dump.h
@@ -0,0 +1,12 @@
+#ifndef LINUX_CRASH_DUMP_H
+#define LINUX_CRASH_DUMP_H
+
+#ifdef CONFIG_CRASH_DUMP
+#include <linux/kexec.h>
+#include <linux/smp_lock.h>
+#include <linux/device.h>
+#include <linux/proc_fs.h>
+
+extern ssize_t copy_oldmem_page(unsigned long, char *, size_t, int);
+#endif /* CONFIG_CRASH_DUMP */
+#endif /* LINUX_CRASHDUMP_H */
include/linux/highmem.h renamed from include/linux/highmem.h~crashdump-routines-for-copying-dump-pages +1 -0
diff -puN include/linux/highmem.h~crashdump-routines-for-copying-dump-pages include/linux/highmem.h
@@ -28,6 +28,7 @@ static inline void *kmap(struct page *pa
 
 #define kmap_atomic(page, idx)		page_address(page)
 #define kunmap_atomic(addr, idx)	do { } while (0)
+#define kmap_atomic_pfn(pfn, idx)	page_address(pfn_to_page(pfn))
 #define kmap_atomic_to_page(ptr)	virt_to_page(ptr)
 
 #endif /* CONFIG_HIGHMEM */
kernel/crash_dump.c new file +46 -0

46 lines not on this page · raw message

kernel/Makefile renamed from kernel/Makefile~crashdump-routines-for-copying-dump-pages +1 -0
diff -puN kernel/Makefile~crashdump-routines-for-copying-dump-pages kernel/Makefile
@@ -29,6 +29,7 @@ obj-$(CONFIG_KPROBES) += kprobes.o
 obj-$(CONFIG_SYSFS) += ksysfs.o
 obj-$(CONFIG_DETECT_SOFTLOCKUP) += softlockup.o
 obj-$(CONFIG_GENERIC_HARDIRQS) += irq/
+obj-$(CONFIG_CRASH_DUMP) += crash_dump.o
 obj-$(CONFIG_SECCOMP) += seccomp.o
 
 ifneq ($(CONFIG_IA64),y)

_