Commit 3ac88fa4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking fixes from Jakub Kicinski:
 "Fixes from the main networking tree only, probably because all
  sub-trees have backed off and haven't submitted their changes.

  None of the fixes here are particularly scary and no outstanding
  regressions. In an ideal world the "current release" sections would be
  empty at this stage but that never happens.

  Current release - regressions:

   - fix unwanted sign extension in netdev_stats_to_stats64()

  Current release - new code bugs:

   - initialize net->notrefcnt_tracker earlier

   - devlink: fix netdev notifier chain corruption

   - nfp: make sure mbox accesses in IPsec code are atomic

   - ice: fix check for weight and priority of a scheduling node

  Previous releases - regressions:

   - ice: xsk: fix cleaning of XDP_TX frame, prevent inf loop

   - igb: fix I2C bit banging config with external thermal sensor

  Previous releases - always broken:

   - sched: tcindex: update imperfect hash filters respecting rcu

   - mpls: fix stale pointer if allocation fails during device rename

   - dccp/tcp: avoid negative sk_forward_alloc by ipv6_pinfo.pktoptions

   - remove WARN_ON_ONCE(sk->sk_forward_alloc) from
     sk_stream_kill_queues()

   - af_key: fix heap information leak

   - ipv6: fix socket connection with DSCP (correct interpretation of
     the tclass field vs fib rule matching)

   - tipc: fix kernel warning when sending SYN message

   - vmxnet3: read RSS information from the correct descriptor (eop)"

* tag 'net-6.2-final' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (35 commits)
  devlink: Fix netdev notifier chain corruption
  igb: conditionalize I2C bit banging on external thermal sensor support
  net: mpls: fix stale pointer if allocation fails during device rename
  net/sched: tcindex: search key must be 16 bits
  tipc: fix kernel warning when sending SYN message
  igb: Fix PPS input and output using 3rd and 4th SDP
  net: use a bounce buffer for copying skb->mark
  ixgbe: add double of VLAN header when computing the max MTU
  i40e: add double of VLAN header when computing the max MTU
  ixgbe: allow to increase MTU to 3K with XDP enabled
  net: stmmac: Restrict warning on disabling DMA store and fwd mode
  net/sched: act_ctinfo: use percpu stats
  net: stmmac: fix order of dwmac5 FlexPPS parametrization sequence
  ice: fix lost multicast packets in promisc mode
  ice: Fix check for weight and priority of a scheduling node
  bnxt_en: Fix mqprio and XDP ring checking logic
  net: Fix unwanted sign extension in netdev_stats_to_stats64()
  net/usb: kalmia: Don't pass act_len in usb_bulk_msg error path
  net: openvswitch: fix possible memory leak in ovs_meter_cmd_set()
  af_key: Fix heap information leak
  ...
parents d3d6f0eb b20b8aec

drivers/net/ethernet/broadcom/bgmac-bcma.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -240,12 +240,12 @@ static int bgmac_probe(struct bcma_device *core) 
		bgmac->feature_flags |= BGMAC_FEAT_CLKCTLST;

		bgmac->feature_flags |= BGMAC_FEAT_CLKCTLST;

		bgmac->feature_flags |= BGMAC_FEAT_FLW_CTRL1;

		bgmac->feature_flags |= BGMAC_FEAT_FLW_CTRL1;

		bgmac->feature_flags |= BGMAC_FEAT_SW_TYPE_PHY;

		bgmac->feature_flags |= BGMAC_FEAT_SW_TYPE_PHY;

		if (ci->pkg == BCMA_PKG_ID_BCM47188 ||

		if ((ci->id == BCMA_CHIP_ID_BCM5357 && ci->pkg == BCMA_PKG_ID_BCM47186) ||

		    ci->pkg == BCMA_PKG_ID_BCM47186) {

		    (ci->id == BCMA_CHIP_ID_BCM53572 && ci->pkg == BCMA_PKG_ID_BCM47188)) {

			bgmac->feature_flags |= BGMAC_FEAT_SW_TYPE_RGMII;

			bgmac->feature_flags |= BGMAC_FEAT_SW_TYPE_RGMII;

			bgmac->feature_flags |= BGMAC_FEAT_IOST_ATTACHED;

			bgmac->feature_flags |= BGMAC_FEAT_IOST_ATTACHED;

		}

		}

		if (ci->pkg == BCMA_PKG_ID_BCM5358)

		if (ci->id == BCMA_CHIP_ID_BCM5357 && ci->pkg == BCMA_PKG_ID_BCM5358)

			bgmac->feature_flags |= BGMAC_FEAT_SW_TYPE_EPHYRMII;

			bgmac->feature_flags |= BGMAC_FEAT_SW_TYPE_EPHYRMII;

		break;

		break;

	case BCMA_CHIP_ID_BCM53573:

	case BCMA_CHIP_ID_BCM53573:

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

+6 −2
Original line number Original line Diff line number Diff line
@@ -9274,9 +9274,13 @@ int bnxt_reserve_rings(struct bnxt *bp, bool irq_re_init) 
		netdev_err(bp->dev, "ring reservation/IRQ init failure rc: %d\n", rc);

		netdev_err(bp->dev, "ring reservation/IRQ init failure rc: %d\n", rc);

		return rc;

		return rc;

	}

	}

	if (tcs && (bp->tx_nr_rings_per_tc * tcs != bp->tx_nr_rings)) {

	if (tcs && (bp->tx_nr_rings_per_tc * tcs !=

		    bp->tx_nr_rings - bp->tx_nr_rings_xdp)) {

		netdev_err(bp->dev, "tx ring reservation failure\n");

		netdev_err(bp->dev, "tx ring reservation failure\n");

		netdev_reset_tc(bp->dev);

		netdev_reset_tc(bp->dev);

		if (bp->tx_nr_rings_xdp)

			bp->tx_nr_rings_per_tc = bp->tx_nr_rings_xdp;

		else

			bp->tx_nr_rings_per_tc = bp->tx_nr_rings;

			bp->tx_nr_rings_per_tc = bp->tx_nr_rings;

		return -ENOMEM;

		return -ENOMEM;

	}

	}

drivers/net/ethernet/intel/i40e/i40e_main.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -2921,7 +2921,7 @@ static int i40e_change_mtu(struct net_device *netdev, int new_mtu) 
	struct i40e_pf *pf = vsi->back;

	struct i40e_pf *pf = vsi->back;





	if (i40e_enabled_xdp_vsi(vsi)) {

	if (i40e_enabled_xdp_vsi(vsi)) {

		int frame_size = new_mtu + ETH_HLEN + ETH_FCS_LEN + VLAN_HLEN;

		int frame_size = new_mtu + I40E_PACKET_HDR_PAD;





		if (frame_size > i40e_max_xdp_frame_size(vsi))

		if (frame_size > i40e_max_xdp_frame_size(vsi))

			return -EINVAL;

			return -EINVAL;
@@ -13167,6 +13167,8 @@ static int i40e_ndo_bridge_setlink(struct net_device *dev, 
	}

	}





	br_spec = nlmsg_find_attr(nlh, sizeof(struct ifinfomsg), IFLA_AF_SPEC);

	br_spec = nlmsg_find_attr(nlh, sizeof(struct ifinfomsg), IFLA_AF_SPEC);

	if (!br_spec)

		return -EINVAL;





	nla_for_each_nested(attr, br_spec, rem) {

	nla_for_each_nested(attr, br_spec, rem) {

		__u16 mode;

		__u16 mode;

drivers/net/ethernet/intel/ice/ice_devlink.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -899,7 +899,7 @@ static int ice_set_object_tx_priority(struct ice_port_info *pi, struct ice_sched 
{

{

	int status;

	int status;





	if (node->tx_priority >= 8) {

	if (priority >= 8) {

		NL_SET_ERR_MSG_MOD(extack, "Priority should be less than 8");

		NL_SET_ERR_MSG_MOD(extack, "Priority should be less than 8");

		return -EINVAL;

		return -EINVAL;

	}

	}
@@ -929,7 +929,7 @@ static int ice_set_object_tx_weight(struct ice_port_info *pi, struct ice_sched_n 
{

{

	int status;

	int status;





	if (node->tx_weight > 200 || node->tx_weight < 1) {

	if (weight > 200 || weight < 1) {

		NL_SET_ERR_MSG_MOD(extack, "Weight must be between 1 and 200");

		NL_SET_ERR_MSG_MOD(extack, "Weight must be between 1 and 200");

		return -EINVAL;

		return -EINVAL;

	}

	}

drivers/net/ethernet/intel/ice/ice_main.c

+26 −0
Original line number Original line Diff line number Diff line
@@ -275,6 +275,8 @@ static int ice_set_promisc(struct ice_vsi *vsi, u8 promisc_m) 
	if (status && status != -EEXIST)

	if (status && status != -EEXIST)

		return status;

		return status;





	netdev_dbg(vsi->netdev, "set promisc filter bits for VSI %i: 0x%x\n",

		   vsi->vsi_num, promisc_m);

	return 0;

	return 0;

}

}
@@ -300,6 +302,8 @@ static int ice_clear_promisc(struct ice_vsi *vsi, u8 promisc_m) 
						    promisc_m, 0);

						    promisc_m, 0);

	}

	}





	netdev_dbg(vsi->netdev, "clear promisc filter bits for VSI %i: 0x%x\n",

		   vsi->vsi_num, promisc_m);

	return status;

	return status;

}

}
@@ -414,6 +418,16 @@ static int ice_vsi_sync_fltr(struct ice_vsi *vsi) 
				}

				}

				err = 0;

				err = 0;

				vlan_ops->dis_rx_filtering(vsi);

				vlan_ops->dis_rx_filtering(vsi);



				/* promiscuous mode implies allmulticast so

				 * that VSIs that are in promiscuous mode are

				 * subscribed to multicast packets coming to

				 * the port

				 */

				err = ice_set_promisc(vsi,

						      ICE_MCAST_PROMISC_BITS);

				if (err)

					goto out_promisc;

			}

			}

		} else {

		} else {

			/* Clear Rx filter to remove traffic from wire */

			/* Clear Rx filter to remove traffic from wire */
@@ -430,6 +444,18 @@ static int ice_vsi_sync_fltr(struct ice_vsi *vsi) 
				    NETIF_F_HW_VLAN_CTAG_FILTER)

				    NETIF_F_HW_VLAN_CTAG_FILTER)

					vlan_ops->ena_rx_filtering(vsi);

					vlan_ops->ena_rx_filtering(vsi);

			}

			}



			/* disable allmulti here, but only if allmulti is not

			 * still enabled for the netdev

			 */

			if (!(vsi->current_netdev_flags & IFF_ALLMULTI)) {

				err = ice_clear_promisc(vsi,

							ICE_MCAST_PROMISC_BITS);

				if (err) {

					netdev_err(netdev, "Error %d clearing multicast promiscuous on VSI %i\n",

						   err, vsi->vsi_num);

				}

			}

		}

		}

	}

	}

	goto exit;

	goto exit;