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

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

Pull networking fixes from Paolo Abeni:
 "Notably this includes fixes for a few regressions spotted very
  recently. No known outstanding ones.

  Current release - regressions:

   - core: avoid CFI problems with sock priv helpers

   - xsk: bring back busy polling support

   - netpoll: ensure skb_pool list is always initialized

  Current release - new code bugs:

   - core: make page_pool_ref_netmem work with net iovs

   - ipv4: route: fix drop reason being overridden in
     ip_route_input_slow

   - udp: make rehash4 independent in udp_lib_rehash()

  Previous releases - regressions:

   - bpf: fix bpf_sk_select_reuseport() memory leak

   - openvswitch: fix lockup on tx to unregistering netdev with carrier

   - mptcp: be sure to send ack when mptcp-level window re-opens

   - eth:
      - bnxt: always recalculate features after XDP clearing, fix
        null-deref
      - mlx5: fix sub-function add port error handling
      - fec: handle page_pool_dev_alloc_pages error

  Previous releases - always broken:

   - vsock: some fixes due to transport de-assignment

   - eth:
      - ice: fix E825 initialization
      - mlx5e: fix inversion dependency warning while enabling IPsec
        tunnel
      - gtp: destroy device along with udp socket's netns dismantle.
      - xilinx: axienet: Fix IRQ coalescing packet count overflow"

* tag 'net-6.13-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (44 commits)
  netdev: avoid CFI problems with sock priv helpers
  net/mlx5e: Always start IPsec sequence number from 1
  net/mlx5e: Rely on reqid in IPsec tunnel mode
  net/mlx5e: Fix inversion dependency warning while enabling IPsec tunnel
  net/mlx5: Clear port select structure when fail to create
  net/mlx5: SF, Fix add port error handling
  net/mlx5: Fix a lockdep warning as part of the write combining test
  net/mlx5: Fix RDMA TX steering prio
  net: make page_pool_ref_netmem work with net iovs
  net: ethernet: xgbe: re-add aneg to supported features in PHY quirks
  net: pcs: xpcs: actively unset DW_VR_MII_DIG_CTRL1_2G5_EN for 1G SGMII
  net: pcs: xpcs: fix DW_VR_MII_DIG_CTRL1_2G5_EN bit being set for 1G SGMII w/o inband
  selftests: net: Adapt ethtool mq tests to fix in qdisc graft
  net: fec: handle page_pool_dev_alloc_pages error
  net: netpoll: ensure skb_pool list is always initialized
  net: xilinx: axienet: Fix IRQ coalescing packet count overflow
  nfp: bpf: prevent integer overflow in nfp_bpf_event_output()
  selftests: mptcp: avoid spurious errors on disconnect
  mptcp: fix spurious wake-up on under memory pressure
  mptcp: be sure to send ack when mptcp-level window re-opens
  ...
parents 6b4ccf11 a50da365

drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c

+2 −17
Original line number Diff line number Diff line
@@ -923,7 +923,6 @@ static void xgbe_phy_free_phy_device(struct xgbe_prv_data *pdata) 


static bool xgbe_phy_finisar_phy_quirks(struct xgbe_prv_data *pdata)

{

	__ETHTOOL_DECLARE_LINK_MODE_MASK(supported) = { 0, };

	struct xgbe_phy_data *phy_data = pdata->phy_data;

	unsigned int phy_id = phy_data->phydev->phy_id;
@@ -945,14 +944,7 @@ static bool xgbe_phy_finisar_phy_quirks(struct xgbe_prv_data *pdata) 
	phy_write(phy_data->phydev, 0x04, 0x0d01);

	phy_write(phy_data->phydev, 0x00, 0x9140);



	linkmode_set_bit_array(phy_10_100_features_array,

			       ARRAY_SIZE(phy_10_100_features_array),

			       supported);

	linkmode_set_bit_array(phy_gbit_features_array,

			       ARRAY_SIZE(phy_gbit_features_array),

			       supported);



	linkmode_copy(phy_data->phydev->supported, supported);

	linkmode_copy(phy_data->phydev->supported, PHY_GBIT_FEATURES);



	phy_support_asym_pause(phy_data->phydev);
@@ -964,7 +956,6 @@ static bool xgbe_phy_finisar_phy_quirks(struct xgbe_prv_data *pdata) 


static bool xgbe_phy_belfuse_phy_quirks(struct xgbe_prv_data *pdata)

{

	__ETHTOOL_DECLARE_LINK_MODE_MASK(supported) = { 0, };

	struct xgbe_phy_data *phy_data = pdata->phy_data;

	struct xgbe_sfp_eeprom *sfp_eeprom = &phy_data->sfp_eeprom;

	unsigned int phy_id = phy_data->phydev->phy_id;
@@ -1028,13 +1019,7 @@ static bool xgbe_phy_belfuse_phy_quirks(struct xgbe_prv_data *pdata) 
	reg = phy_read(phy_data->phydev, 0x00);

	phy_write(phy_data->phydev, 0x00, reg & ~0x00800);



	linkmode_set_bit_array(phy_10_100_features_array,

			       ARRAY_SIZE(phy_10_100_features_array),

			       supported);

	linkmode_set_bit_array(phy_gbit_features_array,

			       ARRAY_SIZE(phy_gbit_features_array),

			       supported);

	linkmode_copy(phy_data->phydev->supported, supported);

	linkmode_copy(phy_data->phydev->supported, PHY_GBIT_FEATURES);

	phy_support_asym_pause(phy_data->phydev);



	netif_dbg(pdata, drv, pdata->netdev,

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

+20 −5
Original line number Diff line number Diff line
@@ -4708,7 +4708,7 @@ void bnxt_set_ring_params(struct bnxt *bp) 
/* Changing allocation mode of RX rings.

 * TODO: Update when extending xdp_rxq_info to support allocation modes.

 */

int bnxt_set_rx_skb_mode(struct bnxt *bp, bool page_mode)

static void __bnxt_set_rx_skb_mode(struct bnxt *bp, bool page_mode)

{

	struct net_device *dev = bp->dev;
@@ -4729,15 +4729,30 @@ int bnxt_set_rx_skb_mode(struct bnxt *bp, bool page_mode) 
			bp->rx_skb_func = bnxt_rx_page_skb;

		}

		bp->rx_dir = DMA_BIDIRECTIONAL;

		/* Disable LRO or GRO_HW */

		netdev_update_features(dev);

	} else {

		dev->max_mtu = bp->max_mtu;

		bp->flags &= ~BNXT_FLAG_RX_PAGE_MODE;

		bp->rx_dir = DMA_FROM_DEVICE;

		bp->rx_skb_func = bnxt_rx_skb;

	}

	return 0;

}



void bnxt_set_rx_skb_mode(struct bnxt *bp, bool page_mode)

{

	__bnxt_set_rx_skb_mode(bp, page_mode);



	if (!page_mode) {

		int rx, tx;



		bnxt_get_max_rings(bp, &rx, &tx, true);

		if (rx > 1) {

			bp->flags &= ~BNXT_FLAG_NO_AGG_RINGS;

			bp->dev->hw_features |= NETIF_F_LRO;

		}

	}



	/* Update LRO and GRO_HW availability */

	netdev_update_features(bp->dev);

}



static void bnxt_free_vnic_attributes(struct bnxt *bp)
@@ -16214,7 +16229,7 @@ static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
	if (bp->max_fltr < BNXT_MAX_FLTR)

		bp->max_fltr = BNXT_MAX_FLTR;

	bnxt_init_l2_fltr_tbl(bp);

	bnxt_set_rx_skb_mode(bp, false);

	__bnxt_set_rx_skb_mode(bp, false);

	bnxt_set_tpa_flags(bp);

	bnxt_set_ring_params(bp);

	bnxt_rdma_aux_device_init(bp);

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

+1 −1
Original line number Diff line number Diff line
@@ -2846,7 +2846,7 @@ u32 bnxt_fw_health_readl(struct bnxt *bp, int reg_idx); 
bool bnxt_bs_trace_avail(struct bnxt *bp, u16 type);

void bnxt_set_tpa_flags(struct bnxt *bp);

void bnxt_set_ring_params(struct bnxt *);

int bnxt_set_rx_skb_mode(struct bnxt *bp, bool page_mode);

void bnxt_set_rx_skb_mode(struct bnxt *bp, bool page_mode);

void bnxt_insert_usr_fltr(struct bnxt *bp, struct bnxt_filter_base *fltr);

void bnxt_del_one_usr_fltr(struct bnxt *bp, struct bnxt_filter_base *fltr);

int bnxt_hwrm_func_drv_rgtr(struct bnxt *bp, unsigned long *bmap,

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

+0 −7
Original line number Diff line number Diff line
@@ -422,15 +422,8 @@ static int bnxt_xdp_set(struct bnxt *bp, struct bpf_prog *prog) 
		bnxt_set_rx_skb_mode(bp, true);

		xdp_features_set_redirect_target(dev, true);

	} else {

		int rx, tx;



		xdp_features_clear_redirect_target(dev);

		bnxt_set_rx_skb_mode(bp, false);

		bnxt_get_max_rings(bp, &rx, &tx, true);

		if (rx > 1) {

			bp->flags &= ~BNXT_FLAG_NO_AGG_RINGS;

			bp->dev->hw_features |= NETIF_F_LRO;

		}

	}

	bp->tx_nr_rings_xdp = tx_xdp;

	bp->tx_nr_rings = bp->tx_nr_rings_per_tc * tc + tx_xdp;

drivers/net/ethernet/freescale/fec_main.c

+14 −5
Original line number Diff line number Diff line
@@ -1591,19 +1591,22 @@ static void fec_enet_tx(struct net_device *ndev, int budget) 
		fec_enet_tx_queue(ndev, i, budget);

}



static void fec_enet_update_cbd(struct fec_enet_priv_rx_q *rxq,

static int fec_enet_update_cbd(struct fec_enet_priv_rx_q *rxq,

				struct bufdesc *bdp, int index)

{

	struct page *new_page;

	dma_addr_t phys_addr;



	new_page = page_pool_dev_alloc_pages(rxq->page_pool);

	WARN_ON(!new_page);

	rxq->rx_skb_info[index].page = new_page;

	if (unlikely(!new_page))

		return -ENOMEM;



	rxq->rx_skb_info[index].page = new_page;

	rxq->rx_skb_info[index].offset = FEC_ENET_XDP_HEADROOM;

	phys_addr = page_pool_get_dma_addr(new_page) + FEC_ENET_XDP_HEADROOM;

	bdp->cbd_bufaddr = cpu_to_fec32(phys_addr);



	return 0;

}



static u32
@@ -1698,6 +1701,7 @@ fec_enet_rx_queue(struct net_device *ndev, int budget, u16 queue_id) 
	int cpu = smp_processor_id();

	struct xdp_buff xdp;

	struct page *page;

	__fec32 cbd_bufaddr;

	u32 sub_len = 4;



#if !defined(CONFIG_M5272)
@@ -1766,12 +1770,17 @@ fec_enet_rx_queue(struct net_device *ndev, int budget, u16 queue_id) 


		index = fec_enet_get_bd_index(bdp, &rxq->bd);

		page = rxq->rx_skb_info[index].page;

		cbd_bufaddr = bdp->cbd_bufaddr;

		if (fec_enet_update_cbd(rxq, bdp, index)) {

			ndev->stats.rx_dropped++;

			goto rx_processing_done;

		}



		dma_sync_single_for_cpu(&fep->pdev->dev,

					fec32_to_cpu(bdp->cbd_bufaddr),

					fec32_to_cpu(cbd_bufaddr),

					pkt_len,

					DMA_FROM_DEVICE);

		prefetch(page_address(page));

		fec_enet_update_cbd(rxq, bdp, index);



		if (xdp_prog) {

			xdp_buff_clear_frags_flag(&xdp);