# git rev-parse -q --verify c64396cc36c6e60704ab06c1fb1c4a46179c9120^{commit} c64396cc36c6e60704ab06c1fb1c4a46179c9120 already have revision, skipping fetch # git checkout -q -f -B kisskb c64396cc36c6e60704ab06c1fb1c4a46179c9120 # git clean -qxdf # < git log -1 # commit c64396cc36c6e60704ab06c1fb1c4a46179c9120 # Merge: e5ff2cb9cf67 34b1a1ce1458 # Author: Linus Torvalds # Date: Thu Jan 28 11:18:43 2021 -0800 # # Merge tag 'locking-urgent-2021-01-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip # # Pull locking fixes from Thomas Gleixner: # "A set of PI futex fixes: # # - Address a longstanding issue where the user space part of the PI # futex is not writeable. The kernel returns with inconsistent state # which can in the worst case result in a UAF of a tasks kernel # stack. # # The solution is to establish consistent kernel state which makes # future operations on the futex fail because user space and kernel # space state are inconsistent. Not a problem as PI futexes # fundamentaly require a functional RW mapping and if user space # pulls the rug under it, then it can keep the pieces it asked for. # # - Address an issue where the return value is incorrect in case that # the futex was acquired after a timeout/signal made the waiter drop # out of the rtmutex wait. # # In one of the corner cases the kernel returned an error code # despite having successfully acquired the futex" # # * tag 'locking-urgent-2021-01-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: # futex: Handle faults correctly for PI futexes # futex: Simplify fixup_pi_state_owner() # futex: Use pi_state_update_owner() in put_pi_state() # rtmutex: Remove unused argument from rt_mutex_proxy_unlock() # futex: Provide and use pi_state_update_owner() # futex: Replace pointless printk in fixup_owner() # futex: Ensure the correct return value from futex_lock_pi() # < /opt/cross/kisskb/korg/gcc-8.1.0-nolibc/hppa-linux/bin/hppa-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-8.1.0-nolibc/hppa-linux/bin/hppa-linux-ld --version # < git log --format=%s --max-count=1 c64396cc36c6e60704ab06c1fb1c4a46179c9120 # < make -s -j 10 ARCH=parisc O=/kisskb/build/linus_parisc-allmodconfig_parisc-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/hppa-linux/bin/hppa-linux- allmodconfig # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_MODULE_SIG=n # Added to kconfig CONFIG_SAMPLES=n # < make -s -j 10 ARCH=parisc O=/kisskb/build/linus_parisc-allmodconfig_parisc-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/hppa-linux/bin/hppa-linux- help # make -s -j 10 ARCH=parisc O=/kisskb/build/linus_parisc-allmodconfig_parisc-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/hppa-linux/bin/hppa-linux- olddefconfig # make -s -j 10 ARCH=parisc O=/kisskb/build/linus_parisc-allmodconfig_parisc-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/hppa-linux/bin/hppa-linux- /kisskb/src/drivers/parisc/dino.c:160:12: warning: 'pci_dev_is_behind_card_dino' defined but not used [-Wunused-function] static int pci_dev_is_behind_card_dino(struct pci_dev *dev) ^~~~~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/lib/zstd/compress.c: In function 'ZSTD_compressBlock_lazy2_extDict': /kisskb/src/lib/zstd/compress.c:2262:1: warning: the frame size of 1348 bytes is larger than 1280 bytes [-Wframe-larger-than=] } ^ /kisskb/src/lib/xxhash.c: In function 'xxh64': /kisskb/src/lib/xxhash.c:236:1: warning: the frame size of 1624 bytes is larger than 1280 bytes [-Wframe-larger-than=] } ^ In file included from /kisskb/src/drivers/net/phy/dp83640.c:23: /kisskb/src/drivers/net/phy/dp83640_reg.h:8: warning: "PAGE0" redefined #define PAGE0 0x0000 In file included from /kisskb/src/include/linux/mm_types_task.h:16, from /kisskb/src/include/linux/mm_types.h:5, from /kisskb/src/include/linux/mmzone.h:21, from /kisskb/src/include/linux/gfp.h:6, from /kisskb/src/include/linux/xarray.h:14, from /kisskb/src/include/linux/radix-tree.h:19, from /kisskb/src/include/linux/fs.h:15, from /kisskb/src/include/linux/compat.h:17, from /kisskb/src/include/linux/ethtool.h:17, from /kisskb/src/drivers/net/phy/dp83640.c:11: /kisskb/src/arch/parisc/include/asm/page.h:187: note: this is the location of the previous definition #define PAGE0 ((struct zeropage *)__PAGE_OFFSET) /kisskb/src/drivers/input/joystick/analog.c:160:2: warning: #warning Precise timer not defined for this architecture. [-Wcpp] #warning Precise timer not defined for this architecture. ^~~~~~~ In file included from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.c:60: /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.h:2058: warning: "writeq" redefined #define writeq(val64, db) \ In file included from /kisskb/src/include/linux/io.h:13, from /kisskb/src/include/linux/irq.h:20, from /kisskb/src/arch/parisc/include/asm/hardirq.h:13, from /kisskb/src/include/linux/hardirq.h:10, from /kisskb/src/include/linux/interrupt.h:11, from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.c:20: /kisskb/src/arch/parisc/include/asm/io.h:211: note: this is the location of the previous definition #define writeq writeq In file included from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.c:60: /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.h:2066: warning: "writeq_relaxed" redefined #define writeq_relaxed writeq In file included from /kisskb/src/include/linux/io.h:13, from /kisskb/src/include/linux/irq.h:20, from /kisskb/src/arch/parisc/include/asm/hardirq.h:13, from /kisskb/src/include/linux/hardirq.h:10, from /kisskb/src/include/linux/interrupt.h:11, from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.c:20: /kisskb/src/arch/parisc/include/asm/io.h:220: note: this is the location of the previous definition #define writeq_relaxed(q, addr) writeq(q, addr) In file included from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c:19: /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.h:2058: warning: "writeq" redefined #define writeq(val64, db) \ In file included from /kisskb/src/include/linux/scatterlist.h:9, from /kisskb/src/include/linux/dma-mapping.h:10, from /kisskb/src/include/linux/skbuff.h:31, from /kisskb/src/include/linux/if_ether.h:19, from /kisskb/src/include/uapi/linux/ethtool.h:19, from /kisskb/src/include/linux/ethtool.h:18, from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c:11: /kisskb/src/arch/parisc/include/asm/io.h:211: note: this is the location of the previous definition #define writeq writeq In file included from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c:19: /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.h:2066: warning: "writeq_relaxed" redefined #define writeq_relaxed writeq In file included from /kisskb/src/include/linux/scatterlist.h:9, from /kisskb/src/include/linux/dma-mapping.h:10, from /kisskb/src/include/linux/skbuff.h:31, from /kisskb/src/include/linux/if_ether.h:19, from /kisskb/src/include/uapi/linux/ethtool.h:19, from /kisskb/src/include/linux/ethtool.h:18, from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c:11: /kisskb/src/arch/parisc/include/asm/io.h:220: note: this is the location of the previous definition #define writeq_relaxed(q, addr) writeq(q, addr) In file included from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c:23: /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.h:2058: warning: "writeq" redefined #define writeq(val64, db) \ In file included from /kisskb/src/include/linux/scatterlist.h:9, from /kisskb/src/include/linux/dma-mapping.h:10, from /kisskb/src/include/linux/skbuff.h:31, from /kisskb/src/include/linux/if_ether.h:19, from /kisskb/src/include/uapi/linux/ethtool.h:19, from /kisskb/src/include/linux/ethtool.h:18, from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c:13: /kisskb/src/arch/parisc/include/asm/io.h:211: note: this is the location of the previous definition #define writeq writeq In file included from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c:23: /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.h:2066: warning: "writeq_relaxed" redefined #define writeq_relaxed writeq In file included from /kisskb/src/include/linux/scatterlist.h:9, from /kisskb/src/include/linux/dma-mapping.h:10, from /kisskb/src/include/linux/skbuff.h:31, from /kisskb/src/include/linux/if_ether.h:19, from /kisskb/src/include/uapi/linux/ethtool.h:19, from /kisskb/src/include/linux/ethtool.h:18, from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c:13: /kisskb/src/arch/parisc/include/asm/io.h:220: note: this is the location of the previous definition #define writeq_relaxed(q, addr) writeq(q, addr) In file included from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c:20: /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.h:2058: warning: "writeq" redefined #define writeq(val64, db) \ In file included from /kisskb/src/include/linux/scatterlist.h:9, from /kisskb/src/include/linux/dma-mapping.h:10, from /kisskb/src/include/linux/skbuff.h:31, from /kisskb/src/include/net/net_namespace.h:39, from /kisskb/src/include/linux/netdevice.h:37, from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c:11: /kisskb/src/arch/parisc/include/asm/io.h:211: note: this is the location of the previous definition #define writeq writeq In file included from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c:20: /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.h:2066: warning: "writeq_relaxed" redefined #define writeq_relaxed writeq In file included from /kisskb/src/include/linux/scatterlist.h:9, from /kisskb/src/include/linux/dma-mapping.h:10, from /kisskb/src/include/linux/skbuff.h:31, from /kisskb/src/include/net/net_namespace.h:39, from /kisskb/src/include/linux/netdevice.h:37, from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c:11: /kisskb/src/arch/parisc/include/asm/io.h:220: note: this is the location of the previous definition #define writeq_relaxed(q, addr) writeq(q, addr) In file included from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c:24: /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.h:2058: warning: "writeq" redefined #define writeq(val64, db) \ In file included from /kisskb/src/include/linux/io.h:13, from /kisskb/src/include/linux/irq.h:20, from /kisskb/src/arch/parisc/include/asm/hardirq.h:13, from /kisskb/src/include/linux/hardirq.h:10, from /kisskb/src/include/linux/interrupt.h:11, from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c:14: /kisskb/src/arch/parisc/include/asm/io.h:211: note: this is the location of the previous definition #define writeq writeq In file included from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c:24: /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.h:2066: warning: "writeq_relaxed" redefined #define writeq_relaxed writeq In file included from /kisskb/src/include/linux/io.h:13, from /kisskb/src/include/linux/irq.h:20, from /kisskb/src/arch/parisc/include/asm/hardirq.h:13, from /kisskb/src/include/linux/hardirq.h:10, from /kisskb/src/include/linux/interrupt.h:11, from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c:14: /kisskb/src/arch/parisc/include/asm/io.h:220: note: this is the location of the previous definition #define writeq_relaxed(q, addr) writeq(q, addr) In file included from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c:20: /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.h:2058: warning: "writeq" redefined #define writeq(val64, db) \ In file included from /kisskb/src/include/linux/io.h:13, from /kisskb/src/include/linux/irq.h:20, from /kisskb/src/arch/parisc/include/asm/hardirq.h:13, from /kisskb/src/include/linux/hardirq.h:10, from /kisskb/src/include/linux/interrupt.h:11, from /kisskb/src/include/linux/pci.h:38, from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c:11: /kisskb/src/arch/parisc/include/asm/io.h:211: note: this is the location of the previous definition #define writeq writeq In file included from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c:20: /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.h:2066: warning: "writeq_relaxed" redefined #define writeq_relaxed writeq In file included from /kisskb/src/include/linux/io.h:13, from /kisskb/src/include/linux/irq.h:20, from /kisskb/src/arch/parisc/include/asm/hardirq.h:13, from /kisskb/src/include/linux/hardirq.h:10, from /kisskb/src/include/linux/interrupt.h:11, from /kisskb/src/include/linux/pci.h:38, from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c:11: /kisskb/src/arch/parisc/include/asm/io.h:220: note: this is the location of the previous definition #define writeq_relaxed(q, addr) writeq(q, addr) In file included from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c:17: /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.h:2058: warning: "writeq" redefined #define writeq(val64, db) \ In file included from /kisskb/src/include/linux/io.h:13, from /kisskb/src/include/linux/irq.h:20, from /kisskb/src/arch/parisc/include/asm/hardirq.h:13, from /kisskb/src/include/linux/hardirq.h:10, from /kisskb/src/include/linux/interrupt.h:11, from /kisskb/src/include/linux/pci.h:38, from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c:9: /kisskb/src/arch/parisc/include/asm/io.h:211: note: this is the location of the previous definition #define writeq writeq In file included from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c:17: /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.h:2066: warning: "writeq_relaxed" redefined #define writeq_relaxed writeq In file included from /kisskb/src/include/linux/io.h:13, from /kisskb/src/include/linux/irq.h:20, from /kisskb/src/arch/parisc/include/asm/hardirq.h:13, from /kisskb/src/include/linux/hardirq.h:10, from /kisskb/src/include/linux/interrupt.h:11, from /kisskb/src/include/linux/pci.h:38, from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c:9: /kisskb/src/arch/parisc/include/asm/io.h:220: note: this is the location of the previous definition #define writeq_relaxed(q, addr) writeq(q, addr) In file included from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c:14: /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.h:2058: warning: "writeq" redefined #define writeq(val64, db) \ In file included from /kisskb/src/include/linux/io.h:13, from /kisskb/src/include/linux/irq.h:20, from /kisskb/src/arch/parisc/include/asm/hardirq.h:13, from /kisskb/src/include/linux/hardirq.h:10, from /kisskb/src/include/linux/interrupt.h:11, from /kisskb/src/include/linux/pci.h:38, from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c:10: /kisskb/src/arch/parisc/include/asm/io.h:211: note: this is the location of the previous definition #define writeq writeq In file included from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c:14: /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.h:2066: warning: "writeq_relaxed" redefined #define writeq_relaxed writeq In file included from /kisskb/src/include/linux/io.h:13, from /kisskb/src/include/linux/irq.h:20, from /kisskb/src/arch/parisc/include/asm/hardirq.h:13, from /kisskb/src/include/linux/hardirq.h:10, from /kisskb/src/include/linux/interrupt.h:11, from /kisskb/src/include/linux/pci.h:38, from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c:10: /kisskb/src/arch/parisc/include/asm/io.h:220: note: this is the location of the previous definition #define writeq_relaxed(q, addr) writeq(q, addr) In file included from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_dim.c:12: /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.h:2058: warning: "writeq" redefined #define writeq(val64, db) \ In file included from /kisskb/src/include/linux/scatterlist.h:9, from /kisskb/src/include/linux/dma-mapping.h:10, from /kisskb/src/include/linux/skbuff.h:31, from /kisskb/src/include/linux/if_ether.h:19, from /kisskb/src/include/uapi/linux/ethtool.h:19, from /kisskb/src/include/linux/ethtool.h:18, from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.h:23, from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_dim.c:12: /kisskb/src/arch/parisc/include/asm/io.h:211: note: this is the location of the previous definition #define writeq writeq In file included from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_dim.c:12: /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.h:2066: warning: "writeq_relaxed" redefined #define writeq_relaxed writeq In file included from /kisskb/src/include/linux/scatterlist.h:9, from /kisskb/src/include/linux/dma-mapping.h:10, from /kisskb/src/include/linux/skbuff.h:31, from /kisskb/src/include/linux/if_ether.h:19, from /kisskb/src/include/uapi/linux/ethtool.h:19, from /kisskb/src/include/linux/ethtool.h:18, from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.h:23, from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_dim.c:12: /kisskb/src/arch/parisc/include/asm/io.h:220: note: this is the location of the previous definition #define writeq_relaxed(q, addr) writeq(q, addr) In file included from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c:24: /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.h:2058: warning: "writeq" redefined #define writeq(val64, db) \ In file included from /kisskb/src/include/linux/scatterlist.h:9, from /kisskb/src/include/linux/dma-mapping.h:10, from /kisskb/src/include/linux/skbuff.h:31, from /kisskb/src/include/net/net_namespace.h:39, from /kisskb/src/include/linux/netdevice.h:37, from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c:10: /kisskb/src/arch/parisc/include/asm/io.h:211: note: this is the location of the previous definition #define writeq writeq In file included from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c:24: /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.h:2066: warning: "writeq_relaxed" redefined #define writeq_relaxed writeq In file included from /kisskb/src/include/linux/scatterlist.h:9, from /kisskb/src/include/linux/dma-mapping.h:10, from /kisskb/src/include/linux/skbuff.h:31, from /kisskb/src/include/net/net_namespace.h:39, from /kisskb/src/include/linux/netdevice.h:37, from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c:10: /kisskb/src/arch/parisc/include/asm/io.h:220: note: this is the location of the previous definition #define writeq_relaxed(q, addr) writeq(q, addr) In file included from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_debugfs.c:15: /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.h:2058: warning: "writeq" redefined #define writeq(val64, db) \ In file included from /kisskb/src/include/linux/io.h:13, from /kisskb/src/include/linux/irq.h:20, from /kisskb/src/arch/parisc/include/asm/hardirq.h:13, from /kisskb/src/include/linux/hardirq.h:10, from /kisskb/src/include/linux/interrupt.h:11, from /kisskb/src/include/linux/pci.h:38, from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_debugfs.c:12: /kisskb/src/arch/parisc/include/asm/io.h:211: note: this is the location of the previous definition #define writeq writeq In file included from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_debugfs.c:15: /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.h:2066: warning: "writeq_relaxed" redefined #define writeq_relaxed writeq In file included from /kisskb/src/include/linux/io.h:13, from /kisskb/src/include/linux/irq.h:20, from /kisskb/src/arch/parisc/include/asm/hardirq.h:13, from /kisskb/src/include/linux/hardirq.h:10, from /kisskb/src/include/linux/interrupt.h:11, from /kisskb/src/include/linux/pci.h:38, from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_debugfs.c:12: /kisskb/src/arch/parisc/include/asm/io.h:220: note: this is the location of the previous definition #define writeq_relaxed(q, addr) writeq(q, addr) /kisskb/src/drivers/gpu/drm/rockchip/cdn-dp-core.c:1124:12: warning: 'cdn_dp_resume' defined but not used [-Wunused-function] static int cdn_dp_resume(struct device *dev) ^~~~~~~~~~~~~ /kisskb/src/drivers/gpu/drm/nouveau/nvkm/engine/device/ctrl.c: In function 'nvkm_control_mthd_pstate_info': /kisskb/src/drivers/gpu/drm/nouveau/nvkm/engine/device/ctrl.c:60:21: warning: overflow in conversion from 'int' to '__s8' {aka 'signed char'} changes value from '-251' to '5' [-Woverflow] args->v0.pwrsrc = -ENOSYS; ^ Completed OK # rm -rf /kisskb/build/linus_parisc-allmodconfig_parisc-gcc8 # Build took: 0:23:29.365431