Merge v4.4.110 into chromeos-4.4 |
|||
Issue descriptionPlaceholder bug for merge of v4.4.110 into chromeos-4.4.
,
Jan 9 2018
The following revision refers to this bug: https://chromium.googlesource.com/chromiumos/third_party/kernel/+/28db5b350709dae6cb46f46e09bbcfe2bf218d8d commit 28db5b350709dae6cb46f46e09bbcfe2bf218d8d Author: Guenter Roeck <groeck@chromium.org> Date: Mon Jan 08 20:36:44 2018 CHROMIUM: Merge 'chromeos-4.4-kaiser-reverted' into chromeos-4.4 Merge of chromeos-4.4-kaiser-reverted into chromeos-4.4 Changelog: ---------------------------------------------------------------- Guenter Roeck (25): Revert "CHROMIUM: x86, kaiser: Allow CONFIG_KAISER and CONFIG_PARAVIRT" Revert "CHROMIUM: x86, kaiser, kvm: Enable pvclock with kaiser" Revert "CHROMIUM: kaiser: paranoid_entry pass cr3 need to paranoid_exit" Revert "CHROMIUM: kaiser: x86_cr3_pcid_noflush and x86_cr3_pcid_user" Revert "CHROMIUM: kaiser: PCID 0 for kernel and 128 for user" Revert "CHROMIUM: kaiser: load_new_mm_cr3() let SWITCH_USER_CR3 flush user" Revert "CHROMIUM: kaiser: enhanced by kernel and user PCIDs" Revert "CHROMIUM: kaiser: vmstat show NR_KAISERTABLE as nr_overhead" Revert "CHROMIUM: kaiser: delete KAISER_REAL_SWITCH option" Revert "CHROMIUM: kaiser: name that 0x1000 KAISER_SHADOW_PGD_OFFSET" Revert "CHROMIUM: kaiser: cleanups while trying for gold link" Revert "CHROMIUM: kaiser: align addition to x86/mm/Makefile" Revert "CHROMIUM: kaiser: kaiser_remove_mapping() move along the pgd" Revert "CHROMIUM: kaiser: tidied up kaiser_add/remove_mapping slightly" Revert "CHROMIUM: kaiser: tidied up asm/kaiser.h somewhat" Revert "CHROMIUM: kaiser: ENOMEM if kaiser_pagetable_walk() NULL" Revert "CHROMIUM: kaiser: fix perf crashes" Revert "CHROMIUM: kaiser: fix regs to do_nmi() ifndef CONFIG_KAISER" Revert "CHROMIUM: kaiser: KAISER depends on SMP" Revert "CHROMIUM: kaiser: fix build and FIXME in alloc_ldt_struct()" Revert "CHROMIUM: kaiser: stack map PAGE_SIZE at THREAD_SIZE-PAGE_SIZE" Revert "CHROMIUM: kaiser: do not set _PAGE_NX on pgd_none" Revert "CHROMIUM: kaiser: merged update" Revert "BACKPORT: KAISER: Kernel Address Isolation" Merge remote-tracking branch 'origin/linux/chromeos-4.4-kaiser-reverted-tag' into merge/chromeos-4.4-chromeos-4.4-kaiser-reverted-tag arch/x86/boot/compressed/misc.h | 1 - arch/x86/entry/entry_64.S | 162 ++--------- arch/x86/entry/entry_64_compat.S | 7 - arch/x86/include/asm/cpufeature.h | 1 - arch/x86/include/asm/desc.h | 2 +- arch/x86/include/asm/hw_irq.h | 2 +- arch/x86/include/asm/kaiser.h | 126 -------- arch/x86/include/asm/pgtable.h | 18 +- arch/x86/include/asm/pgtable_64.h | 30 +- arch/x86/include/asm/pgtable_types.h | 33 +-- arch/x86/include/asm/processor.h | 2 +- arch/x86/include/asm/pvclock.h | 2 - arch/x86/include/asm/tlbflush.h | 62 +--- arch/x86/include/uapi/asm/processor-flags.h | 3 +- arch/x86/kernel/cpu/common.c | 18 +- arch/x86/kernel/cpu/perf_event_intel_ds.c | 57 +--- arch/x86/kernel/espfix_64.c | 9 - arch/x86/kernel/head_64.S | 31 +- arch/x86/kernel/irqinit.c | 2 +- arch/x86/kernel/ldt.c | 25 +- arch/x86/kernel/process.c | 2 +- arch/x86/kernel/pvclock.c | 17 +- arch/x86/kernel/tracepoint.c | 2 - arch/x86/kvm/x86.c | 3 +- arch/x86/mm/Makefile | 1 - arch/x86/mm/kaiser.c | 428 ---------------------------- arch/x86/mm/pageattr.c | 63 ++-- arch/x86/mm/pgtable.c | 16 +- arch/x86/mm/tlb.c | 41 +-- include/asm-generic/vmlinux.lds.h | 7 - include/linux/kaiser.h | 52 ---- include/linux/mmzone.h | 3 +- include/linux/percpu-defs.h | 32 +-- init/main.c | 2 - kernel/fork.c | 6 - mm/vmstat.c | 1 - security/Kconfig | 10 - 37 files changed, 79 insertions(+), 1200 deletions(-) delete mode 100644 arch/x86/include/asm/kaiser.h delete mode 100644 arch/x86/mm/kaiser.c delete mode 100644 include/linux/kaiser.h BUG= chromium:799485 TEST=Build and test on various affected systems Change-Id: I2714dd14b7b2c3ba4b82ad3b8a8fba625037c2be Signed-off-by: Guenter Roeck <groeck@chromium.org>
,
Jan 9 2018
The following revision refers to this bug: https://chromium.googlesource.com/chromiumos/third_party/kernel/+/8d70f3c7fb5626870ee86d1a161478a3e37fab98 commit 8d70f3c7fb5626870ee86d1a161478a3e37fab98 Author: Guenter Roeck <groeck@chromium.org> Date: Tue Jan 09 15:42:20 2018 CHROMIUM: Merge 'v4.4.110' into chromeos-4.4 Merge of v4.4.110 into chromeos-4.4 Conflicts: arch/x86/mm/kasan_init_64.c Changelog: ---------------------------------------------------------------- Andrey Ryabinin (1): x86/kasan: Clear kasan_zero_page after TLB flush Andy Lutomirski (2): x86, vdso, pvclock: Simplify and speed up the vdso pvclock reader x86/vdso: Get pvclock data from the vvar VMA instead of the fixmap Borislav Petkov (4): x86/kaiser: Rename and simplify X86_FEATURE_KAISER handling x86/kaiser: Check boottime cmdline params x86/kaiser: Reenable PARAVIRT x86/kaiser: Move feature detection up Dave Hansen (2): kaiser: merged update kaiser: enhanced by kernel and user PCIDs Greg Kroah-Hartman (1): Linux 4.4.110 Guenter Roeck (2): kaiser: Set _PAGE_NX only if supported Merge remote-tracking branch 'origin/linux/v4.4.110' into merge/chromeos-4.4-v4.4.110 Hugh Dickins (25): kaiser: do not set _PAGE_NX on pgd_none kaiser: stack map PAGE_SIZE at THREAD_SIZE-PAGE_SIZE kaiser: fix build and FIXME in alloc_ldt_struct() kaiser: KAISER depends on SMP kaiser: fix regs to do_nmi() ifndef CONFIG_KAISER kaiser: fix perf crashes kaiser: ENOMEM if kaiser_pagetable_walk() NULL kaiser: tidied up asm/kaiser.h somewhat kaiser: tidied up kaiser_add/remove_mapping slightly kaiser: kaiser_remove_mapping() move along the pgd kaiser: cleanups while trying for gold link kaiser: name that 0x1000 KAISER_SHADOW_PGD_OFFSET kaiser: delete KAISER_REAL_SWITCH option kaiser: vmstat show NR_KAISERTABLE as nr_overhead kaiser: load_new_mm_cr3() let SWITCH_USER_CR3 flush user kaiser: PCID 0 for kernel and 128 for user kaiser: x86_cr3_pcid_noflush and x86_cr3_pcid_user kaiser: paranoid_entry pass cr3 need to paranoid_exit kaiser: _pgd_alloc() without __GFP_REPEAT to avoid stalls kaiser: fix unlikely error in alloc_ldt_struct() kaiser: add "nokaiser" boot option, using ALTERNATIVE kaiser: use ALTERNATIVE instead of x86_cr3_pcid_noflush kaiser: drop is_atomic arg to kaiser_pagetable_walk() kaiser: asm/tlbflush.h handle noPGE at lower level kaiser: kaiser_flush_tlb_on_return_to_user() check PCID Jiri Kosina (1): kaiser: disabled on Xen PV Kees Cook (2): KPTI: Rename to PAGE_TABLE_ISOLATION KPTI: Report when enabled Richard Fellner (1): KAISER: Kernel Address Isolation Thomas Gleixner (1): x86/paravirt: Dont patch flush_tlb_single Tom Lendacky (1): x86/boot: Add early cmdline parsing for options with arguments Documentation/kernel-parameters.txt | 8 + Makefile | 2 +- arch/x86/boot/compressed/misc.h | 1 + arch/x86/entry/entry_64.S | 164 ++++++++-- arch/x86/entry/entry_64_compat.S | 7 + arch/x86/entry/vdso/vclock_gettime.c | 99 +++--- arch/x86/entry/vdso/vdso-layout.lds.S | 3 +- arch/x86/entry/vdso/vdso2c.c | 3 + arch/x86/entry/vdso/vma.c | 13 + arch/x86/include/asm/cmdline.h | 2 + arch/x86/include/asm/cpufeature.h | 4 + arch/x86/include/asm/desc.h | 2 +- arch/x86/include/asm/hw_irq.h | 2 +- arch/x86/include/asm/kaiser.h | 141 +++++++++ arch/x86/include/asm/pgtable.h | 28 +- arch/x86/include/asm/pgtable_64.h | 25 +- arch/x86/include/asm/pgtable_types.h | 29 +- arch/x86/include/asm/processor.h | 2 +- arch/x86/include/asm/pvclock.h | 9 + arch/x86/include/asm/tlbflush.h | 74 ++++- arch/x86/include/asm/vdso.h | 1 + arch/x86/include/uapi/asm/processor-flags.h | 3 +- arch/x86/kernel/cpu/common.c | 28 +- arch/x86/kernel/cpu/perf_event_intel_ds.c | 57 +++- arch/x86/kernel/espfix_64.c | 10 + arch/x86/kernel/head_64.S | 35 ++- arch/x86/kernel/irqinit.c | 2 +- arch/x86/kernel/kvmclock.c | 5 + arch/x86/kernel/ldt.c | 25 +- arch/x86/kernel/process.c | 2 +- arch/x86/kernel/setup.c | 7 + arch/x86/kernel/tracepoint.c | 2 + arch/x86/kvm/x86.c | 3 +- arch/x86/lib/cmdline.c | 105 +++++++ arch/x86/mm/Makefile | 1 + arch/x86/mm/init.c | 2 +- arch/x86/mm/init_64.c | 10 + arch/x86/mm/kaiser.c | 456 ++++++++++++++++++++++++++++ arch/x86/mm/pageattr.c | 63 +++- arch/x86/mm/pgtable.c | 16 +- arch/x86/mm/tlb.c | 39 ++- include/asm-generic/vmlinux.lds.h | 7 + include/linux/kaiser.h | 52 ++++ include/linux/mmzone.h | 3 +- include/linux/percpu-defs.h | 32 +- init/main.c | 2 + kernel/fork.c | 6 + mm/vmstat.c | 1 + security/Kconfig | 10 + 49 files changed, 1461 insertions(+), 142 deletions(-) create mode 100644 arch/x86/include/asm/kaiser.h create mode 100644 arch/x86/mm/kaiser.c create mode 100644 include/linux/kaiser.h BUG= chromium:799485 TEST=Build and test on various affected systems Change-Id: Ib1700d1d457911ddfa6eaf9f2db4c218f8da7896 Signed-off-by: Guenter Roeck <groeck@chromium.org> [modify] https://crrev.com/8d70f3c7fb5626870ee86d1a161478a3e37fab98/arch/x86/mm/kasan_init_64.c
,
Jan 9 2018
|
|||
►
Sign in to add a comment |
|||
Comment 1 by groeck@chromium.org
, Jan 5 2018