Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d3b5d352 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 mm updates from Ingo Molnar:
 "The main x86 MM changes in this cycle were:

   - continued native kernel PCID support preparation patches to the TLB
     flushing code (Andy Lutomirski)

   - various fixes related to 32-bit compat syscall returning address
     over 4Gb in applications, launched from 64-bit binaries - motivated
     by C/R frameworks such as Virtuozzo. (Dmitry Safonov)

   - continued Intel 5-level paging enablement: in particular the
     conversion of x86 GUP to the generic GUP code. (Kirill A. Shutemov)

   - x86/mpx ABI corner case fixes/enhancements (Joerg Roedel)

   - ... plus misc updates, fixes and cleanups"

* 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (62 commits)
  mm, zone_device: Replace {get, put}_zone_device_page() with a single reference to fix pmem crash
  x86/mm: Fix flush_tlb_page() on Xen
  x86/mm: Make flush_tlb_mm_range() more predictable
  x86/mm: Remove flush_tlb() and flush_tlb_current_task()
  x86/vm86/32: Switch to flush_tlb_mm_range() in mark_screen_rdonly()
  x86/mm/64: Fix crash in remove_pagetable()
  Revert "x86/mm/gup: Switch GUP to the generic get_user_page_fast() implementation"
  x86/boot/e820: Remove a redundant self assignment
  x86/mm: Fix dump pagetables for 4 levels of page tables
  x86/mpx, selftests: Only check bounds-vs-shadow when we keep shadow
  x86/mpx: Correctly report do_mpx_bt_fault() failures to user-space
  Revert "x86/mm/numa: Remove numa_nodemask_from_meminfo()"
  x86/espfix: Add support for 5-level paging
  x86/kasan: Extend KASAN to support 5-level paging
  x86/mm: Add basic defines/helpers for CONFIG_X86_5LEVEL=y
  x86/paravirt: Add 5-level support to the paravirt code
  x86/mm: Define virtual memory map for 5-level paging
  x86/asm: Remove __VIRTUAL_MASK_SHIFT==47 assert
  x86/boot: Detect 5-level paging support
  x86/mm/numa: Remove numa_nodemask_from_meminfo()
  ...
parents aa2a4b65 71389703

Documentation/x86/x86_64/mm.txt

+33 −3
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
Virtual memory map with 4 level page tables:



0000000000000000 - 00007fffffffffff (=47 bits) user space, different per mm

hole caused by [48:63] sign extension

hole caused by [47:63] sign extension

ffff800000000000 - ffff87ffffffffff (=43 bits) guard hole, reserved for hypervisor

ffff880000000000 - ffffc7ffffffffff (=64 TB) direct mapping of all phys. memory

ffffc80000000000 - ffffc8ffffffffff (=40 bits) hole
@@ -19,16 +19,43 @@ ffffff0000000000 - ffffff7fffffffff (=39 bits) %esp fixup stacks 
ffffffef00000000 - fffffffeffffffff (=64 GB) EFI region mapping space

... unused hole ...

ffffffff80000000 - ffffffff9fffffff (=512 MB)  kernel text mapping, from phys 0

ffffffffa0000000 - ffffffffff5fffff (=1526 MB) module mapping space (variable)

ffffffffff600000 - ffffffffffdfffff (=8 MB) vsyscalls

ffffffffffe00000 - ffffffffffffffff (=2 MB) unused hole



Virtual memory map with 5 level page tables:



0000000000000000 - 00ffffffffffffff (=56 bits) user space, different per mm

hole caused by [56:63] sign extension

ff00000000000000 - ff0fffffffffffff (=52 bits) guard hole, reserved for hypervisor

ff10000000000000 - ff8fffffffffffff (=55 bits) direct mapping of all phys. memory

ff90000000000000 - ff91ffffffffffff (=49 bits) hole

ff92000000000000 - ffd1ffffffffffff (=54 bits) vmalloc/ioremap space

ffd2000000000000 - ffd3ffffffffffff (=49 bits) hole

ffd4000000000000 - ffd5ffffffffffff (=49 bits) virtual memory map (512TB)

... unused hole ...

ffd8000000000000 - fff7ffffffffffff (=53 bits) kasan shadow memory (8PB)

... unused hole ...

ffffff0000000000 - ffffff7fffffffff (=39 bits) %esp fixup stacks

... unused hole ...

ffffffef00000000 - fffffffeffffffff (=64 GB) EFI region mapping space

... unused hole ...

ffffffff80000000 - ffffffff9fffffff (=512 MB)  kernel text mapping, from phys 0

ffffffffa0000000 - ffffffffff5fffff (=1526 MB) module mapping space

ffffffffff600000 - ffffffffffdfffff (=8 MB) vsyscalls

ffffffffffe00000 - ffffffffffffffff (=2 MB) unused hole



Architecture defines a 64-bit virtual address. Implementations can support

less. Currently supported are 48- and 57-bit virtual addresses. Bits 63

through to the most-significant implemented bit are set to either all ones

or all zero. This causes hole between user space and kernel addresses.



The direct mapping covers all memory in the system up to the highest

memory address (this means in some cases it can also include PCI memory

holes).



vmalloc space is lazily synchronized into the different PML4 pages of

the processes using the page fault handler, with init_level4_pgt as

vmalloc space is lazily synchronized into the different PML4/PML5 pages of

the processes using the page fault handler, with init_top_pgt as

reference.



Current X86-64 implementations support up to 46 bits of address space (64 TB),
@@ -39,6 +66,9 @@ memory window (this size is arbitrary, it can be raised later if needed). 
The mappings are not part of any other kernel PGD and are only available

during EFI runtime calls.



The module mapping space size changes based on the CONFIG requirements for the

following fixmap section.



Note that if CONFIG_RANDOMIZE_MEMORY is enabled, the direct mapping of all

physical memory, vmalloc/ioremap space and virtual memory map are randomized.

Their order is preserved but their base will be offset early at boot time.

arch/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -700,6 +700,13 @@ config ARCH_MMAP_RND_COMPAT_BITS 
	  This value can be changed after boot using the

	  /proc/sys/vm/mmap_rnd_compat_bits tunable



config HAVE_ARCH_COMPAT_MMAP_BASES

	bool

	help

	  This allows 64bit applications to invoke 32-bit mmap() syscall

	  and vice-versa 32-bit applications to call 64-bit mmap().

	  Required for applications doing different bitness syscalls.



config HAVE_COPY_THREAD_TLS

	bool

	help

arch/powerpc/include/asm/mmu_context.h

+0 −6
Original line number Diff line number Diff line
@@ -163,11 +163,5 @@ static inline bool arch_vma_access_permitted(struct vm_area_struct *vma, 
	/* by default, allow everything */

	return true;

}



static inline bool arch_pte_access_permitted(pte_t pte, bool write)

{

	/* by default, allow everything */

	return true;

}

#endif /* __KERNEL__ */

#endif /* __ASM_POWERPC_MMU_CONTEXT_H */

arch/s390/include/asm/mmu_context.h

+0 −6
Original line number Diff line number Diff line
@@ -156,10 +156,4 @@ static inline bool arch_vma_access_permitted(struct vm_area_struct *vma, 
	/* by default, allow everything */

	return true;

}



static inline bool arch_pte_access_permitted(pte_t pte, bool write)

{

	/* by default, allow everything */

	return true;

}

#endif /* __S390_MMU_CONTEXT_H */

arch/um/include/asm/mmu_context.h

+0 −6
Original line number Diff line number Diff line
@@ -37,12 +37,6 @@ static inline bool arch_vma_access_permitted(struct vm_area_struct *vma, 
	return true;

}



static inline bool arch_pte_access_permitted(pte_t pte, bool write)

{

	/* by default, allow everything */

	return true;

}



/*

 * end asm-generic/mm_hooks.h functions

 */