x86 updates
Linus,
please pull x86 updates from
ssh://master.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86.git
The updates are:
- fix the fallout of the CPA changes. This fixes the review issues and some other problems, which were discovered by extended testcases.
- fix for NUMA systems were node 0 is not online
- lguest build fix which Rusty asked us to merge
Thanks,
tglx
---
Rusty Russell (1):
x86: fix lguest build failure
Thomas Gleixner (4):
x86: CPA, fix alias checks
x86: zap invalid and unused pmds in early boot
x86: CPA no alias checking for _NX
x86: CPA: avoid double checking of alias ranges
Yinghai Lu (1):
x86: reenable support for system without on node0
arch/x86/kernel/asm-offsets_32.c | 6 +- arch/x86/kernel/head64.c | 3 + arch/x86/kernel/head_64.S | 7 +- arch/x86/mm/init_64.c | 27 +++++ arch/x86/mm/numa_64.c | 5 +- arch/x86/mm/pageattr.c | 208 ++++++++++++++++++++------------------ include/asm-x86/pgtable_64.h | 1 + 7 files changed, 154 insertions(+), 103 deletions(-)
arch/x86/kernel/asm-offsets_32.c +4 -2
@@ -20,10 +20,8 @@#include <xen/interface/xen.h> -#ifdef CONFIG_LGUEST_GUEST #include <linux/lguest.h> #include "../../../drivers/lguest/lg.h" -#endif #define DEFINE (sym, val) \ asm volatile("\n->" #sym " %0 " #val : : "i" (val))
@@ -134,6 +132,10 @@ void foo(void)BLANK ();OFFSET (LGUEST_DATA_irq_enabled, lguest_data, irq_enabled);OFFSET (LGUEST_DATA_pgdir, lguest_data, pgdir); +#endif + +#ifdef CONFIG_LGUEST +BLANK ();OFFSET (LGUEST_PAGES_host_gdt_desc, lguest_pages, state.host_gdt_desc);OFFSET (LGUEST_PAGES_host_idt_desc, lguest_pages, state.host_idt_desc);OFFSET (LGUEST_PAGES_host_cr3, lguest_pages, state.host_cr3);
arch/x86/kernel/head64.c +3 -0
@@ -88,6 +88,9 @@ void __init x86_64_start_kernel(char * real_mode_data)/* Make NULL pointers segfault */ zap_identity_mappings (); +/* Cleanup the over mapped high alias */ +cleanup_highmap (); +for (i =0 ; i <IDT_ENTRIES ; i++) {#ifdef CONFIG_EARLY_PRINTK set_intr_gate (i, &early_idt_handlers[i]);
arch/x86/kernel/head_64.S +6 -1
@@ -107,8 +107,13 @@ startup_64: movq %rdx, 0(%rbx, %rax, 8) ident_complete: - /* Fixup the kernel text+data virtual addresses + /* + * Fixup the kernel text+data virtual addresses. Note that + * we might write invalid pmds, when the kernel is relocated + * cleanup_highmap() fixes this up along with the mappings + * beyond _end. */ + leaq level2_kernel_pgt(%rip), %rdi leaq 4096(%rdi), %r8 /* See if it is a valid page table entry */
arch/x86/mm/init_64.c +27 -0
@@ -171,6 +171,33 @@ set_pte_phys(unsigned long vaddr, unsigned long phys, pgprot_t prot)__flush_tlb_one (vaddr); } +/* +* The head.S code sets up the kernel high mapping from: +* __START_KERNEL_map to __START_KERNEL_map + KERNEL_TEXT_SIZE +* +* phys_addr holds the negative offset to the kernel, which is added +* to the compile time generated pmds. This results in invalid pmds up +* to the point where we hit the physaddr 0 mapping. +* +* We limit the mappings to the region from _text to _end. _end is +* rounded up to the 2MB boundary. This catches the invalid pmds as +* well, as they are located before _text: +*/ +void __init cleanup_highmap (void ) +{ +unsigned long vaddr = __START_KERNEL_map; +unsigned long end =round_up ((unsigned long )_end,PMD_SIZE ) -1 ; +pmd_t *pmd = level2_kernel_pgt; +pmd_t *last_pmd = pmd +PTRS_PER_PMD ; + +for (; pmd < last_pmd; pmd++, vaddr +=PMD_SIZE ) { +if (!pmd_present (*pmd)) +continue ; +if (vaddr < (unsigned long ) _text || vaddr > end) +set_pmd (pmd,__pmd (0 )); + } +} +/* NOTE: this is meant to be run only at boot */ void __init __set_fixmap (enum fixed_addresses idx,unsigned long phys,pgprot_t prot)
arch/x86/mm/numa_64.c +4 -1
@@ -494,11 +494,13 @@ void __init numa_initmem_init(unsigned long start_pfn, unsigned long end_pfn)int i;nodes_clear (node_possible_map); +nodes_clear (node_online_map);#ifdef CONFIG_NUMA_EMU if (cmdline && !numa_emulation (start_pfn, end_pfn))return ;nodes_clear (node_possible_map); +nodes_clear (node_online_map);#endif #ifdef CONFIG_ACPI_NUMA
@@ -506,6 +508,7 @@ void __init numa_initmem_init(unsigned long start_pfn, unsigned long end_pfn) end_pfn << PAGE_SHIFT))return ;nodes_clear (node_possible_map); +nodes_clear (node_online_map);#endif #ifdef CONFIG_K8_NUMA
@@ -513,6 +516,7 @@ void __init numa_initmem_init(unsigned long start_pfn, unsigned long end_pfn) end_pfn<<PAGE_SHIFT))return ;nodes_clear (node_possible_map); +nodes_clear (node_online_map);#endif printk (KERN_INFO "%s\n" , numa_off ?"NUMA turned off" :"No NUMA configuration found" );
@@ -524,7 +528,6 @@ void __init numa_initmem_init(unsigned long start_pfn, unsigned long end_pfn) memnode_shift =63 ; memnodemap = memnode.embedded_map; memnodemap[0 ] =0 ; -nodes_clear (node_online_map);node_set_online (0 );node_set (0 , node_possible_map);for (i =0 ; i <NR_CPUS ; i++)
arch/x86/mm/pageattr.c +109 -99
355 lines not on this page · raw message
include/asm-x86/pgtable_64.h +1 -0
@@ -246,6 +246,7 @@ static inline int pud_large(pud_t pte)#define __swp_entry_to_pte (x) ((pte_t) { .pte = (x).val })extern int kern_addr_valid (unsigned long addr); +extern void cleanup_highmap (void );#define io_remap_pfn_range (vma, vaddr, pfn, size, prot) \ remap_pfn_range(vma, vaddr, pfn, size, prot)