Commit f672ff91 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'net-5.17-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 

Pull networking fixes from Jakub Kicinski:
 "Including fixes from bpf and netfilter.

  Current release - regressions:

   - bpf: fix crash due to out of bounds access into reg2btf_ids

   - mvpp2: always set port pcs ops, avoid null-deref

   - eth: marvell: fix driver load from initrd

   - eth: intel: revert "Fix reset bw limit when DCB enabled with 1 TC"

  Current release - new code bugs:

   - mptcp: fix race in overlapping signal events

  Previous releases - regressions:

   - xen-netback: revert hotplug-status changes causing devices to not
     be configured

   - dsa:
      - avoid call to __dev_set_promiscuity() while rtnl_mutex isn't
        held
      - fix panic when removing unoffloaded port from bridge

   - dsa: microchip: fix bridging with more than two member ports

  Previous releases - always broken:

   - bpf:
      - fix crash due to incorrect copy_map_value when both spin lock
        and timer are present in a single value
      - fix a bpf_timer initialization issue with clang
      - do not try bpf_msg_push_data with len 0
      - add schedule points in batch ops

   - nf_tables:
      - unregister flowtable hooks on netns exit
      - correct flow offload action array size
      - fix a couple of memory leaks

   - vsock: don't check owner in vhost_vsock_stop() while releasing

   - gso: do not skip outer ip header in case of ipip and net_failover

   - smc: use a mutex for locking "struct smc_pnettable"

   - openvswitch: fix setting ipv6 fields causing hw csum failure

   - mptcp: fix race in incoming ADD_ADDR option processing

   - sysfs: add check for netdevice being present to speed_show

   - sched: act_ct: fix flow table lookup after ct clear or switching
     zones

   - eth: intel: fixes for SR-IOV forwarding offloads

   - eth: broadcom: fixes for selftests and error recovery

   - eth: mellanox: flow steering and SR-IOV forwarding fixes

  Misc:

   - make __pskb_pull_tail() & pskb_carve_frag_list() drop_monitor
     friends not report freed skbs as drops

   - force inlining of checksum functions in net/checksum.h"

* tag 'net-5.17-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (85 commits)
  net: mv643xx_eth: process retval from of_get_mac_address
  ping: remove pr_err from ping_lookup
  Revert "i40e: Fix reset bw limit when DCB enabled with 1 TC"
  openvswitch: Fix setting ipv6 fields causing hw csum failure
  ipv6: prevent a possible race condition with lifetimes
  net/smc: Use a mutex for locking "struct smc_pnettable"
  bnx2x: fix driver load from initrd
  Revert "xen-netback: Check for hotplug-status existence before watching"
  Revert "xen-netback: remove 'hotplug-status' once it has served its purpose"
  net/mlx5e: Fix VF min/max rate parameters interchange mistake
  net/mlx5e: Add missing increment of count
  net/mlx5e: MPLSoUDP decap, fix check for unsupported matches
  net/mlx5e: Fix MPLSoUDP encap to use MPLS action information
  net/mlx5e: Add feature check for set fec counters
  net/mlx5e: TC, Skip redundant ct clear actions
  net/mlx5e: TC, Reject rules with forward and drop actions
  net/mlx5e: TC, Reject rules with drop and modify hdr action
  net/mlx5e: kTLS, Use CHECKSUM_UNNECESSARY for device-offloaded packets
  net/mlx5e: Fix wrong return value on ioctl EEPROM query failure
  net/mlx5: Fix possible deadlock on rule deletion
  ...
parents 73878e5e 42404d8f

MAINTAINERS

+3 −2
Original line number Diff line number Diff line
@@ -16073,8 +16073,8 @@ F: Documentation/devicetree/bindings/mtd/qcom,nandc.yaml 
F:	drivers/mtd/nand/raw/qcom_nandc.c









QUALCOMM RMNET DRIVER









M:	Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>









M:	Sean Tranchetti <stranche@codeaurora.org>









M:	Subash Abhinov Kasiviswanathan <quic_subashab@quicinc.com>









M:	Sean Tranchetti <quic_stranche@quicinc.com>









L:	netdev@vger.kernel.org









S:	Maintained









F:	Documentation/networking/device_drivers/cellular/qualcomm/rmnet.rst








@@ -16366,6 +16366,7 @@ F:	drivers/watchdog/realtek_otto_wdt.c















REALTEK RTL83xx SMI DSA ROUTER CHIPS









M:	Linus Walleij <linus.walleij@linaro.org>









M:	Alvin Šipraga <alsi@bang-olufsen.dk>









S:	Maintained









F:	Documentation/devicetree/bindings/net/dsa/realtek-smi.txt









F:	drivers/net/dsa/realtek-smi*
































drivers/net/dsa/microchip/ksz_common.c



+23
−3






























Original line number
Diff line number
Diff line







@@ -26,7 +26,7 @@ void ksz_update_port_member(struct ksz_device *dev, int port)







	struct dsa_switch *ds = dev->ds;









	u8 port_member = 0, cpu_port;









	const struct dsa_port *dp;









	int i;









	int i, j;



















	if (!dsa_is_user_port(ds, port))









		return;








@@ -45,13 +45,33 @@ void ksz_update_port_member(struct ksz_device *dev, int port)







			continue;









		if (!dsa_port_bridge_same(dp, other_dp))









			continue;









		if (other_p->stp_state != BR_STATE_FORWARDING)









			continue;



















		if (other_p->stp_state == BR_STATE_FORWARDING &&









		    p->stp_state == BR_STATE_FORWARDING) {









		if (p->stp_state == BR_STATE_FORWARDING) {









			val |= BIT(port);









			port_member |= BIT(i);









		}



















		/* Retain port [i]'s relationship to other ports than [port] */









		for (j = 0; j < ds->num_ports; j++) {









			const struct dsa_port *third_dp;









			struct ksz_port *third_p;



















			if (j == i)









				continue;









			if (j == port)









				continue;









			if (!dsa_is_user_port(ds, j))









				continue;









			third_p = &dev->ports[j];









			if (third_p->stp_state != BR_STATE_FORWARDING)









				continue;









			third_dp = dsa_to_port(ds, j);









			if (dsa_port_bridge_same(other_dp, third_dp))









				val |= BIT(j);









		}



















		dev->dev_ops->cfg_port_member(dev, i, val | cpu_port);









	}










































drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c



+3
−0






























Original line number
Diff line number
Diff line







@@ -100,6 +100,9 @@ MODULE_LICENSE("GPL");







MODULE_FIRMWARE(FW_FILE_NAME_E1);









MODULE_FIRMWARE(FW_FILE_NAME_E1H);









MODULE_FIRMWARE(FW_FILE_NAME_E2);









MODULE_FIRMWARE(FW_FILE_NAME_E1_V15);









MODULE_FIRMWARE(FW_FILE_NAME_E1H_V15);









MODULE_FIRMWARE(FW_FILE_NAME_E2_V15);



















int bnx2x_num_queues;









module_param_named(num_queues, bnx2x_num_queues, int, 0444);
































drivers/net/ethernet/broadcom/bnxt/bnxt.c



+35
−12






























Original line number
Diff line number
Diff line







@@ -4747,8 +4747,10 @@ static int bnxt_hwrm_cfa_l2_set_rx_mask(struct bnxt *bp, u16 vnic_id)







		return rc;



















	req->vnic_id = cpu_to_le32(vnic->fw_vnic_id);









	if (vnic->rx_mask & CFA_L2_SET_RX_MASK_REQ_MASK_MCAST) {









		req->num_mc_entries = cpu_to_le32(vnic->mc_list_count);









		req->mc_tbl_addr = cpu_to_le64(vnic->mc_list_mapping);









	}









	req->mask = cpu_to_le32(vnic->rx_mask);









	return hwrm_req_send_silent(bp, req);









}








@@ -7787,6 +7789,19 @@ static int bnxt_map_fw_health_regs(struct bnxt *bp)







	return 0;









}



















static void bnxt_remap_fw_health_regs(struct bnxt *bp)









{









	if (!bp->fw_health)









		return;



















	if (bp->fw_cap & BNXT_FW_CAP_ERROR_RECOVERY) {









		bp->fw_health->status_reliable = true;









		bp->fw_health->resets_reliable = true;









	} else {









		bnxt_try_map_fw_health_reg(bp);









	}









}



















static int bnxt_hwrm_error_recovery_qcfg(struct bnxt *bp)









{









	struct bnxt_fw_health *fw_health = bp->fw_health;








@@ -8639,6 +8654,9 @@ static int bnxt_init_chip(struct bnxt *bp, bool irq_re_init)







	vnic->uc_filter_count = 1;



















	vnic->rx_mask = 0;









	if (test_bit(BNXT_STATE_HALF_OPEN, &bp->state))









		goto skip_rx_mask;



















	if (bp->dev->flags & IFF_BROADCAST)









		vnic->rx_mask |= CFA_L2_SET_RX_MASK_REQ_MASK_BCAST;


















@@ -8648,7 +8666,7 @@ static int bnxt_init_chip(struct bnxt *bp, bool irq_re_init)







	if (bp->dev->flags & IFF_ALLMULTI) {









		vnic->rx_mask |= CFA_L2_SET_RX_MASK_REQ_MASK_ALL_MCAST;









		vnic->mc_list_count = 0;









	} else {









	} else if (bp->dev->flags & IFF_MULTICAST) {









		u32 mask = 0;



















		bnxt_mc_list_updated(bp, &mask);








@@ -8659,6 +8677,7 @@ static int bnxt_init_chip(struct bnxt *bp, bool irq_re_init)







	if (rc)









		goto err_out;



















skip_rx_mask:









	rc = bnxt_hwrm_set_coal(bp);









	if (rc)









		netdev_warn(bp->dev, "HWRM set coalescing failure rc: %x\n",








@@ -9850,8 +9869,8 @@ static int bnxt_hwrm_if_change(struct bnxt *bp, bool up)







		resc_reinit = true;









	if (flags & FUNC_DRV_IF_CHANGE_RESP_FLAGS_HOT_FW_RESET_DONE)









		fw_reset = true;









	else if (bp->fw_health && !bp->fw_health->status_reliable)









		bnxt_try_map_fw_health_reg(bp);









	else









		bnxt_remap_fw_health_regs(bp);



















	if (test_bit(BNXT_STATE_IN_FW_RESET, &bp->state) && !fw_reset) {









		netdev_err(bp->dev, "RESET_DONE not set during FW reset.\n");








@@ -10330,13 +10349,15 @@ int bnxt_half_open_nic(struct bnxt *bp)







		goto half_open_err;









	}



















	rc = bnxt_alloc_mem(bp, false);









	rc = bnxt_alloc_mem(bp, true);









	if (rc) {









		netdev_err(bp->dev, "bnxt_alloc_mem err: %x\n", rc);









		goto half_open_err;









	}









	rc = bnxt_init_nic(bp, false);









	set_bit(BNXT_STATE_HALF_OPEN, &bp->state);









	rc = bnxt_init_nic(bp, true);









	if (rc) {









		clear_bit(BNXT_STATE_HALF_OPEN, &bp->state);









		netdev_err(bp->dev, "bnxt_init_nic err: %x\n", rc);









		goto half_open_err;









	}








@@ -10344,7 +10365,7 @@ int bnxt_half_open_nic(struct bnxt *bp)

















half_open_err:









	bnxt_free_skbs(bp);









	bnxt_free_mem(bp, false);









	bnxt_free_mem(bp, true);









	dev_close(bp->dev);









	return rc;









}








@@ -10354,9 +10375,10 @@ int bnxt_half_open_nic(struct bnxt *bp)







 */









void bnxt_half_close_nic(struct bnxt *bp)









{









	bnxt_hwrm_resource_free(bp, false, false);









	bnxt_hwrm_resource_free(bp, false, true);









	bnxt_free_skbs(bp);









	bnxt_free_mem(bp, false);









	bnxt_free_mem(bp, true);









	clear_bit(BNXT_STATE_HALF_OPEN, &bp->state);









}



















void bnxt_reenable_sriov(struct bnxt *bp)








@@ -10772,7 +10794,7 @@ static void bnxt_set_rx_mode(struct net_device *dev)







	if (dev->flags & IFF_ALLMULTI) {









		mask |= CFA_L2_SET_RX_MASK_REQ_MASK_ALL_MCAST;









		vnic->mc_list_count = 0;









	} else {









	} else if (dev->flags & IFF_MULTICAST) {









		mc_update = bnxt_mc_list_updated(bp, &mask);









	}


















@@ -10849,9 +10871,10 @@ static int bnxt_cfg_rx_mode(struct bnxt *bp)







	    !bnxt_promisc_ok(bp))









		vnic->rx_mask &= ~CFA_L2_SET_RX_MASK_REQ_MASK_PROMISCUOUS;









	rc = bnxt_hwrm_cfa_l2_set_rx_mask(bp, 0);









	if (rc && vnic->mc_list_count) {









	if (rc && (vnic->rx_mask & CFA_L2_SET_RX_MASK_REQ_MASK_MCAST)) {









		netdev_info(bp->dev, "Failed setting MC filters rc: %d, turning on ALL_MCAST mode\n",









			    rc);









		vnic->rx_mask &= ~CFA_L2_SET_RX_MASK_REQ_MASK_MCAST;









		vnic->rx_mask |= CFA_L2_SET_RX_MASK_REQ_MASK_ALL_MCAST;









		vnic->mc_list_count = 0;









		rc = bnxt_hwrm_cfa_l2_set_rx_mask(bp, 0);
































drivers/net/ethernet/broadcom/bnxt/bnxt.h



+1
−0






























Original line number
Diff line number
Diff line







@@ -1921,6 +1921,7 @@ struct bnxt {







#define BNXT_STATE_RECOVER		12









#define BNXT_STATE_FW_NON_FATAL_COND	13









#define BNXT_STATE_FW_ACTIVATE_RESET	14









#define BNXT_STATE_HALF_OPEN		15	/* For offline ethtool tests */



















#define BNXT_NO_FW_ACCESS(bp)					\









	(test_bit(BNXT_STATE_FW_FATAL_COND, &(bp)->state) ||	\