# git rev-parse -q --verify eb094f06963bb0fd8134c6a9b805d4ad0002a7d4^{commit} eb094f06963bb0fd8134c6a9b805d4ad0002a7d4 already have revision, skipping fetch # git checkout -q -f -B kisskb eb094f06963bb0fd8134c6a9b805d4ad0002a7d4 # git clean -qxdf # < git log -1 # commit eb094f06963bb0fd8134c6a9b805d4ad0002a7d4 # Merge: 100d46bd72ec 012206a822a8 # Author: Linus Torvalds # Date: Tue Nov 12 10:53:24 2019 -0800 # # Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip # # Pull x86 TSX Async Abort and iTLB Multihit mitigations from Thomas Gleixner: # "The performance deterioration departement is not proud at all of # presenting the seventh installment of speculation mitigations and # hardware misfeature workarounds: # # 1) TSX Async Abort (TAA) - 'The Annoying Affair' # # TAA is a hardware vulnerability that allows unprivileged # speculative access to data which is available in various CPU # internal buffers by using asynchronous aborts within an Intel TSX # transactional region. # # The mitigation depends on a microcode update providing a new MSR # which allows to disable TSX in the CPU. CPUs which have no # microcode update can be mitigated by disabling TSX in the BIOS if # the BIOS provides a tunable. # # Newer CPUs will have a bit set which indicates that the CPU is not # vulnerable, but the MSR to disable TSX will be available # nevertheless as it is an architected MSR. That means the kernel # provides the ability to disable TSX on the kernel command line, # which is useful as TSX is a truly useful mechanism to accelerate # side channel attacks of all sorts. # # 2) iITLB Multihit (NX) - 'No eXcuses' # # iTLB Multihit is an erratum where some Intel processors may incur # a machine check error, possibly resulting in an unrecoverable CPU # lockup, when an instruction fetch hits multiple entries in the # instruction TLB. This can occur when the page size is changed # along with either the physical address or cache type. A malicious # guest running on a virtualized system can exploit this erratum to # perform a denial of service attack. # # The workaround is that KVM marks huge pages in the extended page # tables as not executable (NX). If the guest attempts to execute in # such a page, the page is broken down into 4k pages which are # marked executable. The workaround comes with a mechanism to # recover these shattered huge pages over time. # # Both issues come with full documentation in the hardware # vulnerabilities section of the Linux kernel user's and administrator's # guide. # # Thanks to all patch authors and reviewers who had the extraordinary # priviledge to be exposed to this nuisance. # # Special thanks to Borislav Petkov for polishing the final TAA patch # set and to Paolo Bonzini for shepherding the KVM iTLB workarounds and # providing also the backports to stable kernels for those!" # # * 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: # x86/speculation/taa: Fix printing of TAA_MSG_SMT on IBRS_ALL CPUs # Documentation: Add ITLB_MULTIHIT documentation # kvm: x86: mmu: Recovery of shattered NX large pages # kvm: Add helper function for creating VM worker threads # kvm: mmu: ITLB_MULTIHIT mitigation # cpu/speculation: Uninline and export CPU mitigations helpers # x86/cpu: Add Tremont to the cpu vulnerability whitelist # x86/bugs: Add ITLB_MULTIHIT bug infrastructure # x86/tsx: Add config options to set tsx=on|off|auto # x86/speculation/taa: Add documentation for TSX Async Abort # x86/tsx: Add "auto" option to the tsx= cmdline parameter # kvm/x86: Export MDS_NO=0 to guests when TSX is enabled # x86/speculation/taa: Add sysfs reporting for TSX Async Abort # x86/speculation/taa: Add mitigation for TSX Async Abort # x86/cpu: Add a "tsx=" cmdline option with TSX disabled by default # x86/cpu: Add a helper function x86_read_arch_cap_msr() # x86/msr: Add the IA32_TSX_CTRL MSR # < /opt/cross/kisskb/gcc-4.6.3-nolibc/m68k-linux/bin/m68k-linux-gcc --version # < /opt/cross/kisskb/gcc-4.6.3-nolibc/m68k-linux/bin/m68k-linux-ld --version # < git log --format=%s --max-count=1 eb094f06963bb0fd8134c6a9b805d4ad0002a7d4 # < make -s -j 24 ARCH=m68k O=/kisskb/build/linus_m68k-defconfig_m68k CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/m68k-linux/bin/m68k-linux- defconfig # make -s -j 24 ARCH=m68k O=/kisskb/build/linus_m68k-defconfig_m68k CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/m68k-linux/bin/m68k-linux- :1511:2: warning: #warning syscall clone3 not implemented [-Wcpp] /kisskb/src/arch/m68k/mvme147/config.c: In function 'mvme147_hwclk': /kisskb/src/arch/m68k/mvme147/config.c:175:2: warning: #warning check me! [-Wcpp] /kisskb/src/arch/m68k/mvme16x/config.c: In function 'mvme16x_hwclk': /kisskb/src/arch/m68k/mvme16x/config.c:440:2: warning: #warning check me! [-Wcpp] /kisskb/src/ipc/shm.c: In function 'ksys_shmdt': /kisskb/src/ipc/shm.c:1712: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/kernel/printk/printk.c: In function 'devkmsg_sysctl_set_loglvl': /kisskb/src/kernel/printk/printk.c:204:16: warning: 'old' 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:157:19: warning: 'seq' 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/fs/cifs/smb2pdu.c: In function 'SMB2_ioctl_init': /kisskb/src/fs/cifs/smb2pdu.c:2700:19: warning: 'in_data_buf' 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:3326:15: warning: 'tail' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/net/core/filter.c: In function 'bpf_clear_redirect_map': /kisskb/src/net/core/filter.c:3603:4: warning: value computed is not used [-Wunused-value] /kisskb/src/lib/rhashtable.c: In function 'rht_deferred_worker': /kisskb/src/include/linux/rhashtable.h:110:10: warning: 'next' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/lib/rhashtable.c:222:28: note: 'next' was declared here /kisskb/src/net/sctp/output.c: In function 'sctp_packet_config': /kisskb/src/include/net/sock.h:1965:19: warning: 'sk' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/net/sctp/output.c:79:15: note: 'sk' was declared here /kisskb/src/drivers/net/ethernet/8390/lib8390.c:201:12: warning: '__ei_open' defined but not used [-Wunused-function] /kisskb/src/drivers/net/ethernet/8390/lib8390.c:230:12: warning: '__ei_close' defined but not used [-Wunused-function] /kisskb/src/drivers/net/ethernet/8390/lib8390.c:254:13: warning: '__ei_tx_timeout' defined but not used [-Wunused-function] /kisskb/src/drivers/net/ethernet/8390/lib8390.c:300:20: warning: '__ei_start_xmit' defined but not used [-Wunused-function] /kisskb/src/drivers/net/ethernet/8390/lib8390.c:509:13: warning: '__ei_poll' defined but not used [-Wunused-function] /kisskb/src/drivers/net/ethernet/8390/lib8390.c:850:33: warning: '__ei_get_stats' defined but not used [-Wunused-function] /kisskb/src/drivers/net/ethernet/8390/lib8390.c:950:13: warning: '__ei_set_multicast_list' defined but not used [-Wunused-function] /kisskb/src/drivers/net/ethernet/8390/lib8390.c:988:27: warning: '____alloc_ei_netdev' defined but not used [-Wunused-function] /kisskb/src/drivers/md/raid10.c: In function 'read_balance': /kisskb/src/drivers/md/raid10.c:842:22: warning: 'best_pending_slot' 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:1995:2: warning: 'assoc_num' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/net/macsec.c:1995: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:2060:5: warning: 'assoc_num' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/net/macsec.c:2060:24: warning: 'tx_sc' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/net/macsec.c:2061:21: warning: 'secy' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/net/macsec.c: In function 'macsec_del_rxsa': /kisskb/src/drivers/net/macsec.c:1918:2: warning: 'assoc_num' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/net/macsec.c:1918:2: warning: 'rx_sc' 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:1836:30: warning: 'copylen' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/net/tun.c:1526:31: warning: 'linear' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/net/tun.c:1749:46: note: 'linear' was declared here /kisskb/src/drivers/md/dm-writecache.c: In function 'writecache_writeback': /kisskb/src/drivers/md/dm-writecache.c:1613:18: warning: 'g' 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:338:21: note: 'pdeo' was declared here /kisskb/src/fs/ocfs2/alloc.c: In function 'ocfs2_trim_mainbm': /kisskb/src/fs/ocfs2/alloc.c:7608:17: warning: 'first_bit' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/fs/ocfs2/file.c: In function 'ocfs2_file_write_iter': /kisskb/src/fs/ocfs2/file.c:2421: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:148:3: warning: value computed is not used [-Wunused-value] Completed OK # rm -rf /kisskb/build/linus_m68k-defconfig_m68k # Build took: 0:01:50.457390