Commit 51df8e0c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking fixes from Paolo Abeni:
 "Including fixes from bpf and netfilter.

  Current release - regressions:

   - core: fix rc7's __skb_datagram_iter() regression

  Current release - new code bugs:

   - eth: bnxt: fix crashes when reducing ring count with active RSS
     contexts

  Previous releases - regressions:

   - sched: fix UAF when resolving a clash

   - skmsg: skip zero length skb in sk_msg_recvmsg2

   - sunrpc: fix kernel free on connection failure in
     xs_tcp_setup_socket

   - tcp: avoid too many retransmit packets

   - tcp: fix incorrect undo caused by DSACK of TLP retransmit

   - udp: Set SOCK_RCU_FREE earlier in udp_lib_get_port().

   - eth: ks8851: fix deadlock with the SPI chip variant

   - eth: i40e: fix XDP program unloading while removing the driver

  Previous releases - always broken:

   - bpf:
       - fix too early release of tcx_entry
       - fail bpf_timer_cancel when callback is being cancelled
       - bpf: fix order of args in call to bpf_map_kvcalloc

   - netfilter: nf_tables: prefer nft_chain_validate

   - ppp: reject claimed-as-LCP but actually malformed packets

   - wireguard: avoid unaligned 64-bit memory accesses"

* tag 'net-6.10-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (33 commits)
  net, sunrpc: Remap EPERM in case of connection failure in xs_tcp_setup_socket
  net/sched: Fix UAF when resolving a clash
  net: ks8851: Fix potential TX stall after interface reopen
  udp: Set SOCK_RCU_FREE earlier in udp_lib_get_port().
  netfilter: nf_tables: prefer nft_chain_validate
  netfilter: nfnetlink_queue: drop bogus WARN_ON
  ethtool: netlink: do not return SQI value if link is down
  ppp: reject claimed-as-LCP but actually malformed packets
  selftests/bpf: Add timer lockup selftest
  net: ethernet: mtk-star-emac: set mac_managed_pm when probing
  e1000e: fix force smbus during suspend flow
  tcp: avoid too many retransmit packets
  bpf: Defer work in bpf_timer_cancel_and_free
  bpf: Fail bpf_timer_cancel when callback is being cancelled
  bpf: fix order of args in call to bpf_map_kvcalloc
  net: ethernet: lantiq_etop: fix double free in detach
  i40e: Fix XDP program unloading while removing the driver
  net: fix rc7's __skb_datagram_iter()
  net: ks8851: Fix deadlock with the SPI chip variant
  octeontx2-af: Fix incorrect value output on error path in rvu_check_rsrc_availability()
  ...
parents 83ab4b46 d7c199e7

Documentation/networking/devlink/devlink-region.rst

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ example usage 
    $ devlink region show [ DEV/REGION ]

    $ devlink region del DEV/REGION snapshot SNAPSHOT_ID

    $ devlink region dump DEV/REGION [ snapshot SNAPSHOT_ID ]

    $ devlink region read DEV/REGION [ snapshot SNAPSHOT_ID ] address ADDRESS length length

    $ devlink region read DEV/REGION [ snapshot SNAPSHOT_ID ] address ADDRESS length LENGTH



    # Show all of the exposed regions with region sizes:

    $ devlink region show

drivers/net/dsa/lan9303-core.c

+10 −13
Original line number Diff line number Diff line
@@ -1047,31 +1047,31 @@ static int lan9303_get_sset_count(struct dsa_switch *ds, int port, int sset) 
	return ARRAY_SIZE(lan9303_mib);

}



static int lan9303_phy_read(struct dsa_switch *ds, int phy, int regnum)

static int lan9303_phy_read(struct dsa_switch *ds, int port, int regnum)

{

	struct lan9303 *chip = ds->priv;

	int phy_base = chip->phy_addr_base;



	if (phy == phy_base)

	if (port == 0)

		return lan9303_virt_phy_reg_read(chip, regnum);

	if (phy > phy_base + 2)

	if (port > 2)

		return -ENODEV;



	return chip->ops->phy_read(chip, phy, regnum);

	return chip->ops->phy_read(chip, phy_base + port, regnum);

}



static int lan9303_phy_write(struct dsa_switch *ds, int phy, int regnum,

static int lan9303_phy_write(struct dsa_switch *ds, int port, int regnum,

			     u16 val)

{

	struct lan9303 *chip = ds->priv;

	int phy_base = chip->phy_addr_base;



	if (phy == phy_base)

	if (port == 0)

		return lan9303_virt_phy_reg_write(chip, regnum, val);

	if (phy > phy_base + 2)

	if (port > 2)

		return -ENODEV;



	return chip->ops->phy_write(chip, phy, regnum, val);

	return chip->ops->phy_write(chip, phy_base + port, regnum, val);

}



static int lan9303_port_enable(struct dsa_switch *ds, int port,
@@ -1099,7 +1099,7 @@ static void lan9303_port_disable(struct dsa_switch *ds, int port) 
	vlan_vid_del(dsa_port_to_conduit(dp), htons(ETH_P_8021Q), port);



	lan9303_disable_processing_port(chip, port);

	lan9303_phy_write(ds, chip->phy_addr_base + port, MII_BMCR, BMCR_PDOWN);

	lan9303_phy_write(ds, port, MII_BMCR, BMCR_PDOWN);

}



static int lan9303_port_bridge_join(struct dsa_switch *ds, int port,
@@ -1374,8 +1374,6 @@ static const struct dsa_switch_ops lan9303_switch_ops = { 


static int lan9303_register_switch(struct lan9303 *chip)

{

	int base;



	chip->ds = devm_kzalloc(chip->dev, sizeof(*chip->ds), GFP_KERNEL);

	if (!chip->ds)

		return -ENOMEM;
@@ -1385,8 +1383,7 @@ static int lan9303_register_switch(struct lan9303 *chip) 
	chip->ds->priv = chip;

	chip->ds->ops = &lan9303_switch_ops;

	chip->ds->phylink_mac_ops = &lan9303_phylink_mac_ops;

	base = chip->phy_addr_base;

	chip->ds->phys_mii_mask = GENMASK(LAN9303_NUM_PORTS - 1 + base, base);

	chip->ds->phys_mii_mask = GENMASK(LAN9303_NUM_PORTS - 1, 0);



	return dsa_register_switch(chip->ds);

}

drivers/net/ethernet/broadcom/asp2/bcmasp.c

+1 −0
Original line number Diff line number Diff line
@@ -1380,6 +1380,7 @@ static int bcmasp_probe(struct platform_device *pdev) 
			dev_err(dev, "Cannot create eth interface %d\n", i);

			bcmasp_remove_intfs(priv);

			of_node_put(intf_node);

			ret = -ENOMEM;

			goto of_put_exit;

		}

		list_add_tail(&intf->list, &priv->intfs);

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

+15 −0
Original line number Diff line number Diff line
@@ -6146,6 +6146,21 @@ static u16 bnxt_get_max_rss_ring(struct bnxt *bp) 
	return max_ring;

}



u16 bnxt_get_max_rss_ctx_ring(struct bnxt *bp)

{

	u16 i, tbl_size, max_ring = 0;

	struct bnxt_rss_ctx *rss_ctx;



	tbl_size = bnxt_get_rxfh_indir_size(bp->dev);



	list_for_each_entry(rss_ctx, &bp->rss_ctx_list, list) {

		for (i = 0; i < tbl_size; i++)

			max_ring = max(max_ring, rss_ctx->rss_indir_tbl[i]);

	}



	return max_ring;

}



int bnxt_get_nr_rss_ctxs(struct bnxt *bp, int rx_rings)

{

	if (bp->flags & BNXT_FLAG_CHIP_P5_PLUS) {

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

+1 −0
Original line number Diff line number Diff line
@@ -2776,6 +2776,7 @@ int bnxt_hwrm_vnic_set_tpa(struct bnxt *bp, struct bnxt_vnic_info *vnic, 
void bnxt_fill_ipv6_mask(__be32 mask[4]);

int bnxt_alloc_rss_indir_tbl(struct bnxt *bp, struct bnxt_rss_ctx *rss_ctx);

void bnxt_set_dflt_rss_indir_tbl(struct bnxt *bp, struct bnxt_rss_ctx *rss_ctx);

u16 bnxt_get_max_rss_ctx_ring(struct bnxt *bp);

int bnxt_get_nr_rss_ctxs(struct bnxt *bp, int rx_rings);

int bnxt_hwrm_vnic_cfg(struct bnxt *bp, struct bnxt_vnic_info *vnic);

int bnxt_hwrm_vnic_alloc(struct bnxt *bp, struct bnxt_vnic_info *vnic,