# 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/m68k-linux/bin/m68k-linux-gcc --version # < git log --format=%s --max-count=1 4b78317679c4f3782a3cff0ddb269c1fcfde7621 # < make -s -j 48 ARCH=m68k O=/kisskb/build/linus_sun3_defconfig_m68k CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/m68k-linux/bin/m68k-linux- sun3_defconfig WARNING: unmet direct dependencies detected for NEED_MULTIPLE_NODES Depends on [n]: DISCONTIGMEM [=n] || NUMA Selected by [y]: - SINGLE_MEMORY_CHUNK [=y] && MMU [=y] WARNING: unmet direct dependencies detected for NEED_MULTIPLE_NODES Depends on [n]: DISCONTIGMEM [=n] || NUMA Selected by [y]: - SINGLE_MEMORY_CHUNK [=y] && MMU [=y] WARNING: unmet direct dependencies detected for NEED_MULTIPLE_NODES Depends on [n]: DISCONTIGMEM [=n] || NUMA Selected by [y]: - SINGLE_MEMORY_CHUNK [=y] && MMU [=y] # make -s -j 48 ARCH=m68k O=/kisskb/build/linus_sun3_defconfig_m68k CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/m68k-linux/bin/m68k-linux- :1239:2: warning: #warning syscall seccomp not implemented [-Wcpp] :1317:2: warning: #warning syscall pkey_mprotect not implemented [-Wcpp] :1320:2: warning: #warning syscall pkey_alloc not implemented [-Wcpp] :1323:2: warning: #warning syscall pkey_free not implemented [-Wcpp] :1332:2: warning: #warning syscall io_pgetevents not implemented [-Wcpp] :1335:2: warning: #warning syscall rseq not implemented [-Wcpp] /kisskb/src/arch/m68k/kernel/signal.c: In function 'mangle_kernel_stack': /kisskb/src/arch/m68k/kernel/signal.c:654:3: warning: variable length array 'buf' is used [-Wvla] /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/kernel/acct.c: In function 'acct_pin_kill': /kisskb/src/kernel/acct.c:177:2: warning: value computed is not used [-Wunused-value] /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/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/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/net/ethernet/i825xx/sun3_82586.c: In function 'sun3_82586_timeout': /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c:993:89: warning: array subscript is above array bounds [-Warray-bounds] /kisskb/src/net/core/filter.c: In function 'bpf_clear_redirect_map': /kisskb/src/net/core/filter.c:3304:4: warning: value computed is not used [-Wunused-value] /kisskb/src/drivers/net/macsec.c: In function 'macsec_del_rxsa': /kisskb/src/drivers/net/macsec.c:1926:2: warning: 'assoc_num' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/net/macsec.c:1926:2: warning: 'rx_sc' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/net/macsec.c: In function 'macsec_del_txsa': /kisskb/src/drivers/net/macsec.c:2003:2: warning: 'assoc_num' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/net/macsec.c:2003:2: warning: 'tx_sc' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/net/macsec.c: In function 'macsec_upd_txsa': /kisskb/src/drivers/net/macsec.c:2068:5: warning: 'assoc_num' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/net/macsec.c:2068:24: warning: 'tx_sc' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/net/macsec.c:2069:21: warning: 'secy' 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:1513:31: warning: 'linear' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/net/tun.c:1733:46: note: 'linear' was declared here /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/net/sctp/output.c: In function 'sctp_packet_config': /kisskb/src/include/net/sock.h:1928:19: warning: 'sk' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/net/sctp/output.c:94:15: note: 'sk' was declared here /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/fs/ocfs2/file.c: In function 'ocfs2_file_write_iter': /kisskb/src/fs/ocfs2/file.c:2386:3: warning: value computed is not used [-Wunused-value] /kisskb/src/fs/udf/unicode.c: In function 'udf_name_conv_char': /kisskb/src/fs/udf/unicode.c:132:8: warning: 'c' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/fs/posix_acl.c: In function 'get_acl': /kisskb/src/fs/posix_acl.c:147:3: warning: value computed is not used [-Wunused-value] Completed OK # rm -rf /kisskb/build/linus_sun3_defconfig_m68k # Build took: 0:01:21.154936