# git rev-parse -q --verify 531e93d11470aa2e14e6a3febef50d9bc7bab7a1^{commit} 531e93d11470aa2e14e6a3febef50d9bc7bab7a1 already have revision, skipping fetch # git checkout -q -f -B kisskb 531e93d11470aa2e14e6a3febef50d9bc7bab7a1 # git clean -qxdf # < git log -1 # commit 531e93d11470aa2e14e6a3febef50d9bc7bab7a1 # Merge: 998d75510e37 2a06b8982f8f # Author: Linus Torvalds # Date: Sat Oct 19 17:09:11 2019 -0400 # # Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net # # Pull networking fixes from David Miller: # "I was battling a cold after some recent trips, so quite a bit piled up # meanwhile, sorry about that. # # Highlights: # # 1) Fix fd leak in various bpf selftests, from Brian Vazquez. # # 2) Fix crash in xsk when device doesn't support some methods, from # Magnus Karlsson. # # 3) Fix various leaks and use-after-free in rxrpc, from David Howells. # # 4) Fix several SKB leaks due to confusion of who owns an SKB and who # should release it in the llc code. From Eric Biggers. # # 5) Kill a bunc of KCSAN warnings in TCP, from Eric Dumazet. # # 6) Jumbo packets don't work after resume on r8169, as the BIOS resets # the chip into non-jumbo mode during suspend. From Heiner Kallweit. # # 7) Corrupt L2 header during MPLS push, from Davide Caratti. # # 8) Prevent possible infinite loop in tc_ctl_action, from Eric # Dumazet. # # 9) Get register bits right in bcmgenet driver, based upon chip # version. From Florian Fainelli. # # 10) Fix mutex problems in microchip DSA driver, from Marek Vasut. # # 11) Cure race between route lookup and invalidation in ipv4, from Wei # Wang. # # 12) Fix performance regression due to false sharing in 'net' # structure, from Eric Dumazet" # # * git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (145 commits) # net: reorder 'struct net' fields to avoid false sharing # net: dsa: fix switch tree list # net: ethernet: dwmac-sun8i: show message only when switching to promisc # net: aquantia: add an error handling in aq_nic_set_multicast_list # net: netem: correct the parent's backlog when corrupted packet was dropped # net: netem: fix error path for corrupted GSO frames # macb: propagate errors when getting optional clocks # xen/netback: fix error path of xenvif_connect_data() # net: hns3: fix mis-counting IRQ vector numbers issue # net: usb: lan78xx: Connect PHY before registering MAC # vsock/virtio: discard packets if credit is not respected # vsock/virtio: send a credit update when buffer size is changed # mlxsw: spectrum_trap: Push Ethernet header before reporting trap # net: ensure correct skb->tstamp in various fragmenters # net: bcmgenet: reset 40nm EPHY on energy detect # net: bcmgenet: soft reset 40nm EPHYs before MAC init # net: phy: bcm7xxx: define soft_reset for 40nm EPHY # net: bcmgenet: don't set phydev->link from MAC # net: Update address for MediaTek ethernet driver in MAINTAINERS # ipv4: fix race condition between route lookup and invalidation # ... # < /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 531e93d11470aa2e14e6a3febef50d9bc7bab7a1 # < make -s -j 48 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 48 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 48 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- /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:528:23: note: in expansion of macro 'virt_to_page' page_array[seg] = virt_to_page(va & PAGE_MASK); ^~~~~~~~~~~~ In file included from /kisskb/src/drivers/net/phy/mdio-cavium.c:11: /kisskb/src/drivers/net/phy/mdio-cavium.c: In function 'cavium_mdiobus_set_mode': /kisskb/src/drivers/net/phy/mdio-cavium.h:114:37: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define oct_mdio_readq(addr) readq((void *)addr) ^ /kisskb/src/drivers/net/phy/mdio-cavium.c:21:16: note: in expansion of macro 'oct_mdio_readq' smi_clk.u64 = oct_mdio_readq(p->register_base + SMI_CLK); ^~~~~~~~~~~~~~ /kisskb/src/drivers/net/phy/mdio-cavium.h:113:48: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define oct_mdio_writeq(val, addr) writeq(val, (void *)addr) ^ /kisskb/src/drivers/net/phy/mdio-cavium.c:24:2: note: in expansion of macro 'oct_mdio_writeq' oct_mdio_writeq(smi_clk.u64, p->register_base + SMI_CLK); ^~~~~~~~~~~~~~~ /kisskb/src/drivers/net/phy/mdio-cavium.c: In function 'cavium_mdiobus_c45_addr': /kisskb/src/drivers/net/phy/mdio-cavium.h:113:48: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define oct_mdio_writeq(val, addr) writeq(val, (void *)addr) ^ /kisskb/src/drivers/net/phy/mdio-cavium.c:39:2: note: in expansion of macro 'oct_mdio_writeq' oct_mdio_writeq(smi_wr.u64, p->register_base + SMI_WR_DAT); ^~~~~~~~~~~~~~~ /kisskb/src/drivers/net/phy/mdio-cavium.h:113:48: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define oct_mdio_writeq(val, addr) writeq(val, (void *)addr) ^ /kisskb/src/drivers/net/phy/mdio-cavium.c:47:2: note: in expansion of macro 'oct_mdio_writeq' oct_mdio_writeq(smi_cmd.u64, p->register_base + SMI_CMD); ^~~~~~~~~~~~~~~ /kisskb/src/drivers/net/phy/mdio-cavium.h:114:37: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define oct_mdio_readq(addr) readq((void *)addr) ^ /kisskb/src/drivers/net/phy/mdio-cavium.c:54:16: note: in expansion of macro 'oct_mdio_readq' smi_wr.u64 = oct_mdio_readq(p->register_base + SMI_WR_DAT); ^~~~~~~~~~~~~~ /kisskb/src/drivers/net/phy/mdio-cavium.c: In function 'cavium_mdiobus_read': /kisskb/src/drivers/net/phy/mdio-cavium.h:113:48: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define oct_mdio_writeq(val, addr) writeq(val, (void *)addr) ^ /kisskb/src/drivers/net/phy/mdio-cavium.c:86:2: note: in expansion of macro 'oct_mdio_writeq' oct_mdio_writeq(smi_cmd.u64, p->register_base + SMI_CMD); ^~~~~~~~~~~~~~~ /kisskb/src/drivers/net/phy/mdio-cavium.h:114:37: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define oct_mdio_readq(addr) readq((void *)addr) ^ /kisskb/src/drivers/net/phy/mdio-cavium.c:93:16: note: in expansion of macro 'oct_mdio_readq' smi_rd.u64 = oct_mdio_readq(p->register_base + SMI_RD_DAT); ^~~~~~~~~~~~~~ /kisskb/src/drivers/net/phy/mdio-cavium.c: In function 'cavium_mdiobus_write': /kisskb/src/drivers/net/phy/mdio-cavium.h:113:48: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define oct_mdio_writeq(val, addr) writeq(val, (void *)addr) ^ /kisskb/src/drivers/net/phy/mdio-cavium.c:125:2: note: in expansion of macro 'oct_mdio_writeq' oct_mdio_writeq(smi_wr.u64, p->register_base + SMI_WR_DAT); ^~~~~~~~~~~~~~~ /kisskb/src/drivers/net/phy/mdio-cavium.h:113:48: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define oct_mdio_writeq(val, addr) writeq(val, (void *)addr) ^ /kisskb/src/drivers/net/phy/mdio-cavium.c:131:2: note: in expansion of macro 'oct_mdio_writeq' oct_mdio_writeq(smi_cmd.u64, p->register_base + SMI_CMD); ^~~~~~~~~~~~~~~ /kisskb/src/drivers/net/phy/mdio-cavium.h:114:37: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define oct_mdio_readq(addr) readq((void *)addr) ^ /kisskb/src/drivers/net/phy/mdio-cavium.c:138:16: note: in expansion of macro 'oct_mdio_readq' smi_wr.u64 = oct_mdio_readq(p->register_base + SMI_WR_DAT); ^~~~~~~~~~~~~~ /kisskb/src/drivers/net/phy/mdio-octeon.c: In function 'octeon_mdiobus_probe': /kisskb/src/drivers/net/phy/mdio-octeon.c:48:3: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] (u64)devm_ioremap(&pdev->dev, mdio_phys, regsize); ^ In file included from /kisskb/src/drivers/net/phy/mdio-octeon.c:14: /kisskb/src/drivers/net/phy/mdio-cavium.h:113:48: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define oct_mdio_writeq(val, addr) writeq(val, (void *)addr) ^ /kisskb/src/drivers/net/phy/mdio-octeon.c:56:2: note: in expansion of macro 'oct_mdio_writeq' oct_mdio_writeq(smi_en.u64, bus->register_base + SMI_EN); ^~~~~~~~~~~~~~~ /kisskb/src/drivers/net/phy/mdio-cavium.h:113:48: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define oct_mdio_writeq(val, addr) writeq(val, (void *)addr) ^ /kisskb/src/drivers/net/phy/mdio-octeon.c:77:2: note: in expansion of macro 'oct_mdio_writeq' oct_mdio_writeq(smi_en.u64, bus->register_base + SMI_EN); ^~~~~~~~~~~~~~~ /kisskb/src/drivers/net/phy/mdio-octeon.c: In function 'octeon_mdiobus_remove': /kisskb/src/drivers/net/phy/mdio-cavium.h:113:48: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define oct_mdio_writeq(val, addr) writeq(val, (void *)addr) ^ /kisskb/src/drivers/net/phy/mdio-octeon.c:91:2: note: in expansion of macro 'oct_mdio_writeq' oct_mdio_writeq(smi_en.u64, bus->register_base + SMI_EN); ^~~~~~~~~~~~~~~ In file included from /kisskb/src/arch/mips/include/asm/octeon/octeon.h:11, from /kisskb/src/drivers/staging/octeon/octeon-ethernet.h:19, from /kisskb/src/drivers/staging/octeon/ethernet.c:22: /kisskb/src/arch/mips/include/asm/octeon/cvmx.h: In function 'cvmx_writeq_csr': /kisskb/src/arch/mips/include/asm/octeon/cvmx.h:282:17: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] cvmx_write_csr((__force uint64_t)csr_addr, val); ^ /kisskb/src/arch/mips/include/asm/octeon/cvmx.h: In function 'cvmx_readq_csr': /kisskb/src/arch/mips/include/asm/octeon/cvmx.h:299:23: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] return cvmx_read_csr((__force uint64_t) csr_addr); ^ In file included from /kisskb/src/arch/mips/include/asm/octeon/octeon.h:11, from /kisskb/src/drivers/staging/octeon/octeon-ethernet.h:19, from /kisskb/src/drivers/staging/octeon/ethernet-mdio.c:16: /kisskb/src/arch/mips/include/asm/octeon/cvmx.h: In function 'cvmx_writeq_csr': /kisskb/src/arch/mips/include/asm/octeon/cvmx.h:282:17: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] cvmx_write_csr((__force uint64_t)csr_addr, val); ^ /kisskb/src/arch/mips/include/asm/octeon/cvmx.h: In function 'cvmx_readq_csr': /kisskb/src/arch/mips/include/asm/octeon/cvmx.h:299:23: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] return cvmx_read_csr((__force uint64_t) csr_addr); ^ In file included from /kisskb/src/arch/mips/include/asm/octeon/octeon.h:11, from /kisskb/src/drivers/staging/octeon/octeon-ethernet.h:19, from /kisskb/src/drivers/staging/octeon/ethernet-mem.c:12: /kisskb/src/arch/mips/include/asm/octeon/cvmx.h: In function 'cvmx_writeq_csr': /kisskb/src/arch/mips/include/asm/octeon/cvmx.h:282:17: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] cvmx_write_csr((__force uint64_t)csr_addr, val); ^ /kisskb/src/arch/mips/include/asm/octeon/cvmx.h: In function 'cvmx_readq_csr': /kisskb/src/arch/mips/include/asm/octeon/cvmx.h:299:23: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] return cvmx_read_csr((__force uint64_t) csr_addr); ^ In file included from /kisskb/src/arch/mips/include/asm/octeon/octeon.h:11, from /kisskb/src/drivers/staging/octeon/octeon-ethernet.h:19, from /kisskb/src/drivers/staging/octeon/ethernet-rgmii.c:15: /kisskb/src/arch/mips/include/asm/octeon/cvmx.h: In function 'cvmx_writeq_csr': /kisskb/src/arch/mips/include/asm/octeon/cvmx.h:282:17: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] cvmx_write_csr((__force uint64_t)csr_addr, val); ^ /kisskb/src/arch/mips/include/asm/octeon/cvmx.h: In function 'cvmx_readq_csr': /kisskb/src/arch/mips/include/asm/octeon/cvmx.h:299:23: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] return cvmx_read_csr((__force uint64_t) csr_addr); ^ In file included from /kisskb/src/arch/mips/include/asm/octeon/octeon.h:11, from /kisskb/src/drivers/staging/octeon/octeon-ethernet.h:19, from /kisskb/src/drivers/staging/octeon/ethernet-rx.c:26: /kisskb/src/arch/mips/include/asm/octeon/cvmx.h: In function 'cvmx_writeq_csr': /kisskb/src/arch/mips/include/asm/octeon/cvmx.h:282:17: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] cvmx_write_csr((__force uint64_t)csr_addr, val); ^ /kisskb/src/arch/mips/include/asm/octeon/cvmx.h: In function 'cvmx_readq_csr': /kisskb/src/arch/mips/include/asm/octeon/cvmx.h:299:23: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] return cvmx_read_csr((__force uint64_t) csr_addr); ^ In file included from /kisskb/src/drivers/staging/octeon/ethernet-rx.c:27: /kisskb/src/drivers/staging/octeon/ethernet-rx.c: In function 'cvm_oct_poll': /kisskb/src/drivers/staging/octeon/ethernet-defines.h:30:38: error: 'CONFIG_CAVIUM_OCTEON_CVMSEG_SIZE' undeclared (first use in this function); did you mean 'CONFIG_MDIO_OCTEON_MODULE'? #define USE_ASYNC_IOBDMA (CONFIG_CAVIUM_OCTEON_CVMSEG_SIZE > 0) ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/drivers/staging/octeon/ethernet-rx.c:190:6: note: in expansion of macro 'USE_ASYNC_IOBDMA' if (USE_ASYNC_IOBDMA) { ^~~~~~~~~~~~~~~~ /kisskb/src/drivers/staging/octeon/ethernet-defines.h:30:38: note: each undeclared identifier is reported only once for each function it appears in #define USE_ASYNC_IOBDMA (CONFIG_CAVIUM_OCTEON_CVMSEG_SIZE > 0) ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/drivers/staging/octeon/ethernet-rx.c:190:6: note: in expansion of macro 'USE_ASYNC_IOBDMA' if (USE_ASYNC_IOBDMA) { ^~~~~~~~~~~~~~~~ /kisskb/src/drivers/staging/octeon/ethernet-rx.c: In function 'cvm_oct_rx_initialize': /kisskb/src/drivers/staging/octeon/ethernet-rx.c:472:25: error: 'OCTEON_IRQ_WORKQ0' undeclared (first use in this function); did you mean 'OCTEON_IS_MODEL'? oct_rx_group[i].irq = OCTEON_IRQ_WORKQ0 + i; ^~~~~~~~~~~~~~~~~ OCTEON_IS_MODEL make[4]: *** [/kisskb/src/scripts/Makefile.build:265: drivers/staging/octeon/ethernet-rx.o] Error 1 make[3]: *** [/kisskb/src/scripts/Makefile.build:509: drivers/staging/octeon] Error 2 make[3]: *** Waiting for unfinished jobs.... /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:26, 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) 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) make[2]: *** [/kisskb/src/scripts/Makefile.build:509: drivers/staging] Error 2 make[2]: *** Waiting for unfinished jobs.... /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:300:1: warning: the frame size of 1152 bytes is larger than 1024 bytes [-Wframe-larger-than=] } ^ make[1]: *** [/kisskb/src/Makefile:1649: drivers] Error 2 make[1]: *** Waiting for unfinished jobs.... make: *** [Makefile:179: sub-make] Error 2 Command 'make -s -j 48 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- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_mips-allmodconfig_mips-gcc8 # Build took: 0:15:52.626268