Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

x86, kexec, 64bit: Only set ident mapping for ram.

We should set mappings only for usable memory ranges under max_pfn
Otherwise causes same problem that is fixed by

x86, mm: Only direct map addresses that are marked as E820_RAM

This patch exposes pfn_mapped array, and only sets ident mapping for ranges
in that array.

This patch relies on new kernel_ident_mapping_init that could handle existing
pgd/pud between different calls.

Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Link: http://lkml.kernel.org/r/1359058816-7615-25-git-send-email-yinghai@kernel.org
Cc: Alexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

authored by

Yinghai Lu and committed by
H. Peter Anvin
0e691cf8 9ebdc79f

+15 -6
+4
arch/x86/include/asm/page.h
··· 17 17 18 18 struct page; 19 19 20 + #include <linux/range.h> 21 + extern struct range pfn_mapped[]; 22 + extern int nr_pfn_mapped; 23 + 20 24 static inline void clear_user_page(void *page, unsigned long vaddr, 21 25 struct page *pg) 22 26 {
+9 -4
arch/x86/kernel/machine_kexec_64.c
··· 100 100 101 101 level4p = (pgd_t *)__va(start_pgtable); 102 102 clear_page(level4p); 103 - result = kernel_ident_mapping_init(&info, level4p, 104 - 0, max_pfn << PAGE_SHIFT); 105 - if (result) 106 - return result; 103 + for (i = 0; i < nr_pfn_mapped; i++) { 104 + mstart = pfn_mapped[i].start << PAGE_SHIFT; 105 + mend = pfn_mapped[i].end << PAGE_SHIFT; 106 + 107 + result = kernel_ident_mapping_init(&info, 108 + level4p, mstart, mend); 109 + if (result) 110 + return result; 111 + } 107 112 108 113 /* 109 114 * segments's mem ranges could be outside 0 ~ max_pfn,
+2 -2
arch/x86/mm/init.c
··· 302 302 return nr_range; 303 303 } 304 304 305 - static struct range pfn_mapped[E820_X_MAX]; 306 - static int nr_pfn_mapped; 305 + struct range pfn_mapped[E820_X_MAX]; 306 + int nr_pfn_mapped; 307 307 308 308 static void add_pfn_range_mapped(unsigned long start_pfn, unsigned long end_pfn) 309 309 {