commit: 340b36c8a3f3153c6a823bf684e54a89db2e3d4a Author: Mike Pagano <mpagano <AT> gentoo <DOT> org> AuthorDate: Wed Mar 23 11:53:45 2022 +0000 Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org> CommitDate: Wed Mar 23 11:53:45 2022 +0000 URL: https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=340b36c8
Linux patch 5.15.31 Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org> 0000_README | 6 +- 1030_linux-5.15.31.patch | 993 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 998 insertions(+), 1 deletion(-) diff --git a/0000_README b/0000_README index 26b11d81..a0f44b6e 100644 --- a/0000_README +++ b/0000_README @@ -159,10 +159,14 @@ Patch: 1028_linux-5.15.29.patch From: http://www.kernel.org Desc: Linux 5.15.29 -Patch: 1028_linux-5.15.30.patch +Patch: 1029_linux-5.15.30.patch From: http://www.kernel.org Desc: Linux 5.15.30 +Patch: 1030_linux-5.15.31.patch +From: http://www.kernel.org +Desc: Linux 5.15.31 + Patch: 1500_XATTR_USER_PREFIX.patch From: https://bugs.gentoo.org/show_bug.cgi?id=470644 Desc: Support for namespace user.pax.* on tmpfs. diff --git a/1030_linux-5.15.31.patch b/1030_linux-5.15.31.patch new file mode 100644 index 00000000..97bdcc53 --- /dev/null +++ b/1030_linux-5.15.31.patch @@ -0,0 +1,993 @@ +diff --git a/Makefile b/Makefile +index e0b2057a2dda6..eeeb806f0092d 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,7 +1,7 @@ + # SPDX-License-Identifier: GPL-2.0 + VERSION = 5 + PATCHLEVEL = 15 +-SUBLEVEL = 30 ++SUBLEVEL = 31 + EXTRAVERSION = + NAME = Trick or Treat + +diff --git a/arch/arm64/include/asm/vectors.h b/arch/arm64/include/asm/vectors.h +index f64613a96d530..bc9a2145f4194 100644 +--- a/arch/arm64/include/asm/vectors.h ++++ b/arch/arm64/include/asm/vectors.h +@@ -56,14 +56,14 @@ enum arm64_bp_harden_el1_vectors { + DECLARE_PER_CPU_READ_MOSTLY(const char *, this_cpu_vector); + + #ifndef CONFIG_UNMAP_KERNEL_AT_EL0 +-#define TRAMP_VALIAS 0 ++#define TRAMP_VALIAS 0ul + #endif + + static inline const char * + arm64_get_bp_hardening_vector(enum arm64_bp_harden_el1_vectors slot) + { + if (arm64_kernel_unmapped_at_el0()) +- return (char *)TRAMP_VALIAS + SZ_2K * slot; ++ return (char *)(TRAMP_VALIAS + SZ_2K * slot); + + WARN_ON_ONCE(slot == EL1_VECTOR_KPTI); + +diff --git a/block/blk-core.c b/block/blk-core.c +index 42ac3a985c2d7..5009b9f1c3c9d 100644 +--- a/block/blk-core.c ++++ b/block/blk-core.c +@@ -49,6 +49,7 @@ + #include "blk-mq.h" + #include "blk-mq-sched.h" + #include "blk-pm.h" ++#include "blk-rq-qos.h" + + struct dentry *blk_debugfs_root; + +@@ -380,6 +381,9 @@ void blk_cleanup_queue(struct request_queue *q) + */ + blk_freeze_queue(q); + ++ /* cleanup rq qos structures for queue without disk */ ++ rq_qos_exit(q); ++ + blk_queue_flag_set(QUEUE_FLAG_DEAD, q); + + blk_sync_queue(q); +diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c +index 422753d52244b..a31ffe16e626f 100644 +--- a/drivers/atm/eni.c ++++ b/drivers/atm/eni.c +@@ -1112,6 +1112,8 @@ DPRINTK("iovcnt = %d\n",skb_shinfo(skb)->nr_frags); + skb_data3 = skb->data[3]; + paddr = dma_map_single(&eni_dev->pci_dev->dev,skb->data,skb->len, + DMA_TO_DEVICE); ++ if (dma_mapping_error(&eni_dev->pci_dev->dev, paddr)) ++ return enq_next; + ENI_PRV_PADDR(skb) = paddr; + /* prepare DMA queue entries */ + j = 0; +diff --git a/drivers/crypto/qcom-rng.c b/drivers/crypto/qcom-rng.c +index 99ba8d51d1020..11f30fd48c141 100644 +--- a/drivers/crypto/qcom-rng.c ++++ b/drivers/crypto/qcom-rng.c +@@ -8,6 +8,7 @@ + #include <linux/clk.h> + #include <linux/crypto.h> + #include <linux/io.h> ++#include <linux/iopoll.h> + #include <linux/module.h> + #include <linux/of.h> + #include <linux/platform_device.h> +@@ -43,16 +44,19 @@ static int qcom_rng_read(struct qcom_rng *rng, u8 *data, unsigned int max) + { + unsigned int currsize = 0; + u32 val; ++ int ret; + + /* read random data from hardware */ + do { +- val = readl_relaxed(rng->base + PRNG_STATUS); +- if (!(val & PRNG_STATUS_DATA_AVAIL)) +- break; ++ ret = readl_poll_timeout(rng->base + PRNG_STATUS, val, ++ val & PRNG_STATUS_DATA_AVAIL, ++ 200, 10000); ++ if (ret) ++ return ret; + + val = readl_relaxed(rng->base + PRNG_DATA_OUT); + if (!val) +- break; ++ return -EINVAL; + + if ((max - currsize) >= WORD_SZ) { + memcpy(data, &val, WORD_SZ); +@@ -61,11 +65,10 @@ static int qcom_rng_read(struct qcom_rng *rng, u8 *data, unsigned int max) + } else { + /* copy only remaining bytes */ + memcpy(data, &val, max - currsize); +- break; + } + } while (currsize < max); + +- return currsize; ++ return 0; + } + + static int qcom_rng_generate(struct crypto_rng *tfm, +@@ -87,7 +90,7 @@ static int qcom_rng_generate(struct crypto_rng *tfm, + mutex_unlock(&rng->lock); + clk_disable_unprepare(rng->clk); + +- return 0; ++ return ret; + } + + static int qcom_rng_seed(struct crypto_rng *tfm, const u8 *seed, +diff --git a/drivers/firmware/efi/apple-properties.c b/drivers/firmware/efi/apple-properties.c +index 4c3201e290e29..ea84108035eb0 100644 +--- a/drivers/firmware/efi/apple-properties.c ++++ b/drivers/firmware/efi/apple-properties.c +@@ -24,7 +24,7 @@ static bool dump_properties __initdata; + static int __init dump_properties_enable(char *arg) + { + dump_properties = true; +- return 0; ++ return 1; + } + + __setup("dump_apple_properties", dump_properties_enable); +diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c +index 9fa86288b78a9..e3df82d5d37a8 100644 +--- a/drivers/firmware/efi/efi.c ++++ b/drivers/firmware/efi/efi.c +@@ -209,7 +209,7 @@ static int __init efivar_ssdt_setup(char *str) + memcpy(efivar_ssdt, str, strlen(str)); + else + pr_warn("efivar_ssdt: name too long: %s\n", str); +- return 0; ++ return 1; + } + __setup("efivar_ssdt=", efivar_ssdt_setup); + +diff --git a/drivers/gpu/drm/bridge/Kconfig b/drivers/gpu/drm/bridge/Kconfig +index 431b6e12a81fe..68ec45abc1fbf 100644 +--- a/drivers/gpu/drm/bridge/Kconfig ++++ b/drivers/gpu/drm/bridge/Kconfig +@@ -8,7 +8,6 @@ config DRM_BRIDGE + config DRM_PANEL_BRIDGE + def_bool y + depends on DRM_BRIDGE +- depends on DRM_KMS_HELPER + select DRM_PANEL + help + DRM bridge wrapper of DRM panels +@@ -30,6 +29,7 @@ config DRM_CDNS_DSI + config DRM_CHIPONE_ICN6211 + tristate "Chipone ICN6211 MIPI-DSI/RGB Converter bridge" + depends on OF ++ select DRM_KMS_HELPER + select DRM_MIPI_DSI + select DRM_PANEL_BRIDGE + help +diff --git a/drivers/gpu/drm/imx/parallel-display.c b/drivers/gpu/drm/imx/parallel-display.c +index a8aba0141ce71..06cb1a59b9bcd 100644 +--- a/drivers/gpu/drm/imx/parallel-display.c ++++ b/drivers/gpu/drm/imx/parallel-display.c +@@ -217,14 +217,6 @@ static int imx_pd_bridge_atomic_check(struct drm_bridge *bridge, + if (!imx_pd_format_supported(bus_fmt)) + return -EINVAL; + +- if (bus_flags & +- ~(DRM_BUS_FLAG_DE_LOW | DRM_BUS_FLAG_DE_HIGH | +- DRM_BUS_FLAG_PIXDATA_DRIVE_POSEDGE | +- DRM_BUS_FLAG_PIXDATA_DRIVE_NEGEDGE)) { +- dev_warn(imxpd->dev, "invalid bus_flags (%x)\n", bus_flags); +- return -EINVAL; +- } +- + bridge_state->output_bus_cfg.flags = bus_flags; + bridge_state->input_bus_cfg.flags = bus_flags; + imx_crtc_state->bus_flags = bus_flags; +diff --git a/drivers/gpu/drm/mgag200/mgag200_pll.c b/drivers/gpu/drm/mgag200/mgag200_pll.c +index e9ae22b4f8138..52be08b744ade 100644 +--- a/drivers/gpu/drm/mgag200/mgag200_pll.c ++++ b/drivers/gpu/drm/mgag200/mgag200_pll.c +@@ -404,9 +404,9 @@ mgag200_pixpll_update_g200wb(struct mgag200_pll *pixpll, const struct mgag200_pl + udelay(50); + + /* program pixel pll register */ +- WREG_DAC(MGA1064_PIX_PLLC_N, xpixpllcn); +- WREG_DAC(MGA1064_PIX_PLLC_M, xpixpllcm); +- WREG_DAC(MGA1064_PIX_PLLC_P, xpixpllcp); ++ WREG_DAC(MGA1064_WB_PIX_PLLC_N, xpixpllcn); ++ WREG_DAC(MGA1064_WB_PIX_PLLC_M, xpixpllcm); ++ WREG_DAC(MGA1064_WB_PIX_PLLC_P, xpixpllcp); + + udelay(50); + +diff --git a/drivers/gpu/drm/panel/Kconfig b/drivers/gpu/drm/panel/Kconfig +index f63fd0f903602..af1402d83d51c 100644 +--- a/drivers/gpu/drm/panel/Kconfig ++++ b/drivers/gpu/drm/panel/Kconfig +@@ -84,6 +84,7 @@ config DRM_PANEL_SIMPLE + select VIDEOMODE_HELPERS + select DRM_DP_AUX_BUS + select DRM_DP_HELPER ++ select DRM_KMS_HELPER + help + DRM panel driver for dumb panels that need at most a regulator and + a GPIO to be powered up. Optionally a backlight can be attached so +diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c +index b7b654f2dfd90..f9242c19b4582 100644 +--- a/drivers/gpu/drm/panel/panel-simple.c ++++ b/drivers/gpu/drm/panel/panel-simple.c +@@ -2510,7 +2510,7 @@ static const struct display_timing innolux_g070y2_l01_timing = { + static const struct panel_desc innolux_g070y2_l01 = { + .timings = &innolux_g070y2_l01_timing, + .num_timings = 1, +- .bpc = 6, ++ .bpc = 8, + .size = { + .width = 152, + .height = 91, +diff --git a/drivers/input/tablet/aiptek.c b/drivers/input/tablet/aiptek.c +index fcb1b646436a5..1581f6ef09279 100644 +--- a/drivers/input/tablet/aiptek.c ++++ b/drivers/input/tablet/aiptek.c +@@ -1787,15 +1787,13 @@ aiptek_probe(struct usb_interface *intf, const struct usb_device_id *id) + input_set_abs_params(inputdev, ABS_TILT_Y, AIPTEK_TILT_MIN, AIPTEK_TILT_MAX, 0, 0); + input_set_abs_params(inputdev, ABS_WHEEL, AIPTEK_WHEEL_MIN, AIPTEK_WHEEL_MAX - 1, 0, 0); + +- /* Verify that a device really has an endpoint */ +- if (intf->cur_altsetting->desc.bNumEndpoints < 1) { ++ err = usb_find_common_endpoints(intf->cur_altsetting, ++ NULL, NULL, &endpoint, NULL); ++ if (err) { + dev_err(&intf->dev, +- "interface has %d endpoints, but must have minimum 1\n", +- intf->cur_altsetting->desc.bNumEndpoints); +- err = -EINVAL; ++ "interface has no int in endpoints, but must have minimum 1\n"); + goto fail3; + } +- endpoint = &intf->cur_altsetting->endpoint[0].desc; + + /* Go set up our URB, which is called when the tablet receives + * input. +diff --git a/drivers/net/ethernet/atheros/alx/main.c b/drivers/net/ethernet/atheros/alx/main.c +index 4ea157efca868..98a8698a32017 100644 +--- a/drivers/net/ethernet/atheros/alx/main.c ++++ b/drivers/net/ethernet/atheros/alx/main.c +@@ -1181,8 +1181,11 @@ static int alx_change_mtu(struct net_device *netdev, int mtu) + alx->hw.mtu = mtu; + alx->rxbuf_size = max(max_frame, ALX_DEF_RXBUF_SIZE); + netdev_update_features(netdev); +- if (netif_running(netdev)) ++ if (netif_running(netdev)) { ++ mutex_lock(&alx->mtx); + alx_reinit(alx); ++ mutex_unlock(&alx->mtx); ++ } + return 0; + } + +diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h +index 72bdbebf25cec..9e79bcfb365fa 100644 +--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h ++++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h +@@ -2533,6 +2533,4 @@ void bnx2x_register_phc(struct bnx2x *bp); + * Meant for implicit re-load flows. + */ + int bnx2x_vlan_reconfigure_vid(struct bnx2x *bp); +-int bnx2x_init_firmware(struct bnx2x *bp); +-void bnx2x_release_firmware(struct bnx2x *bp); + #endif /* bnx2x.h */ +diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c +index 41ebbb2c7d3ac..198e041d84109 100644 +--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c ++++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c +@@ -2363,24 +2363,30 @@ int bnx2x_compare_fw_ver(struct bnx2x *bp, u32 load_code, bool print_err) + /* is another pf loaded on this engine? */ + if (load_code != FW_MSG_CODE_DRV_LOAD_COMMON_CHIP && + load_code != FW_MSG_CODE_DRV_LOAD_COMMON) { +- /* build my FW version dword */ +- u32 my_fw = (bp->fw_major) + (bp->fw_minor << 8) + +- (bp->fw_rev << 16) + (bp->fw_eng << 24); ++ u8 loaded_fw_major, loaded_fw_minor, loaded_fw_rev, loaded_fw_eng; ++ u32 loaded_fw; + + /* read loaded FW from chip */ +- u32 loaded_fw = REG_RD(bp, XSEM_REG_PRAM); ++ loaded_fw = REG_RD(bp, XSEM_REG_PRAM); + +- DP(BNX2X_MSG_SP, "loaded fw %x, my fw %x\n", +- loaded_fw, my_fw); ++ loaded_fw_major = loaded_fw & 0xff; ++ loaded_fw_minor = (loaded_fw >> 8) & 0xff; ++ loaded_fw_rev = (loaded_fw >> 16) & 0xff; ++ loaded_fw_eng = (loaded_fw >> 24) & 0xff; ++ ++ DP(BNX2X_MSG_SP, "loaded fw 0x%x major 0x%x minor 0x%x rev 0x%x eng 0x%x\n", ++ loaded_fw, loaded_fw_major, loaded_fw_minor, loaded_fw_rev, loaded_fw_eng); + + /* abort nic load if version mismatch */ +- if (my_fw != loaded_fw) { ++ if (loaded_fw_major != BCM_5710_FW_MAJOR_VERSION || ++ loaded_fw_minor != BCM_5710_FW_MINOR_VERSION || ++ loaded_fw_eng != BCM_5710_FW_ENGINEERING_VERSION || ++ loaded_fw_rev < BCM_5710_FW_REVISION_VERSION_V15) { + if (print_err) +- BNX2X_ERR("bnx2x with FW %x was already loaded which mismatches my %x FW. Aborting\n", +- loaded_fw, my_fw); ++ BNX2X_ERR("loaded FW incompatible. Aborting\n"); + else +- BNX2X_DEV_INFO("bnx2x with FW %x was already loaded which mismatches my %x FW, possibly due to MF UNDI\n", +- loaded_fw, my_fw); ++ BNX2X_DEV_INFO("loaded FW incompatible, possibly due to MF UNDI\n"); ++ + return -EBUSY; + } + } +diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +index dc70f6f96d024..bdd4e420f869f 100644 +--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c ++++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +@@ -12313,15 +12313,6 @@ static int bnx2x_init_bp(struct bnx2x *bp) + + bnx2x_read_fwinfo(bp); + +- if (IS_PF(bp)) { +- rc = bnx2x_init_firmware(bp); +- +- if (rc) { +- bnx2x_free_mem_bp(bp); +- return rc; +- } +- } +- + func = BP_FUNC(bp); + + /* need to reset chip if undi was active */ +@@ -12334,7 +12325,6 @@ static int bnx2x_init_bp(struct bnx2x *bp) + + rc = bnx2x_prev_unload(bp); + if (rc) { +- bnx2x_release_firmware(bp); + bnx2x_free_mem_bp(bp); + return rc; + } +@@ -13414,7 +13404,7 @@ do { \ + (u8 *)bp->arr, len); \ + } while (0) + +-int bnx2x_init_firmware(struct bnx2x *bp) ++static int bnx2x_init_firmware(struct bnx2x *bp) + { + const char *fw_file_name, *fw_file_name_v15; + struct bnx2x_fw_file_hdr *fw_hdr; +@@ -13514,7 +13504,7 @@ request_firmware_exit: + return rc; + } + +-void bnx2x_release_firmware(struct bnx2x *bp) ++static void bnx2x_release_firmware(struct bnx2x *bp) + { + kfree(bp->init_ops_offsets); + kfree(bp->init_ops); +@@ -14031,7 +14021,6 @@ static int bnx2x_init_one(struct pci_dev *pdev, + return 0; + + init_one_freemem: +- bnx2x_release_firmware(bp); + bnx2x_free_mem_bp(bp); + + init_one_exit: +diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c +index 9a67e24f46b27..b4f99dd284e53 100644 +--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c ++++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c +@@ -2243,8 +2243,10 @@ static unsigned int bcmgenet_desc_rx(struct bcmgenet_rx_ring *ring, + dma_length_status = status->length_status; + if (dev->features & NETIF_F_RXCSUM) { + rx_csum = (__force __be16)(status->rx_csum & 0xffff); +- skb->csum = (__force __wsum)ntohs(rx_csum); +- skb->ip_summed = CHECKSUM_COMPLETE; ++ if (rx_csum) { ++ skb->csum = (__force __wsum)ntohs(rx_csum); ++ skb->ip_summed = CHECKSUM_COMPLETE; ++ } + } + + /* DMA flags and length are still valid no matter how +diff --git a/drivers/net/ethernet/intel/iavf/iavf_main.c b/drivers/net/ethernet/intel/iavf/iavf_main.c +index 711e8c7f62de7..ca74824d40b85 100644 +--- a/drivers/net/ethernet/intel/iavf/iavf_main.c ++++ b/drivers/net/ethernet/intel/iavf/iavf_main.c +@@ -2133,6 +2133,13 @@ restart_watchdog: + queue_delayed_work(iavf_wq, &adapter->watchdog_task, HZ * 2); + } + ++/** ++ * iavf_disable_vf - disable VF ++ * @adapter: board private structure ++ * ++ * Set communication failed flag and free all resources. ++ * NOTE: This function is expected to be called with crit_lock being held. ++ **/ + static void iavf_disable_vf(struct iavf_adapter *adapter) + { + struct iavf_mac_filter *f, *ftmp; +@@ -2187,7 +2194,6 @@ static void iavf_disable_vf(struct iavf_adapter *adapter) + memset(adapter->vf_res, 0, IAVF_VIRTCHNL_VF_RESOURCE_SIZE); + iavf_shutdown_adminq(&adapter->hw); + adapter->netdev->flags &= ~IFF_UP; +- mutex_unlock(&adapter->crit_lock); + adapter->flags &= ~IAVF_FLAG_RESET_PENDING; + iavf_change_state(adapter, __IAVF_DOWN); + wake_up(&adapter->down_waitqueue); +@@ -4019,6 +4025,13 @@ static void iavf_remove(struct pci_dev *pdev) + struct iavf_hw *hw = &adapter->hw; + int err; + ++ /* When reboot/shutdown is in progress no need to do anything ++ * as the adapter is already REMOVE state that was set during ++ * iavf_shutdown() callback. ++ */ ++ if (adapter->state == __IAVF_REMOVE) ++ return; ++ + set_bit(__IAVF_IN_REMOVE_TASK, &adapter->crit_section); + /* Wait until port initialization is complete. + * There are flows where register/unregister netdev may race. +diff --git a/drivers/net/ethernet/mscc/ocelot_flower.c b/drivers/net/ethernet/mscc/ocelot_flower.c +index afa062c5f82d3..f1323af99b0c0 100644 +--- a/drivers/net/ethernet/mscc/ocelot_flower.c ++++ b/drivers/net/ethernet/mscc/ocelot_flower.c +@@ -54,6 +54,12 @@ static int ocelot_chain_to_block(int chain, bool ingress) + */ + static int ocelot_chain_to_lookup(int chain) + { ++ /* Backwards compatibility with older, single-chain tc-flower ++ * offload support in Ocelot ++ */ ++ if (chain == 0) ++ return 0; ++ + return (chain / VCAP_LOOKUP) % 10; + } + +@@ -62,7 +68,15 @@ static int ocelot_chain_to_lookup(int chain) + */ + static int ocelot_chain_to_pag(int chain) + { +- int lookup = ocelot_chain_to_lookup(chain); ++ int lookup; ++ ++ /* Backwards compatibility with older, single-chain tc-flower ++ * offload support in Ocelot ++ */ ++ if (chain == 0) ++ return 0; ++ ++ lookup = ocelot_chain_to_lookup(chain); + + /* calculate PAG value as chain index relative to the first PAG */ + return chain - VCAP_IS2_CHAIN(lookup, 0); +diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c +index 382bebc2420df..bdfcf75f08277 100644 +--- a/drivers/net/hyperv/netvsc_drv.c ++++ b/drivers/net/hyperv/netvsc_drv.c +@@ -1586,6 +1586,9 @@ static void netvsc_get_ethtool_stats(struct net_device *dev, + pcpu_sum = kvmalloc_array(num_possible_cpus(), + sizeof(struct netvsc_ethtool_pcpu_stats), + GFP_KERNEL); ++ if (!pcpu_sum) ++ return; ++ + netvsc_get_pcpu_stats(dev, pcpu_sum); + for_each_present_cpu(cpu) { + struct netvsc_ethtool_pcpu_stats *this_sum = &pcpu_sum[cpu]; +diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c +index cfda625dbea57..4d726ee03ce20 100644 +--- a/drivers/net/phy/marvell.c ++++ b/drivers/net/phy/marvell.c +@@ -1693,8 +1693,8 @@ static int marvell_suspend(struct phy_device *phydev) + int err; + + /* Suspend the fiber mode first */ +- if (!linkmode_test_bit(ETHTOOL_LINK_MODE_FIBRE_BIT, +- phydev->supported)) { ++ if (linkmode_test_bit(ETHTOOL_LINK_MODE_FIBRE_BIT, ++ phydev->supported)) { + err = marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE); + if (err < 0) + goto error; +@@ -1728,8 +1728,8 @@ static int marvell_resume(struct phy_device *phydev) + int err; + + /* Resume the fiber mode first */ +- if (!linkmode_test_bit(ETHTOOL_LINK_MODE_FIBRE_BIT, +- phydev->supported)) { ++ if (linkmode_test_bit(ETHTOOL_LINK_MODE_FIBRE_BIT, ++ phydev->supported)) { + err = marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE); + if (err < 0) + goto error; +diff --git a/drivers/net/phy/mscc/mscc_main.c b/drivers/net/phy/mscc/mscc_main.c +index 6e32da28e138f..f2e3a67198dd6 100644 +--- a/drivers/net/phy/mscc/mscc_main.c ++++ b/drivers/net/phy/mscc/mscc_main.c +@@ -2685,3 +2685,6 @@ MODULE_DEVICE_TABLE(mdio, vsc85xx_tbl); + MODULE_DESCRIPTION("Microsemi VSC85xx PHY driver"); + MODULE_AUTHOR("Nagaraju Lakkaraju"); + MODULE_LICENSE("Dual MIT/GPL"); ++ ++MODULE_FIRMWARE(MSCC_VSC8584_REVB_INT8051_FW); ++MODULE_FIRMWARE(MSCC_VSC8574_REVB_INT8051_FW); +diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.c b/drivers/scsi/mpt3sas/mpt3sas_base.c +index 81dab9b82f79f..0d37c4aca175c 100644 +--- a/drivers/scsi/mpt3sas/mpt3sas_base.c ++++ b/drivers/scsi/mpt3sas/mpt3sas_base.c +@@ -2011,9 +2011,10 @@ mpt3sas_base_sync_reply_irqs(struct MPT3SAS_ADAPTER *ioc, u8 poll) + enable_irq(reply_q->os_irq); + } + } ++ ++ if (poll) ++ _base_process_reply_queue(reply_q); + } +- if (poll) +- _base_process_reply_queue(reply_q); + } + + /** +diff --git a/drivers/usb/class/usbtmc.c b/drivers/usb/class/usbtmc.c +index 73f419adce610..4bb6d304eb4b2 100644 +--- a/drivers/usb/class/usbtmc.c ++++ b/drivers/usb/class/usbtmc.c +@@ -1919,6 +1919,7 @@ static int usbtmc_ioctl_request(struct usbtmc_device_data *data, + struct usbtmc_ctrlrequest request; + u8 *buffer = NULL; + int rv; ++ unsigned int is_in, pipe; + unsigned long res; + + res = copy_from_user(&request, arg, sizeof(struct usbtmc_ctrlrequest)); +@@ -1928,12 +1929,14 @@ static int usbtmc_ioctl_request(struct usbtmc_device_data *data, + if (request.req.wLength > USBTMC_BUFSIZE) + return -EMSGSIZE; + ++ is_in = request.req.bRequestType & USB_DIR_IN; ++ + if (request.req.wLength) { + buffer = kmalloc(request.req.wLength, GFP_KERNEL); + if (!buffer) + return -ENOMEM; + +- if ((request.req.bRequestType & USB_DIR_IN) == 0) { ++ if (!is_in) { + /* Send control data to device */ + res = copy_from_user(buffer, request.data, + request.req.wLength); +@@ -1944,8 +1947,12 @@ static int usbtmc_ioctl_request(struct usbtmc_device_data *data, + } + } + ++ if (is_in) ++ pipe = usb_rcvctrlpipe(data->usb_dev, 0); ++ else ++ pipe = usb_sndctrlpipe(data->usb_dev, 0); + rv = usb_control_msg(data->usb_dev, +- usb_rcvctrlpipe(data->usb_dev, 0), ++ pipe, + request.req.bRequest, + request.req.bRequestType, + request.req.wValue, +@@ -1957,7 +1964,7 @@ static int usbtmc_ioctl_request(struct usbtmc_device_data *data, + goto exit; + } + +- if (rv && (request.req.bRequestType & USB_DIR_IN)) { ++ if (rv && is_in) { + /* Read control data from device */ + res = copy_to_user(request.data, buffer, rv); + if (res) +diff --git a/drivers/usb/gadget/function/rndis.c b/drivers/usb/gadget/function/rndis.c +index 0f14c5291af07..4150de96b937a 100644 +--- a/drivers/usb/gadget/function/rndis.c ++++ b/drivers/usb/gadget/function/rndis.c +@@ -640,6 +640,7 @@ static int rndis_set_response(struct rndis_params *params, + BufLength = le32_to_cpu(buf->InformationBufferLength); + BufOffset = le32_to_cpu(buf->InformationBufferOffset); + if ((BufLength > RNDIS_MAX_TOTAL_SIZE) || ++ (BufOffset > RNDIS_MAX_TOTAL_SIZE) || + (BufOffset + 8 >= RNDIS_MAX_TOTAL_SIZE)) + return -EINVAL; + +diff --git a/drivers/usb/gadget/udc/core.c b/drivers/usb/gadget/udc/core.c +index 14fdf918ecfeb..61099f2d057dc 100644 +--- a/drivers/usb/gadget/udc/core.c ++++ b/drivers/usb/gadget/udc/core.c +@@ -1434,7 +1434,6 @@ static void usb_gadget_remove_driver(struct usb_udc *udc) + usb_gadget_udc_stop(udc); + + udc->driver = NULL; +- udc->dev.driver = NULL; + udc->gadget->dev.driver = NULL; + } + +@@ -1496,7 +1495,6 @@ static int udc_bind_to_driver(struct usb_udc *udc, struct usb_gadget_driver *dri + driver->function); + + udc->driver = driver; +- udc->dev.driver = &driver->driver; + udc->gadget->dev.driver = &driver->driver; + + usb_gadget_udc_set_speed(udc, driver->max_speed); +@@ -1519,7 +1517,6 @@ err1: + dev_err(&udc->dev, "failed to start %s: %d\n", + udc->driver->function, ret); + udc->driver = NULL; +- udc->dev.driver = NULL; + udc->gadget->dev.driver = NULL; + return ret; + } +diff --git a/drivers/vhost/vsock.c b/drivers/vhost/vsock.c +index d07a20bbc07b7..dcb1585819a1d 100644 +--- a/drivers/vhost/vsock.c ++++ b/drivers/vhost/vsock.c +@@ -757,7 +757,8 @@ static int vhost_vsock_dev_release(struct inode *inode, struct file *file) + + /* Iterating over all connections for all CIDs to find orphans is + * inefficient. Room for improvement here. */ +- vsock_for_each_connected_socket(vhost_vsock_reset_orphans); ++ vsock_for_each_connected_socket(&vhost_transport.transport, ++ vhost_vsock_reset_orphans); + + /* Don't check the owner, because we are in the release path, so we + * need to stop the vsock device in any case. +diff --git a/fs/btrfs/block-group.c b/fs/btrfs/block-group.c +index 5edd07e0232df..e1c5c2114edfa 100644 +--- a/fs/btrfs/block-group.c ++++ b/fs/btrfs/block-group.c +@@ -123,7 +123,16 @@ void btrfs_put_block_group(struct btrfs_block_group *cache) + { + if (refcount_dec_and_test(&cache->refs)) { + WARN_ON(cache->pinned > 0); +- WARN_ON(cache->reserved > 0); ++ /* ++ * If there was a failure to cleanup a log tree, very likely due ++ * to an IO failure on a writeback attempt of one or more of its ++ * extent buffers, we could not do proper (and cheap) unaccounting ++ * of their reserved space, so don't warn on reserved > 0 in that ++ * case. ++ */ ++ if (!(cache->flags & BTRFS_BLOCK_GROUP_METADATA) || ++ !BTRFS_FS_LOG_CLEANUP_ERROR(cache->fs_info)) ++ WARN_ON(cache->reserved > 0); + + /* + * A block_group shouldn't be on the discard_list anymore. +@@ -3888,9 +3897,22 @@ int btrfs_free_block_groups(struct btrfs_fs_info *info) + * important and indicates a real bug if this happens. + */ + if (WARN_ON(space_info->bytes_pinned > 0 || +- space_info->bytes_reserved > 0 || + space_info->bytes_may_use > 0)) + btrfs_dump_space_info(info, space_info, 0, 0); ++ ++ /* ++ * If there was a failure to cleanup a log tree, very likely due ++ * to an IO failure on a writeback attempt of one or more of its ++ * extent buffers, we could not do proper (and cheap) unaccounting ++ * of their reserved space, so don't warn on bytes_reserved > 0 in ++ * that case. ++ */ ++ if (!(space_info->flags & BTRFS_BLOCK_GROUP_METADATA) || ++ !BTRFS_FS_LOG_CLEANUP_ERROR(info)) { ++ if (WARN_ON(space_info->bytes_reserved > 0)) ++ btrfs_dump_space_info(info, space_info, 0, 0); ++ } ++ + WARN_ON(space_info->reclaim_size > 0); + list_del(&space_info->list); + btrfs_sysfs_remove_space_info(space_info); +diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h +index e89f814cc8f5c..21c44846b0022 100644 +--- a/fs/btrfs/ctree.h ++++ b/fs/btrfs/ctree.h +@@ -142,6 +142,9 @@ enum { + BTRFS_FS_STATE_DEV_REPLACING, + /* The btrfs_fs_info created for self-tests */ + BTRFS_FS_STATE_DUMMY_FS_INFO, ++ ++ /* Indicates there was an error cleaning up a log tree. */ ++ BTRFS_FS_STATE_LOG_CLEANUP_ERROR, + }; + + #define BTRFS_BACKREF_REV_MAX 256 +@@ -3578,6 +3581,10 @@ do { \ + (errno), fmt, ##args); \ + } while (0) + ++#define BTRFS_FS_LOG_CLEANUP_ERROR(fs_info) \ ++ (unlikely(test_bit(BTRFS_FS_STATE_LOG_CLEANUP_ERROR, \ ++ &(fs_info)->fs_state))) ++ + __printf(5, 6) + __cold + void __btrfs_panic(struct btrfs_fs_info *fs_info, const char *function, +diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c +index 8ef65073ce8ce..e90d80a8a9e34 100644 +--- a/fs/btrfs/tree-log.c ++++ b/fs/btrfs/tree-log.c +@@ -3423,6 +3423,29 @@ static void free_log_tree(struct btrfs_trans_handle *trans, + if (log->node) { + ret = walk_log_tree(trans, log, &wc); + if (ret) { ++ /* ++ * We weren't able to traverse the entire log tree, the ++ * typical scenario is getting an -EIO when reading an ++ * extent buffer of the tree, due to a previous writeback ++ * failure of it. ++ */ ++ set_bit(BTRFS_FS_STATE_LOG_CLEANUP_ERROR, ++ &log->fs_info->fs_state); ++ ++ /* ++ * Some extent buffers of the log tree may still be dirty ++ * and not yet written back to storage, because we may ++ * have updates to a log tree without syncing a log tree, ++ * such as during rename and link operations. So flush ++ * them out and wait for their writeback to complete, so ++ * that we properly cleanup their state and pages. ++ */ ++ btrfs_write_marked_extents(log->fs_info, ++ &log->dirty_log_pages, ++ EXTENT_DIRTY | EXTENT_NEW); ++ btrfs_wait_tree_log_extents(log, ++ EXTENT_DIRTY | EXTENT_NEW); ++ + if (trans) + btrfs_abort_transaction(trans, ret); + else +diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c +index 5c914ce9b3ac9..7ba3dabe16f09 100644 +--- a/fs/ocfs2/super.c ++++ b/fs/ocfs2/super.c +@@ -1106,17 +1106,6 @@ static int ocfs2_fill_super(struct super_block *sb, void *data, int silent) + goto read_super_error; + } + +- root = d_make_root(inode); +- if (!root) { +- status = -ENOMEM; +- mlog_errno(status); +- goto read_super_error; +- } +- +- sb->s_root = root; +- +- ocfs2_complete_mount_recovery(osb); +- + osb->osb_dev_kset = kset_create_and_add(sb->s_id, NULL, + &ocfs2_kset->kobj); + if (!osb->osb_dev_kset) { +@@ -1134,6 +1123,17 @@ static int ocfs2_fill_super(struct super_block *sb, void *data, int silent) + goto read_super_error; + } + ++ root = d_make_root(inode); ++ if (!root) { ++ status = -ENOMEM; ++ mlog_errno(status); ++ goto read_super_error; ++ } ++ ++ sb->s_root = root; ++ ++ ocfs2_complete_mount_recovery(osb); ++ + if (ocfs2_mount_local(osb)) + snprintf(nodestr, sizeof(nodestr), "local"); + else +diff --git a/include/linux/if_arp.h b/include/linux/if_arp.h +index b712217f70304..1ed52441972f9 100644 +--- a/include/linux/if_arp.h ++++ b/include/linux/if_arp.h +@@ -52,6 +52,7 @@ static inline bool dev_is_mac_header_xmit(const struct net_device *dev) + case ARPHRD_VOID: + case ARPHRD_NONE: + case ARPHRD_RAWIP: ++ case ARPHRD_PIMREG: + return false; + default: + return true; +diff --git a/include/net/af_vsock.h b/include/net/af_vsock.h +index ab207677e0a8b..f742e50207fbd 100644 +--- a/include/net/af_vsock.h ++++ b/include/net/af_vsock.h +@@ -205,7 +205,8 @@ struct sock *vsock_find_bound_socket(struct sockaddr_vm *addr); + struct sock *vsock_find_connected_socket(struct sockaddr_vm *src, + struct sockaddr_vm *dst); + void vsock_remove_sock(struct vsock_sock *vsk); +-void vsock_for_each_connected_socket(void (*fn)(struct sock *sk)); ++void vsock_for_each_connected_socket(struct vsock_transport *transport, ++ void (*fn)(struct sock *sk)); + int vsock_assign_transport(struct vsock_sock *vsk, struct vsock_sock *psk); + bool vsock_find_cid(unsigned int cid); + +diff --git a/mm/swap_state.c b/mm/swap_state.c +index bc7cee6b2ec54..122a37cbc081f 100644 +--- a/mm/swap_state.c ++++ b/mm/swap_state.c +@@ -478,7 +478,7 @@ struct page *__read_swap_cache_async(swp_entry_t entry, gfp_t gfp_mask, + * __read_swap_cache_async(), which has set SWAP_HAS_CACHE + * in swap_map, but not yet added its page to swap cache. + */ +- cond_resched(); ++ schedule_timeout_uninterruptible(1); + } + + /* +diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c +index e9911b18bdbfa..e7fa8ce41a4cc 100644 +--- a/net/dsa/dsa2.c ++++ b/net/dsa/dsa2.c +@@ -1341,6 +1341,7 @@ static int dsa_port_parse_of(struct dsa_port *dp, struct device_node *dn) + const char *user_protocol; + + master = of_find_net_device_by_node(ethernet); ++ of_node_put(ethernet); + if (!master) + return -EPROBE_DEFER; + +diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c +index b7b573085bd51..5023f59a5b968 100644 +--- a/net/ipv6/esp6.c ++++ b/net/ipv6/esp6.c +@@ -813,8 +813,7 @@ int esp6_input_done2(struct sk_buff *skb, int err) + struct tcphdr *th; + + offset = ipv6_skip_exthdr(skb, offset, &nexthdr, &frag_off); +- +- if (offset < 0) { ++ if (offset == -1) { + err = -EINVAL; + goto out; + } +diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c +index e00c38f242c32..c0d4a65931de5 100644 +--- a/net/packet/af_packet.c ++++ b/net/packet/af_packet.c +@@ -2281,8 +2281,11 @@ static int tpacket_rcv(struct sk_buff *skb, struct net_device *dev, + copy_skb = skb_get(skb); + skb_head = skb->data; + } +- if (copy_skb) ++ if (copy_skb) { ++ memset(&PACKET_SKB_CB(copy_skb)->sa.ll, 0, ++ sizeof(PACKET_SKB_CB(copy_skb)->sa.ll)); + skb_set_owner_r(copy_skb, sk); ++ } + } + snaplen = po->rx_ring.frame_size - macoff; + if ((int)snaplen < 0) { +@@ -3434,6 +3437,8 @@ static int packet_recvmsg(struct socket *sock, struct msghdr *msg, size_t len, + sock_recv_ts_and_drops(msg, sk, skb); + + if (msg->msg_name) { ++ const size_t max_len = min(sizeof(skb->cb), ++ sizeof(struct sockaddr_storage)); + int copy_len; + + /* If the address length field is there to be filled +@@ -3456,6 +3461,10 @@ static int packet_recvmsg(struct socket *sock, struct msghdr *msg, size_t len, + msg->msg_namelen = sizeof(struct sockaddr_ll); + } + } ++ if (WARN_ON_ONCE(copy_len > max_len)) { ++ copy_len = max_len; ++ msg->msg_namelen = copy_len; ++ } + memcpy(msg->msg_name, &PACKET_SKB_CB(skb)->sa, copy_len); + } + +diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c +index 91a5c65707ba1..5df530e89e5ac 100644 +--- a/net/vmw_vsock/af_vsock.c ++++ b/net/vmw_vsock/af_vsock.c +@@ -333,7 +333,8 @@ void vsock_remove_sock(struct vsock_sock *vsk) + } + EXPORT_SYMBOL_GPL(vsock_remove_sock); + +-void vsock_for_each_connected_socket(void (*fn)(struct sock *sk)) ++void vsock_for_each_connected_socket(struct vsock_transport *transport, ++ void (*fn)(struct sock *sk)) + { + int i; + +@@ -342,8 +343,12 @@ void vsock_for_each_connected_socket(void (*fn)(struct sock *sk)) + for (i = 0; i < ARRAY_SIZE(vsock_connected_table); i++) { + struct vsock_sock *vsk; + list_for_each_entry(vsk, &vsock_connected_table[i], +- connected_table) ++ connected_table) { ++ if (vsk->transport != transport) ++ continue; ++ + fn(sk_vsock(vsk)); ++ } + } + + spin_unlock_bh(&vsock_table_lock); +diff --git a/net/vmw_vsock/virtio_transport.c b/net/vmw_vsock/virtio_transport.c +index 4f7c99dfd16cf..dad9ca65f4f9d 100644 +--- a/net/vmw_vsock/virtio_transport.c ++++ b/net/vmw_vsock/virtio_transport.c +@@ -24,6 +24,7 @@ + static struct workqueue_struct *virtio_vsock_workqueue; + static struct virtio_vsock __rcu *the_virtio_vsock; + static DEFINE_MUTEX(the_virtio_vsock_mutex); /* protects the_virtio_vsock */ ++static struct virtio_transport virtio_transport; /* forward declaration */ + + struct virtio_vsock { + struct virtio_device *vdev; +@@ -384,7 +385,8 @@ static void virtio_vsock_event_handle(struct virtio_vsock *vsock, + switch (le32_to_cpu(event->id)) { + case VIRTIO_VSOCK_EVENT_TRANSPORT_RESET: + virtio_vsock_update_guest_cid(vsock); +- vsock_for_each_connected_socket(virtio_vsock_reset_sock); ++ vsock_for_each_connected_socket(&virtio_transport.transport, ++ virtio_vsock_reset_sock); + break; + } + } +@@ -662,7 +664,8 @@ static void virtio_vsock_remove(struct virtio_device *vdev) + synchronize_rcu(); + + /* Reset all connected sockets when the device disappear */ +- vsock_for_each_connected_socket(virtio_vsock_reset_sock); ++ vsock_for_each_connected_socket(&virtio_transport.transport, ++ virtio_vsock_reset_sock); + + /* Stop all work handlers to make sure no one is accessing the device, + * so we can safely call vdev->config->reset(). +diff --git a/net/vmw_vsock/vmci_transport.c b/net/vmw_vsock/vmci_transport.c +index 7aef34e32bdf8..b17dc9745188e 100644 +--- a/net/vmw_vsock/vmci_transport.c ++++ b/net/vmw_vsock/vmci_transport.c +@@ -75,6 +75,8 @@ static u32 vmci_transport_qp_resumed_sub_id = VMCI_INVALID_ID; + + static int PROTOCOL_OVERRIDE = -1; + ++static struct vsock_transport vmci_transport; /* forward declaration */ ++ + /* Helper function to convert from a VMCI error code to a VSock error code. */ + + static s32 vmci_transport_error_to_vsock_error(s32 vmci_error) +@@ -882,7 +884,8 @@ static void vmci_transport_qp_resumed_cb(u32 sub_id, + const struct vmci_event_data *e_data, + void *client_data) + { +- vsock_for_each_connected_socket(vmci_transport_handle_detach); ++ vsock_for_each_connected_socket(&vmci_transport, ++ vmci_transport_handle_detach); + } + + static void vmci_transport_recv_pkt_work(struct work_struct *work) +diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c +index 0fc9a54107399..61379ed2b75c5 100644 +--- a/tools/perf/util/symbol.c ++++ b/tools/perf/util/symbol.c +@@ -231,7 +231,7 @@ void symbols__fixup_end(struct rb_root_cached *symbols) + prev = curr; + curr = rb_entry(nd, struct symbol, rb_node); + +- if (prev->end == prev->start && prev->end != curr->start) ++ if (prev->end == prev->start || prev->end != curr->start) + arch__symbols__fixup_end(prev, curr); + } +
