# 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/arm-unknown-linux-gnueabi/bin/arm-unknown-linux-gnueabi-gcc --version # < git log --format=%s --max-count=1 4b78317679c4f3782a3cff0ddb269c1fcfde7621 # < make -s -j 48 ARCH=arm O=/kisskb/build/linus_bcm2835_defconfig_arm CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/arm-unknown-linux-gnueabi/bin/arm-unknown-linux-gnueabi- bcm2835_defconfig # make -s -j 48 ARCH=arm O=/kisskb/build/linus_bcm2835_defconfig_arm CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/arm-unknown-linux-gnueabi/bin/arm-unknown-linux-gnueabi- /kisskb/src/arch/arm/kernel/patch.c: In function '__patch_text_real': /kisskb/src/arch/arm/include/asm/irqflags.h:171:2: warning: 'flags' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/arch/arm/kernel/patch.c:61:16: note: 'flags' was declared here /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/ipc/shm.c: In function 'ksys_shmdt': /kisskb/src/ipc/shm.c:1686:59: warning: 'file' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/lib/mpi/mpicoder.c: In function 'mpi_read_raw_from_sgl': /kisskb/src/lib/mpi/mpicoder.c:336:12: warning: 'buff' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/lib/rhashtable.c: In function 'rht_deferred_worker': /kisskb/src/lib/rhashtable.c:264:2: warning: 'next' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/lib/rhashtable.c:229:28: note: 'next' was declared here /kisskb/src/mm/ksm.c: In function '__stable_node_chain': /kisskb/src/mm/ksm.c:1395:15: warning: 'found_rmap_hlist_len' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/mm/ksm.c:1367:6: note: 'found_rmap_hlist_len' was declared here /kisskb/src/drivers/dma-buf/reservation.c: In function 'reservation_object_add_shared_fence': /kisskb/src/drivers/dma-buf/reservation.c:208:36: warning: 'k' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/dma-buf/reservation.c:161:17: note: 'k' was declared here /kisskb/src/net/core/gen_stats.c: In function '__gnet_stats_copy_basic': /kisskb/src/net/core/gen_stats.c:161:19: warning: 'seq' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/gpio/gpiolib-of.c: In function 'of_gpiochip_add': /kisskb/src/drivers/gpio/gpiolib-of.c:433:8: warning: 'dflags' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/gpio/gpiolib-of.c:419:19: note: 'dflags' was declared here /kisskb/src/drivers/gpio/gpiolib-of.c:433:8: warning: 'lflags' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/gpio/gpiolib-of.c:418:25: note: 'lflags' was declared here /kisskb/src/net/core/dev.c: In function 'validate_xmit_skb_list': /kisskb/src/net/core/dev.c:3379:15: warning: 'tail' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/gpu/drm/drm_dp_mst_topology.c: In function 'drm_dp_sideband_msg_build': /kisskb/src/drivers/gpu/drm/drm_dp_mst_topology.c:364:23: warning: 'hdrlen' 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/gpu/drm/drm_atomic.c: In function 'drm_atomic_check_only': /kisskb/src/drivers/gpu/drm/drm_atomic.c:412:38: warning: 'crtc_state' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/gpu/drm/drm_atomic.c:396:25: note: 'crtc_state' was declared here /kisskb/src/net/mac80211/mlme.c: In function 'ieee80211_rx_mgmt_beacon': /kisskb/src/net/mac80211/mlme.c:1513:3: warning: 'pwr_level_cisco' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/net/mac80211/mlme.c:1470:6: note: 'pwr_level_cisco' was declared here Completed OK # rm -rf /kisskb/build/linus_bcm2835_defconfig_arm # Build took: 0:01:24.840324