Skip to content
  • Linus Torvalds's avatar
    Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · abb7099d
    Linus Torvalds authored
    Pull  more x86 pti fixes from Thomas Gleixner:
     "Another small stash of fixes for fallout from the PTI work:
    
       - Fix the modules vs. KASAN breakage which was caused by making
         MODULES_END depend of the fixmap size. That was done when the cpu
         entry area moved into the fixmap, but now that we have a separate
         map space for that this is causing more issues than it solves.
    
       - Use the proper cache flush methods for the debugstore buffers as
         they are mapped/unmapped during runtime and not statically mapped
         at boot time like the rest of the cpu entry area.
    
       - Make the map layout of the cpu_entry_area consistent for 4 and 5
         level paging and fix the KASLR vaddr_end wreckage.
    
       - Use PER_CPU_EXPORT for per cpu variable and while at it unbreak
         nvidia gfx drivers by dropping the GPL export. The subject line of
         the commit tells it the other way around, but I noticed that too
         late.
    
       - Fix the ASM alternative macros so they can be used in the middle of
         an inline asm block.
    
       - Rename the BUG_CPU_INSECURE flag to BUG_CPU_MELTDOWN so the attack
         vector is properly identified. The Spectre mitigations will come
         with their own bug bits later"
    
    * 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
      x86/pti: Rename BUG_CPU_INSECURE to BUG_CPU_MELTDOWN
      x86/alternatives: Add missing '\n' at end of ALTERNATIVE inline asm
      x86/tlb: Drop the _GPL from the cpu_tlbstate export
      x86/events/intel/ds: Use the proper cache flush method for mapping ds buffers
      x86/kaslr: Fix the vaddr_end mess
      x86/mm: Map cpu_entry_area at the same place on 4/5 level
      x86/mm: Set MODULES_END to 0xffffffffff000000
    abb7099d