Commit 57012c57 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking fixes from Paolo Abeni:
 "Including fixes from can, netfilter.

  Current release - regressions:

   - core: fix splice_to_socket() for O_NONBLOCK socket

   - af_unix: fix fortify_panic() in unix_bind_bsd().

   - can: raw: fix lockdep issue in raw_release()

  Previous releases - regressions:

   - tcp: reduce chance of collisions in inet6_hashfn().

   - netfilter: skip immediate deactivate in _PREPARE_ERROR

   - tipc: stop tipc crypto on failure in tipc_node_create

   - eth: igc: fix kernel panic during ndo_tx_timeout callback

   - eth: iavf: fix potential deadlock on allocation failure

  Previous releases - always broken:

   - ipv6: fix bug where deleting a mngtmpaddr can create a new
     temporary address

   - eth: ice: fix memory management in ice_ethtool_fdir.c

   - eth: hns3: fix the imp capability bit cannot exceed 32 bits issue

   - eth: vxlan: calculate correct header length for GPE

   - eth: stmmac: apply redundant write work around on 4.xx too"

* tag 'net-6.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (49 commits)
  tipc: stop tipc crypto on failure in tipc_node_create
  af_unix: Terminate sun_path when bind()ing pathname socket.
  tipc: check return value of pskb_trim()
  benet: fix return value check in be_lancer_xmit_workarounds()
  virtio-net: fix race between set queues and probe
  net/sched: mqprio: Add length check for TCA_MQPRIO_{MAX/MIN}_RATE64
  splice, net: Fix splice_to_socket() for O_NONBLOCK socket
  net: fec: tx processing does not call XDP APIs if budget is 0
  mptcp: more accurate NL event generation
  selftests: mptcp: join: only check for ip6tables if needed
  tools: ynl-gen: fix parse multi-attr enum attribute
  tools: ynl-gen: fix enum index in _decode_enum(..)
  netfilter: nf_tables: disallow rule addition to bound chain via NFTA_RULE_CHAIN_ID
  netfilter: nf_tables: skip immediate deactivate in _PREPARE_ERROR
  netfilter: nft_set_rbtree: fix overlap expiration walk
  igc: Fix Kernel Panic during ndo_tx_timeout callback
  net: dsa: qca8k: fix mdb add/del case with 0 VID
  net: dsa: qca8k: fix broken search_and_del
  net: dsa: qca8k: fix search_and_insert wrong handling of new rule
  net: dsa: qca8k: enable use_single_write for qca8xxx
  ...
parents bc168790 de52e173

Documentation/networking/napi.rst

+7 −6
Original line number Diff line number Diff line
@@ -65,15 +65,16 @@ argument - drivers can process completions for any number of Tx 
packets but should only process up to ``budget`` number of

Rx packets. Rx processing is usually much more expensive.



In other words, it is recommended to ignore the budget argument when

performing TX buffer reclamation to ensure that the reclamation is not

arbitrarily bounded; however, it is required to honor the budget argument

for RX processing.

In other words for Rx processing the ``budget`` argument limits how many

packets driver can process in a single poll. Rx specific APIs like page

pool or XDP cannot be used at all when ``budget`` is 0.

skb Tx processing should happen regardless of the ``budget``, but if

the argument is 0 driver cannot call any XDP (or page pool) APIs.



.. warning::



   The ``budget`` argument may be 0 if core tries to only process Tx completions

   and no Rx packets.

   The ``budget`` argument may be 0 if core tries to only process

   skb Tx completions and no Rx or XDP packets.



The poll method returns the amount of work done. If the driver still

has outstanding work to do (e.g. ``budget`` was exhausted)

drivers/net/bonding/bond_main.c

+5 −0
Original line number Diff line number Diff line
@@ -1508,6 +1508,11 @@ static void bond_setup_by_slave(struct net_device *bond_dev, 


	memcpy(bond_dev->broadcast, slave_dev->broadcast,

		slave_dev->addr_len);



	if (slave_dev->flags & IFF_POINTOPOINT) {

		bond_dev->flags &= ~(IFF_BROADCAST | IFF_MULTICAST);

		bond_dev->flags |= (IFF_POINTOPOINT | IFF_NOARP);

	}

}



/* On bonding slaves other than the currently active slave, suppress

drivers/net/can/usb/gs_usb.c

+2 −0
Original line number Diff line number Diff line
@@ -1030,6 +1030,8 @@ static int gs_can_close(struct net_device *netdev) 
	usb_kill_anchored_urbs(&dev->tx_submitted);

	atomic_set(&dev->active_tx_urbs, 0);



	dev->can.state = CAN_STATE_STOPPED;



	/* reset the device */

	rc = gs_cmd_reset(dev);

	if (rc < 0)

drivers/net/dsa/qca/qca8k-8xxx.c

+5 −2
Original line number Diff line number Diff line
@@ -576,8 +576,11 @@ static struct regmap_config qca8k_regmap_config = { 
	.rd_table = &qca8k_readable_table,

	.disable_locking = true, /* Locking is handled by qca8k read/write */

	.cache_type = REGCACHE_NONE, /* Explicitly disable CACHE */

	.max_raw_read = 32, /* mgmt eth can read/write up to 8 registers at time */

	.max_raw_write = 32,

	.max_raw_read = 32, /* mgmt eth can read up to 8 registers at time */

	/* ATU regs suffer from a bug where some data are not correctly

	 * written. Disable bulk write to correctly write ATU entry.

	 */

	.use_single_write = true,

};



static int

drivers/net/dsa/qca/qca8k-common.c

+16 −3
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ void qca8k_fdb_flush(struct qca8k_priv *priv) 
}



static int qca8k_fdb_search_and_insert(struct qca8k_priv *priv, u8 port_mask,

				       const u8 *mac, u16 vid)

				       const u8 *mac, u16 vid, u8 aging)

{

	struct qca8k_fdb fdb = { 0 };

	int ret;
@@ -261,10 +261,12 @@ static int qca8k_fdb_search_and_insert(struct qca8k_priv *priv, u8 port_mask, 
		goto exit;



	/* Rule exist. Delete first */

	if (!fdb.aging) {

	if (fdb.aging) {

		ret = qca8k_fdb_access(priv, QCA8K_FDB_PURGE, -1);

		if (ret)

			goto exit;

	} else {

		fdb.aging = aging;

	}



	/* Add port to fdb portmask */
@@ -291,6 +293,10 @@ static int qca8k_fdb_search_and_del(struct qca8k_priv *priv, u8 port_mask, 
	if (ret < 0)

		goto exit;



	ret = qca8k_fdb_read(priv, &fdb);

	if (ret < 0)

		goto exit;



	/* Rule doesn't exist. Why delete? */

	if (!fdb.aging) {

		ret = -EINVAL;
@@ -810,7 +816,11 @@ int qca8k_port_mdb_add(struct dsa_switch *ds, int port, 
	const u8 *addr = mdb->addr;

	u16 vid = mdb->vid;



	return qca8k_fdb_search_and_insert(priv, BIT(port), addr, vid);

	if (!vid)

		vid = QCA8K_PORT_VID_DEF;



	return qca8k_fdb_search_and_insert(priv, BIT(port), addr, vid,

					   QCA8K_ATU_STATUS_STATIC);

}



int qca8k_port_mdb_del(struct dsa_switch *ds, int port,
@@ -821,6 +831,9 @@ int qca8k_port_mdb_del(struct dsa_switch *ds, int port, 
	const u8 *addr = mdb->addr;

	u16 vid = mdb->vid;



	if (!vid)

		vid = QCA8K_PORT_VID_DEF;



	return qca8k_fdb_search_and_del(priv, BIT(port), addr, vid);

}