# git rev-parse -q --verify 4b78317679c4f3782a3cff0ddb269c1fcfde7621^{commit} 4b78317679c4f3782a3cff0ddb269c1fcfde7621 already have revision, skipping fetch # git checkout -q -f -B kisskb 4b78317679c4f3782a3cff0ddb269c1fcfde7621 # git clean -qxdf # < git log -1 # commit 4b78317679c4f3782a3cff0ddb269c1fcfde7621 # Merge: 880584176ed7 55a974021ec9 # Author: Linus Torvalds # Date: Sat Dec 1 12:35:48 2018 -0800 # # Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip # # Pull STIBP fallout fixes from Thomas Gleixner: # "The performance destruction department finally got it's act together # and came up with a cure for the STIPB regression: # # - Provide a command line option to control the spectre v2 user space # mitigations. Default is either seccomp or prctl (if seccomp is # disabled in Kconfig). prctl allows mitigation opt-in, seccomp # enables the migitation for sandboxed processes. # # - Rework the code to handle the conditional STIBP/IBPB control and # remove the now unused ptrace_may_access_sched() optimization # attempt # # - Disable STIBP automatically when SMT is disabled # # - Optimize the switch_to() logic to avoid MSR writes and invocations # of __switch_to_xtra(). # # - Make the asynchronous speculation TIF updates synchronous to # prevent stale mitigation state. # # As a general cleanup this also makes retpoline directly depend on # compiler support and removes the 'minimal retpoline' option which just # pretended to provide some form of security while providing none" # # * 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (31 commits) # x86/speculation: Provide IBPB always command line options # x86/speculation: Add seccomp Spectre v2 user space protection mode # x86/speculation: Enable prctl mode for spectre_v2_user # x86/speculation: Add prctl() control for indirect branch speculation # x86/speculation: Prepare arch_smt_update() for PRCTL mode # x86/speculation: Prevent stale SPEC_CTRL msr content # x86/speculation: Split out TIF update # ptrace: Remove unused ptrace_may_access_sched() and MODE_IBRS # x86/speculation: Prepare for conditional IBPB in switch_mm() # x86/speculation: Avoid __switch_to_xtra() calls # x86/process: Consolidate and simplify switch_to_xtra() code # x86/speculation: Prepare for per task indirect branch speculation control # x86/speculation: Add command line control for indirect branch speculation # x86/speculation: Unify conditional spectre v2 print functions # x86/speculataion: Mark command line parser data __initdata # x86/speculation: Mark string arrays const correctly # x86/speculation: Reorder the spec_v2 code # x86/l1tf: Show actual SMT state # x86/speculation: Rework SMT state change # sched/smt: Expose sched_smt_present static key # ... # < /opt/cross/kisskb/gcc-4.6.3-nolibc/powerpc-linux/bin/powerpc-linux-gcc --version # < git log --format=%s --max-count=1 4b78317679c4f3782a3cff0ddb269c1fcfde7621 # < make -s -j 120 ARCH=powerpc O=/kisskb/build/linus_ppc44x_defconfig_powerpc CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/powerpc-linux/bin/powerpc-linux- ppc44x_defconfig # make -s -j 120 ARCH=powerpc O=/kisskb/build/linus_ppc44x_defconfig_powerpc CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/powerpc-linux/bin/powerpc-linux- /kisskb/src/kernel/printk/printk.c: In function 'devkmsg_sysctl_set_loglvl': /kisskb/src/kernel/printk/printk.c:186:16: warning: 'old' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/i2c/i2c-core-base.c: In function 'i2c_generic_scl_recovery': /kisskb/src/drivers/i2c/i2c-core-base.c:235:5: warning: 'ret' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/fs/proc/inode.c: In function 'proc_reg_open': /kisskb/src/include/linux/list.h:65:12: warning: 'pdeo' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/fs/proc/inode.c:341:21: note: 'pdeo' was declared here /kisskb/src/drivers/tty/serial/8250/8250_core.c: In function 'univ8250_release_irq': /kisskb/src/drivers/tty/serial/8250/8250_core.c:247:18: warning: 'i' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/tty/serial/8250/8250_core.c:227:19: note: 'i' was declared here /kisskb/src/net/bridge/br_netlink.c: In function 'br_afspec': /kisskb/src/net/bridge/br_netlink.c:647:7: warning: 'err' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/net/tun.c: In function 'tun_get_user': /kisskb/src/drivers/net/tun.c:1823:30: warning: 'copylen' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/net/tun.c:1733:46: warning: 'linear' may be used uninitialized in this function [-Wuninitialized] arch/powerpc/boot/dts/katmai.dtb: Warning (pci_bridge): /plb/pciex@d00000000: node name is not "pci" or "pcie" arch/powerpc/boot/dts/katmai.dtb: Warning (pci_bridge): /plb/pciex@d20000000: node name is not "pci" or "pcie" arch/powerpc/boot/dts/katmai.dtb: Warning (pci_bridge): /plb/pciex@d40000000: node name is not "pci" or "pcie" arch/powerpc/boot/dts/katmai.dtb: Warning (pci_device_bus_num): Failed prerequisite 'pci_bridge' INFO: Uncompressed kernel (size 0x555d70) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x555d70) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x555d70) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x555d70) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x555d70) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x555d70) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x555d70) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x555d70) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x555d70) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x555d70) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x5456c4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x555d70) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) Image Name: Linux-4.20.0-rc4-g4b78317679c4 Created: Sun Dec 2 10:33:42 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2715985 Bytes = 2652.33 KiB = 2.59 MiB Load Address: 00600000 Entry Point: 006014ec Image Name: Linux-4.20.0-rc4-g4b78317679c4 Created: Sun Dec 2 10:33:42 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2684622 Bytes = 2621.70 KiB = 2.56 MiB Load Address: 00000000 Entry Point: 00000000 Image Name: Linux-4.20.0-rc4-g4b78317679c4 Created: Sun Dec 2 10:33:42 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2716165 Bytes = 2652.50 KiB = 2.59 MiB Load Address: 00600000 Entry Point: 006001c8 Image Name: Linux-4.20.0-rc4-g4b78317679c4 Created: Sun Dec 2 10:33:42 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2715943 Bytes = 2652.29 KiB = 2.59 MiB Load Address: 00600000 Entry Point: 006014ec Image Name: Linux-4.20.0-rc4-g4b78317679c4 Created: Sun Dec 2 10:33:42 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2716127 Bytes = 2652.47 KiB = 2.59 MiB Load Address: 00600000 Entry Point: 006014e4 Image Name: Linux-4.20.0-rc4-g4b78317679c4 Created: Sun Dec 2 10:33:42 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2715910 Bytes = 2652.26 KiB = 2.59 MiB Load Address: 00600000 Entry Point: 006014d8 Image Name: Linux-4.20.0-rc4-g4b78317679c4 Created: Sun Dec 2 10:33:42 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2716006 Bytes = 2652.35 KiB = 2.59 MiB Load Address: 00600000 Entry Point: 006014cc Image Name: Linux-4.20.0-rc4-g4b78317679c4 Created: Sun Dec 2 10:33:42 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2715865 Bytes = 2652.21 KiB = 2.59 MiB Load Address: 00600000 Entry Point: 006014f8 Image Name: Linux-4.20.0-rc4-g4b78317679c4 Created: Sun Dec 2 10:33:43 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2716297 Bytes = 2652.63 KiB = 2.59 MiB Load Address: 00600000 Entry Point: 006014ec Image Name: Linux-4.20.0-rc4-g4b78317679c4 Created: Sun Dec 2 10:33:43 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2715915 Bytes = 2652.26 KiB = 2.59 MiB Load Address: 00600000 Entry Point: 006000d4 Completed OK # rm -rf /kisskb/build/linus_ppc44x_defconfig_powerpc # Build took: 0:00:27.703321