Commit 407c114c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking fixes from Paolo Abeni:
 "Including fixes from can and xfrm.

  The TI regression notified last week is actually on our net-next tree,
  it does not affect 6.16.

  We are investigating a virtio regression which is quite hard to
  reproduce - currently only our CI sporadically hits it. Hopefully it
  should not be critical, and I'm not sure that an additional week would
  be enough to solve it.

  Current release - fix to a fix:

   - sched: sch_qfq: avoid sleeping in atomic context in qfq_delete_class

  Previous releases - regressions:

   - xfrm:
      - set transport header to fix UDP GRO handling
      - delete x->tunnel as we delete x

   - eth:
      - mlx5: fix memory leak in cmd_exec()
      - i40e: when removing VF MAC filters, avoid losing PF-set MAC
      - gve: fix stuck TX queue for DQ queue format

  Previous releases - always broken:

   - can: fix NULL pointer deref of struct can_priv::do_set_mode

   - eth:
      - ice: fix a null pointer dereference in ice_copy_and_init_pkg()
      - ism: fix concurrency management in ism_cmd()
      - dpaa2: fix device reference count leak in MAC endpoint handling
      - icssg-prueth: fix buffer allocation for ICSSG

  Misc:

   - selftests: mptcp: increase code coverage"

* tag 'net-6.16-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (34 commits)
  net: hns3: default enable tx bounce buffer when smmu enabled
  net: hns3: fixed vf get max channels bug
  net: hns3: disable interrupt when ptp init failed
  net: hns3: fix concurrent setting vlan filter issue
  s390/ism: fix concurrency management in ism_cmd()
  selftests: drv-net: wait for iperf client to stop sending
  MAINTAINERS: Add in6.h to MAINTAINERS
  selftests: netfilter: tone-down conntrack clash test
  can: netlink: can_changelink(): fix NULL pointer deref of struct can_priv::do_set_mode
  net/sched: sch_qfq: Avoid triggering might_sleep in atomic context in qfq_delete_class
  gve: Fix stuck TX queue for DQ queue format
  net: appletalk: Fix use-after-free in AARP proxy probe
  net: bcmasp: Restore programming of TX map vector register
  selftests: mptcp: connect: also cover checksum
  selftests: mptcp: connect: also cover alt modes
  e1000e: ignore uninitialized checksum word on tgp
  e1000e: disregard NVM checksum on tgp when valid checksum bit is not set
  ice: Fix a null pointer dereference in ice_copy_and_init_pkg()
  i40e: When removing VF MAC filters, only check PF-set MAC
  i40e: report VF tx_dropped with tx_errors instead of tx_discards
  ...
parents 25fae0b9 291d5dc8

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -17383,6 +17383,7 @@ F: include/linux/ethtool.h 
F:	include/linux/framer/framer-provider.h

F:	include/linux/framer/framer.h

F:	include/linux/in.h

F:	include/linux/in6.h

F:	include/linux/indirect_call_wrapper.h

F:	include/linux/inet.h

F:	include/linux/inet_diag.h

drivers/bus/fsl-mc/fsl-mc-bus.c

+9 −10
Original line number Diff line number Diff line
@@ -943,6 +943,7 @@ struct fsl_mc_device *fsl_mc_get_endpoint(struct fsl_mc_device *mc_dev, 
	struct fsl_mc_obj_desc endpoint_desc = {{ 0 }};

	struct dprc_endpoint endpoint1 = {{ 0 }};

	struct dprc_endpoint endpoint2 = {{ 0 }};

	struct fsl_mc_bus *mc_bus;

	int state, err;



	mc_bus_dev = to_fsl_mc_device(mc_dev->dev.parent);
@@ -966,6 +967,8 @@ struct fsl_mc_device *fsl_mc_get_endpoint(struct fsl_mc_device *mc_dev, 
	strcpy(endpoint_desc.type, endpoint2.type);

	endpoint_desc.id = endpoint2.id;

	endpoint = fsl_mc_device_lookup(&endpoint_desc, mc_bus_dev);

	if (endpoint)

		return endpoint;



	/*

	 * We know that the device has an endpoint because we verified by
@@ -973,17 +976,13 @@ struct fsl_mc_device *fsl_mc_get_endpoint(struct fsl_mc_device *mc_dev, 
	 * yet discovered by the fsl-mc bus, thus the lookup returned NULL.

	 * Force a rescan of the devices in this container and retry the lookup.

	 */

	if (!endpoint) {

		struct fsl_mc_bus *mc_bus = to_fsl_mc_bus(mc_bus_dev);



	mc_bus = to_fsl_mc_bus(mc_bus_dev);

	if (mutex_trylock(&mc_bus->scan_mutex)) {

		err = dprc_scan_objects(mc_bus_dev, true);

		mutex_unlock(&mc_bus->scan_mutex);

	}



	if (err < 0)

		return ERR_PTR(err);

	}



	endpoint = fsl_mc_device_lookup(&endpoint_desc, mc_bus_dev);

	/*

drivers/net/can/dev/dev.c

+9 −3
Original line number Diff line number Diff line
@@ -145,13 +145,16 @@ void can_change_state(struct net_device *dev, struct can_frame *cf, 
EXPORT_SYMBOL_GPL(can_change_state);



/* CAN device restart for bus-off recovery */

static void can_restart(struct net_device *dev)

static int can_restart(struct net_device *dev)

{

	struct can_priv *priv = netdev_priv(dev);

	struct sk_buff *skb;

	struct can_frame *cf;

	int err;



	if (!priv->do_set_mode)

		return -EOPNOTSUPP;



	if (netif_carrier_ok(dev))

		netdev_err(dev, "Attempt to restart for bus-off recovery, but carrier is OK?\n");
@@ -173,10 +176,14 @@ static void can_restart(struct net_device *dev) 
	if (err) {

		netdev_err(dev, "Restart failed, error %pe\n", ERR_PTR(err));

		netif_carrier_off(dev);



		return err;

	} else {

		netdev_dbg(dev, "Restarted\n");

		priv->can_stats.restarts++;

	}



	return 0;

}



static void can_restart_work(struct work_struct *work)
@@ -201,9 +208,8 @@ int can_restart_now(struct net_device *dev) 
		return -EBUSY;



	cancel_delayed_work_sync(&priv->restart_work);

	can_restart(dev);



	return 0;

	return can_restart(dev);

}



/* CAN bus-off

drivers/net/can/dev/netlink.c

+12 −0
Original line number Diff line number Diff line
@@ -285,6 +285,12 @@ static int can_changelink(struct net_device *dev, struct nlattr *tb[], 
	}



	if (data[IFLA_CAN_RESTART_MS]) {

		if (!priv->do_set_mode) {

			NL_SET_ERR_MSG(extack,

				       "Device doesn't support restart from Bus Off");

			return -EOPNOTSUPP;

		}



		/* Do not allow changing restart delay while running */

		if (dev->flags & IFF_UP)

			return -EBUSY;
@@ -292,6 +298,12 @@ static int can_changelink(struct net_device *dev, struct nlattr *tb[], 
	}



	if (data[IFLA_CAN_RESTART]) {

		if (!priv->do_set_mode) {

			NL_SET_ERR_MSG(extack,

				       "Device doesn't support restart from Bus Off");

			return -EOPNOTSUPP;

		}



		/* Do not allow a restart while not running */

		if (!(dev->flags & IFF_UP))

			return -EINVAL;

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

+3 −0
Original line number Diff line number Diff line
@@ -818,6 +818,9 @@ static void bcmasp_init_tx(struct bcmasp_intf *intf) 
	/* Tx SPB */

	tx_spb_ctrl_wl(intf, ((intf->channel + 8) << TX_SPB_CTRL_XF_BID_SHIFT),

		       TX_SPB_CTRL_XF_CTRL2);



	if (intf->parent->tx_chan_offset)

		tx_pause_ctrl_wl(intf, (1 << (intf->channel + 8)), TX_PAUSE_MAP_VECTOR);

	tx_spb_top_wl(intf, 0x1e, TX_SPB_TOP_BLKOUT);



	tx_spb_dma_wq(intf, intf->tx_spb_dma_addr, TX_SPB_DMA_READ);