# git rev-parse -q --verify 9140d8bdd4c5a04abe181bb300378355d56990a4^{commit} 9140d8bdd4c5a04abe181bb300378355d56990a4 already have revision, skipping fetch # git checkout -q -f -B kisskb 9140d8bdd4c5a04abe181bb300378355d56990a4 # git clean -qxdf # < git log -1 # commit 9140d8bdd4c5a04abe181bb300378355d56990a4 # Merge: b9bd6806d014 c536277e0db1 # Author: Linus Torvalds # Date: Fri Aug 23 14:53:09 2019 -0700 # # Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma # # Pull rdma fixes from Doug Ledford: # "No beating around the bush: this is a monster pull request for an -rc5 # kernel. Intel hit me with a series of fixes for TID processing. # Mellanox hit me with a series for their UMR memory support. # # And we had one fix for siw that fixes the 32bit build warnings and # because of the number of casts that had to be changed to properly # silence the warnings, that one patch alone is a full 40% of the LOC of # this entire pull request. Given that this is the initial release # kernel for siw, I'm trying to fix anything in it that we can, so that # adds to the impetus to take fixes for it like this one. # # I had to do a rebase early in the week. Jason had thought he put a # patch on the rc queue that he needed to be there so he could base some # work off of it, and it had actually not been placed there. So he asked # me (on Tuesday) to fix that up before pushing my wip branch to the # official rc branch. I did, and that's why the early patches look like # they were all committed at the same time on Tuesday. That bunch had # been in my queue prior. # # The various patches all pass my test for being legitimate fixes and # not attempts to slide new features or development into a late rc. # Well, they were all fixes with the exception of a couple clean up # patches people wrote for making the fixes they also wrote better (like # a cleanup patch to move UMR checking into a function so that the # remaining UMR fix patches can reference that function), so I left # those in place too. # # My apologies for the LOC count and the number of patches here, it's # just how the cards fell this cycle. # # Summary: # # - Fix siw buffer mapping issue # # - Fix siw 32/64 casting issues # # - Fix a KASAN access issue in bnxt_re # # - Fix several memory leaks (hfi1, mlx4) # # - Fix a NULL deref in cma_cleanup # # - Fixes for UMR memory support in mlx5 (4 patch series) # # - Fix namespace check for restrack # # - Fixes for counter support # # - Fixes for hfi1 TID processing (5 patch series) # # - Fix potential NULL deref in siw # # - Fix memory page calculations in mlx5" # # * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma: (21 commits) # RDMA/siw: Fix 64/32bit pointer inconsistency # RDMA/siw: Fix SGL mapping issues # RDMA/bnxt_re: Fix stack-out-of-bounds in bnxt_qplib_rcfw_send_message # infiniband: hfi1: fix memory leaks # infiniband: hfi1: fix a memory leak bug # IB/mlx4: Fix memory leaks # RDMA/cma: fix null-ptr-deref Read in cma_cleanup # IB/mlx5: Block MR WR if UMR is not possible # IB/mlx5: Fix MR re-registration flow to use UMR properly # IB/mlx5: Report and handle ODP support properly # IB/mlx5: Consolidate use_umr checks into single function # RDMA/restrack: Rewrite PID namespace check to be reliable # RDMA/counters: Properly implement PID checks # IB/core: Fix NULL pointer dereference when bind QP to counter # IB/hfi1: Drop stale TID RDMA packets that cause TIDErr # IB/hfi1: Add additional checks when handling TID RDMA WRITE DATA packet # IB/hfi1: Add additional checks when handling TID RDMA READ RESP packet # IB/hfi1: Unsafe PSN checking for TID RDMA READ Resp packet # IB/hfi1: Drop stale TID RDMA packets # RDMA/siw: Fix potential NULL de-ref # ... # < /opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux-ld --version # < git log --format=%s --max-count=1 9140d8bdd4c5a04abe181bb300378355d56990a4 # < make -s -j 120 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux- allmodconfig # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_MODULE_SIG=n # Added to kconfig CONFIG_SAMPLES=n # Added to kconfig CONFIG_MIPS_CPS_NS16550_BASE=0x1b0003f8 # Added to kconfig CONFIG_MIPS_CPS_NS16550_SHIFT=0 # yes \n | make -s -j 120 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux- oldconfig yes: standard output: Broken pipe # make -s -j 120 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux- :1511:2: warning: #warning syscall clone3 not implemented [-Wcpp] /kisskb/src/drivers/crypto/ccree/cc_cipher.c: In function 'cc_cipher_setkey': /kisskb/src/drivers/crypto/ccree/cc_cipher.c:465:1: warning: the frame size of 1136 bytes is larger than 1024 bytes [-Wframe-larger-than=] } ^ /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/arch/mips/include/asm/page.h:261, from /kisskb/src/arch/mips/include/asm/io.h:29, from /kisskb/src/arch/mips/include/asm/mmiowb.h:5, from /kisskb/src/include/linux/spinlock.h:60, from /kisskb/src/include/linux/wait.h:9, from /kisskb/src/include/linux/net.h:19, from /kisskb/src/drivers/infiniband/sw/siw/siw_qp_tx.c:8: /kisskb/src/drivers/infiniband/sw/siw/siw_qp_tx.c: In function 'siw_tx_hdt': /kisskb/src/arch/mips/include/asm/page.h:249:53: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define virt_to_pfn(kaddr) PFN_DOWN(virt_to_phys((void *)(kaddr))) ^ /kisskb/src/include/asm-generic/memory_model.h:33:41: note: in definition of macro '__pfn_to_page' #define __pfn_to_page(pfn) (mem_map + ((pfn) - ARCH_PFN_OFFSET)) ^~~ /kisskb/src/arch/mips/include/asm/page.h:249:31: note: in expansion of macro 'PFN_DOWN' #define virt_to_pfn(kaddr) PFN_DOWN(virt_to_phys((void *)(kaddr))) ^~~~~~~~ /kisskb/src/arch/mips/include/asm/page.h:250:41: note: in expansion of macro 'virt_to_pfn' #define virt_to_page(kaddr) pfn_to_page(virt_to_pfn(kaddr)) ^~~~~~~~~~~ /kisskb/src/drivers/infiniband/sw/siw/siw_qp_tx.c:529:23: note: in expansion of macro 'virt_to_page' page_array[seg] = virt_to_page(va & PAGE_MASK); ^~~~~~~~~~~~ /kisskb/src/drivers/soundwire/slave.c:16:12: warning: 'sdw_slave_add' defined but not used [-Wunused-function] static int sdw_slave_add(struct sdw_bus *bus, ^~~~~~~~~~~~~ In file included from /kisskb/src/arch/mips/include/asm/sibyte/sb1250.h:28, from /kisskb/src/drivers/watchdog/sb_wdog.c:58: /kisskb/src/arch/mips/include/asm/sibyte/bcm1480_scd.h:261: warning: "M_SPC_CFG_CLEAR" redefined #define M_SPC_CFG_CLEAR M_BCM1480_SPC_CFG_CLEAR In file included from /kisskb/src/arch/mips/include/asm/sibyte/sb1250.h:27, from /kisskb/src/drivers/watchdog/sb_wdog.c:58: /kisskb/src/arch/mips/include/asm/sibyte/sb1250_scd.h:392: note: this is the location of the previous definition #define M_SPC_CFG_CLEAR _SB_MAKEMASK1(32) In file included from /kisskb/src/arch/mips/include/asm/sibyte/sb1250.h:28, from /kisskb/src/drivers/watchdog/sb_wdog.c:58: /kisskb/src/arch/mips/include/asm/sibyte/bcm1480_scd.h:262: warning: "M_SPC_CFG_ENABLE" redefined #define M_SPC_CFG_ENABLE M_BCM1480_SPC_CFG_ENABLE In file included from /kisskb/src/arch/mips/include/asm/sibyte/sb1250.h:27, from /kisskb/src/drivers/watchdog/sb_wdog.c:58: /kisskb/src/arch/mips/include/asm/sibyte/sb1250_scd.h:393: note: this is the location of the previous definition #define M_SPC_CFG_ENABLE _SB_MAKEMASK1(33) /kisskb/src/drivers/spi/spi-sh-msiof.c:76: warning: "STR" redefined #define STR 0x40 /* Status Register */ In file included from /kisskb/src/arch/mips/include/asm/mach-generic/spaces.h:15, from /kisskb/src/arch/mips/include/asm/addrspace.h:13, from /kisskb/src/arch/mips/include/asm/barrier.h:11, from /kisskb/src/include/linux/compiler.h:256, from /kisskb/src/arch/mips/include/asm/bitops.h:16, from /kisskb/src/include/linux/bitops.h:19, from /kisskb/src/include/linux/bitmap.h:8, from /kisskb/src/drivers/spi/spi-sh-msiof.c:10: /kisskb/src/arch/mips/include/asm/mipsregs.h:30: note: this is the location of the previous definition #define STR(x) __STR(x) /kisskb/src/drivers/net/ethernet/mellanox/mlx5/core/en_stats.c: In function 'mlx5e_grp_sw_update_stats': /kisskb/src/drivers/net/ethernet/mellanox/mlx5/core/en_stats.c:294:1: warning: the frame size of 1112 bytes is larger than 1024 bytes [-Wframe-larger-than=] } ^ /kisskb/src/drivers/net/ethernet/mellanox/mlx5/core/en/xsk/setup.c: In function 'mlx5e_open_xsk': /kisskb/src/drivers/net/ethernet/mellanox/mlx5/core/en/xsk/setup.c:127:1: warning: the frame size of 1288 bytes is larger than 1024 bytes [-Wframe-larger-than=] } ^ FIT description: Linux 5.3.0-rc5+ Created: Sat Aug 24 10:06:46 2019 Image 0 (kernel@0) Description: Linux 5.3.0-rc5+ Created: Sat Aug 24 10:06:46 2019 Type: Kernel Image Compression: gzip compressed Data Size: 6954823 Bytes = 6791.82 KiB = 6.63 MiB Architecture: MIPS OS: Linux Load Address: 0x84000000 Entry Point: 0x84a2d9a0 Hash algo: sha1 Hash value: 8b82450f6c54135950223de795169ebb225e4243 Image 1 (fdt@boston) Description: img,boston Device Tree Created: Sat Aug 24 10:06:46 2019 Type: Flat Device Tree Compression: uncompressed Data Size: 3793 Bytes = 3.70 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: 4799f50d688573234da6e9d7701234d394759ef4 Image 2 (fdt@ni169445) Description: NI 169445 device tree Created: Sat Aug 24 10:06:46 2019 Type: Flat Device Tree Compression: uncompressed Data Size: 1871 Bytes = 1.83 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: 51b89b31605ee62038c8468c429af091dfc75ec7 Image 3 (fdt@ocelot_pcb123) Description: MSCC Ocelot PCB123 Device Tree Created: Sat Aug 24 10:06:46 2019 Type: Flat Device Tree Compression: uncompressed Data Size: 4615 Bytes = 4.51 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: 8754eadee600cac22c9c34884cd901aac7e95e8a Image 4 (fdt@ocelot_pcb120) Description: MSCC Ocelot PCB120 Device Tree Created: Sat Aug 24 10:06:46 2019 Type: Flat Device Tree Compression: uncompressed Data Size: 5174 Bytes = 5.05 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: 1ab7d0871c0a9345c6269fb491bf028224da8256 Image 5 (fdt@xilfpga) Description: MIPSfpga (xilfpga) Device Tree Created: Sat Aug 24 10:06:46 2019 Type: Flat Device Tree Compression: uncompressed Data Size: 2708 Bytes = 2.64 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: 63d058b780f65e22da30f0a183433765f1807f1d Default Configuration: 'conf@default' Configuration 0 (conf@default) Description: Generic Linux kernel Kernel: kernel@0 Configuration 1 (conf@boston) Description: Boston Linux kernel Kernel: kernel@0 FDT: fdt@boston Configuration 2 (conf@ni169445) Description: NI 169445 Linux Kernel Kernel: kernel@0 FDT: fdt@ni169445 Configuration 3 (conf@ocelot_pcb123) Description: Ocelot Linux kernel Kernel: kernel@0 FDT: fdt@ocelot_pcb123 Configuration 4 (conf@ocelot_pcb120) Description: Ocelot Linux kernel Kernel: kernel@0 FDT: fdt@ocelot_pcb120 Configuration 5 (conf@xilfpga) Description: MIPSfpga Linux kernel Kernel: kernel@0 FDT: fdt@xilfpga Completed OK # rm -rf /kisskb/build/linus_mips-allmodconfig_mips-gcc8 # Build took: 0:09:37.517337