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

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

Pull x86 fixes from Thomas Gleixner:
 "A set of x86 fixes:

   - Cure the LDT remapping to user space on 5 level paging which ended
     up in the KASLR space

   - Remove LDT mapping before freeing the LDT pages

   - Make NFIT MCE handling more robust

   - Unbreak the VSMP build by removing the dependency on paravirt ops

   - Support broken PIT emulation on Microsoft hyperV

   - Don't trace vmware_sched_clock() to avoid tracer recursion

   - Remove -pipe from KBUILD CFLAGS which breaks clang and is also
     slower on GCC

   - Trivial coding style and typo fixes"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/cpu/vmware: Do not trace vmware_sched_clock()
  x86/vsmp: Remove dependency on pv_irq_ops
  x86/ldt: Remove unused variable in map_ldt_struct()
  x86/ldt: Unmap PTEs for the slot before freeing LDT pages
  x86/mm: Move LDT remap out of KASLR region on 5-level paging
  acpi/nfit, x86/mce: Validate a MCE's address before using it
  acpi/nfit, x86/mce: Handle only uncorrectable machine checks
  x86/build: Remove -pipe from KBUILD_CFLAGS
  x86/hyper-v: Fix indentation in hv_do_fast_hypercall16()
  Documentation/x86: Fix typo in zero-page.txt
  x86/hyper-v: Enable PIT shutdown quirk
  clockevents/drivers/i8253: Add support for PIT shutdown quirk
parents 655c6b97 15035388

Documentation/x86/x86_64/mm.txt

+18 −16
Original line number Diff line number Diff line
@@ -34,23 +34,24 @@ __________________|____________|__________________|_________|___________________ 
____________________________________________________________|___________________________________________________________

                  |            |                  |         |

 ffff800000000000 | -128    TB | ffff87ffffffffff |    8 TB | ... guard hole, also reserved for hypervisor

 ffff880000000000 | -120    TB | ffffc7ffffffffff |   64 TB | direct mapping of all physical memory (page_offset_base)

 ffffc80000000000 |  -56    TB | ffffc8ffffffffff |    1 TB | ... unused hole

 ffff880000000000 | -120    TB | ffff887fffffffff |  0.5 TB | LDT remap for PTI

 ffff888000000000 | -119.5  TB | ffffc87fffffffff |   64 TB | direct mapping of all physical memory (page_offset_base)

 ffffc88000000000 |  -55.5  TB | ffffc8ffffffffff |  0.5 TB | ... unused hole

 ffffc90000000000 |  -55    TB | ffffe8ffffffffff |   32 TB | vmalloc/ioremap space (vmalloc_base)

 ffffe90000000000 |  -23    TB | ffffe9ffffffffff |    1 TB | ... unused hole

 ffffea0000000000 |  -22    TB | ffffeaffffffffff |    1 TB | virtual memory map (vmemmap_base)

 ffffeb0000000000 |  -21    TB | ffffebffffffffff |    1 TB | ... unused hole

 ffffec0000000000 |  -20    TB | fffffbffffffffff |   16 TB | KASAN shadow memory

 fffffc0000000000 |   -4    TB | fffffdffffffffff |    2 TB | ... unused hole

                  |            |                  |         | vaddr_end for KASLR

 fffffe0000000000 |   -2    TB | fffffe7fffffffff |  0.5 TB | cpu_entry_area mapping

 fffffe8000000000 |   -1.5  TB | fffffeffffffffff |  0.5 TB | LDT remap for PTI

 ffffff0000000000 |   -1    TB | ffffff7fffffffff |  0.5 TB | %esp fixup stacks

__________________|____________|__________________|_________|____________________________________________________________

                                                            |

                                                            | Identical layout to the 47-bit one from here on:

                                                            | Identical layout to the 56-bit one from here on:

____________________________________________________________|____________________________________________________________

                  |            |                  |         |

 fffffc0000000000 |   -4    TB | fffffdffffffffff |    2 TB | ... unused hole

                  |            |                  |         | vaddr_end for KASLR

 fffffe0000000000 |   -2    TB | fffffe7fffffffff |  0.5 TB | cpu_entry_area mapping

 fffffe8000000000 |   -1.5  TB | fffffeffffffffff |  0.5 TB | ... unused hole

 ffffff0000000000 |   -1    TB | ffffff7fffffffff |  0.5 TB | %esp fixup stacks

 ffffff8000000000 | -512    GB | ffffffeeffffffff |  444 GB | ... unused hole

 ffffffef00000000 |  -68    GB | fffffffeffffffff |   64 GB | EFI region mapping space

 ffffffff00000000 |   -4    GB | ffffffff7fffffff |    2 GB | ... unused hole
@@ -83,7 +84,7 @@ Notes: 
__________________|____________|__________________|_________|___________________________________________________________

                  |            |                  |         |

 0000800000000000 |  +64    PB | ffff7fffffffffff | ~16K PB | ... huge, still almost 64 bits wide hole of non-canonical

                  |            |                  |         |     virtual memory addresses up to the -128 TB

                  |            |                  |         |     virtual memory addresses up to the -64 PB

                  |            |                  |         |     starting offset of kernel mappings.

__________________|____________|__________________|_________|___________________________________________________________

                                                            |
@@ -91,23 +92,24 @@ __________________|____________|__________________|_________|___________________ 
____________________________________________________________|___________________________________________________________

                  |            |                  |         |

 ff00000000000000 |  -64    PB | ff0fffffffffffff |    4 PB | ... guard hole, also reserved for hypervisor

 ff10000000000000 |  -60    PB | ff8fffffffffffff |   32 PB | direct mapping of all physical memory (page_offset_base)

 ff90000000000000 |  -28    PB | ff9fffffffffffff |    4 PB | LDT remap for PTI

 ff10000000000000 |  -60    PB | ff10ffffffffffff | 0.25 PB | LDT remap for PTI

 ff11000000000000 |  -59.75 PB | ff90ffffffffffff |   32 PB | direct mapping of all physical memory (page_offset_base)

 ff91000000000000 |  -27.75 PB | ff9fffffffffffff | 3.75 PB | ... unused hole

 ffa0000000000000 |  -24    PB | ffd1ffffffffffff | 12.5 PB | vmalloc/ioremap space (vmalloc_base)

 ffd2000000000000 |  -11.5  PB | ffd3ffffffffffff |  0.5 PB | ... unused hole

 ffd4000000000000 |  -11    PB | ffd5ffffffffffff |  0.5 PB | virtual memory map (vmemmap_base)

 ffd6000000000000 |  -10.5  PB | ffdeffffffffffff | 2.25 PB | ... unused hole

 ffdf000000000000 |   -8.25 PB | fffffdffffffffff |   ~8 PB | KASAN shadow memory

 fffffc0000000000 |   -4    TB | fffffdffffffffff |    2 TB | ... unused hole

                  |            |                  |         | vaddr_end for KASLR

 fffffe0000000000 |   -2    TB | fffffe7fffffffff |  0.5 TB | cpu_entry_area mapping

 fffffe8000000000 |   -1.5  TB | fffffeffffffffff |  0.5 TB | ... unused hole

 ffffff0000000000 |   -1    TB | ffffff7fffffffff |  0.5 TB | %esp fixup stacks

__________________|____________|__________________|_________|____________________________________________________________

                                                            |

                                                            | Identical layout to the 47-bit one from here on:

____________________________________________________________|____________________________________________________________

                  |            |                  |         |

 fffffc0000000000 |   -4    TB | fffffdffffffffff |    2 TB | ... unused hole

                  |            |                  |         | vaddr_end for KASLR

 fffffe0000000000 |   -2    TB | fffffe7fffffffff |  0.5 TB | cpu_entry_area mapping

 fffffe8000000000 |   -1.5  TB | fffffeffffffffff |  0.5 TB | ... unused hole

 ffffff0000000000 |   -1    TB | ffffff7fffffffff |  0.5 TB | %esp fixup stacks

 ffffff8000000000 | -512    GB | ffffffeeffffffff |  444 GB | ... unused hole

 ffffffef00000000 |  -68    GB | fffffffeffffffff |   64 GB | EFI region mapping space

 ffffffff00000000 |   -4    GB | ffffffff7fffffff |    2 GB | ... unused hole

Documentation/x86/zero-page.txt

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ Offset Proto Name Meaning 
0C8/004	ALL	ext_cmd_line_ptr  cmd_line_ptr high 32bits

140/080	ALL	edid_info	Video mode setup (struct edid_info)

1C0/020	ALL	efi_info	EFI 32 information (struct efi_info)

1E0/004	ALL	alk_mem_k	Alternative mem check, in KB

1E0/004	ALL	alt_mem_k	Alternative mem check, in KB

1E4/004	ALL	scratch		Scratch field for the kernel setup code

1E8/001	ALL	e820_entries	Number of entries in e820_table (below)

1E9/001	ALL	eddbuf_entries	Number of entries in eddbuf (below)

arch/x86/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -525,7 +525,6 @@ config X86_VSMP 
	bool "ScaleMP vSMP"

	select HYPERVISOR_GUEST

	select PARAVIRT

	select PARAVIRT_XXL

	depends on X86_64 && PCI

	depends on X86_EXTENDED_PLATFORM

	depends on SMP

arch/x86/Makefile

+1 −3
Original line number Diff line number Diff line
@@ -213,8 +213,6 @@ ifdef CONFIG_X86_64 
KBUILD_LDFLAGS += $(call ld-option, -z max-page-size=0x200000)

endif



# Speed up the build

KBUILD_CFLAGS += -pipe

# Workaround for a gcc prelease that unfortunately was shipped in a suse release

KBUILD_CFLAGS += -Wno-sign-compare

#
@@ -239,7 +237,7 @@ archheaders: 
archmacros:

	$(Q)$(MAKE) $(build)=arch/x86/kernel arch/x86/kernel/macros.s



ASM_MACRO_FLAGS = -Wa,arch/x86/kernel/macros.s -Wa,-

ASM_MACRO_FLAGS = -Wa,arch/x86/kernel/macros.s

export ASM_MACRO_FLAGS

KBUILD_CFLAGS += $(ASM_MACRO_FLAGS)

arch/x86/include/asm/mce.h

+2 −0
Original line number Diff line number Diff line
@@ -221,6 +221,8 @@ static inline void mce_hygon_feature_init(struct cpuinfo_x86 *c) { return mce_am 


int mce_available(struct cpuinfo_x86 *c);

bool mce_is_memory_error(struct mce *m);

bool mce_is_correctable(struct mce *m);

int mce_usable_address(struct mce *m);



DECLARE_PER_CPU(unsigned, mce_exception_count);

DECLARE_PER_CPU(unsigned, mce_poll_count);

CRA Git | Maintained and supported by SUSTech CRA and CCSE