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

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

Pull networking fixes from Jakub Kicinski:
 "Including fixes from can. Slim pickings, I'm guessing people haven't
  really started testing.

  Current release - new code bugs:

   - eth: mlx5e:
       - psp: avoid 'accel' NULL pointer dereference
       - skip PPHCR register query for FEC histogram if not supported

  Previous releases - regressions:

   - bonding: update the slave array for broadcast mode

   - rtnetlink: re-allow deleting FDB entries in user namespace

   - eth: dpaa2: fix the pointer passed to PTR_ALIGN on Tx path

  Previous releases - always broken:

   - can: drop skb on xmit if device is in listen-only mode

   - gro: clear skb_shinfo(skb)->hwtstamps in napi_reuse_skb()

   - eth: mlx5e
       - RX, fix generating skb from non-linear xdp_buff if program
         trims frags
       - make devcom init failures non-fatal, fix races with IPSec

  Misc:

   - some documentation formatting 'fixes'"

* tag 'net-6.18-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (47 commits)
  net/mlx5: Fix IPsec cleanup over MPV device
  net/mlx5: Refactor devcom to return NULL on failure
  net/mlx5e: Skip PPHCR register query if not supported by the device
  net/mlx5: Add PPHCR to PCAM supported registers mask
  virtio-net: zero unused hash fields
  net: phy: micrel: always set shared->phydev for LAN8814
  vsock: fix lock inversion in vsock_assign_transport()
  ovpn: use datagram_poll_queue for socket readiness in TCP
  espintcp: use datagram_poll_queue for socket readiness
  net: datagram: introduce datagram_poll_queue for custom receive queues
  net: bonding: fix possible peer notify event loss or dup issue
  net: hsr: prevent creation of HSR device with slaves from another netns
  sctp: avoid NULL dereference when chunk data buffer is missing
  ptp: ocp: Fix typo using index 1 instead of i in SMA initialization loop
  net: ravb: Ensure memory write completes before ringing TX doorbell
  net: ravb: Enforce descriptor type ordering
  net: hibmcge: select FIXED_PHY
  net: dlink: use dev_kfree_skb_any instead of dev_kfree_skb
  Documentation: networking: ax25: update the mailing list info.
  net: gro_cells: fix lock imbalance in gro_cells_receive()
  ...
parents a0b12d7b cb68d1e5

Documentation/networking/ax25.rst

+4 −3
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ found on https://linux-ax25.in-berlin.de. 


There is a mailing list for discussing Linux amateur radio matters

called linux-hams@vger.kernel.org. To subscribe to it, send a message to

majordomo@vger.kernel.org with the words "subscribe linux-hams" in the body

of the message, the subject field is ignored.  You don't need to be

subscribed to post but of course that means you might miss an answer.
 
linux-hams+subscribe@vger.kernel.org or use the web interface at

https://vger.kernel.org. The subject and body of the message are

ignored.  You don't need to be subscribed to post but of course that

means you might miss an answer.

Documentation/networking/device_drivers/cellular/qualcomm/rmnet.rst

+9 −3
Original line number Diff line number Diff line
@@ -137,16 +137,20 @@ d. Checksum offload header v5 


Checksum offload header fields are in big endian format.



Packet format::



  Bit            0 - 6          7               8-15              16-31

  Function     Header Type    Next Header     Checksum Valid    Reserved



Header Type is to indicate the type of header, this usually is set to CHECKSUM



Header types

= ==========================================



= ===============

0 Reserved

1 Reserved

2 checksum header

= ===============



Checksum Valid is to indicate whether the header checksum is valid. Value of 1

implies that checksum is calculated on this packet and is valid, value of 0
@@ -183,6 +187,8 @@ rmnet in a single linear skb. rmnet will process the individual 
packets and either ACK the MAP command or deliver the IP packet to the

network stack as needed



Packet format::



  MAP header|IP Packet|Optional padding|MAP header|IP Packet|Optional padding....



  MAP header|IP Packet|Optional padding|MAP header|Command Packet|Optional pad...

Documentation/networking/net_failover.rst

+2 −4
Original line number Diff line number Diff line
@@ -96,9 +96,8 @@ needed to these network configuration daemons to make sure that an IP is 
received only on the 'failover' device.



Below is the patch snippet used with 'cloud-ifupdown-helper' script found on

Debian cloud images:

Debian cloud images::



::

  @@ -27,6 +27,8 @@ do_setup() {

       local working="$cfgdir/.$INTERFACE"

       local final="$cfgdir/$INTERFACE"
@@ -172,9 +171,8 @@ appropriate FDB entry is added. 


The following script is executed on the destination hypervisor once migration

completes, and it reattaches the VF to the VM and brings down the virtio-net

interface.

interface::



::

  # reattach-vf.sh

  #!/bin/bash

drivers/net/bonding/bond_main.c

+23 −24
Original line number Diff line number Diff line
@@ -2287,7 +2287,9 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev, 
		unblock_netpoll_tx();

	}



	if (bond_mode_can_use_xmit_hash(bond))

	/* broadcast mode uses the all_slaves to loop through slaves. */

	if (bond_mode_can_use_xmit_hash(bond) ||

	    BOND_MODE(bond) == BOND_MODE_BROADCAST)

		bond_update_slave_arr(bond, NULL);



	if (!slave_dev->netdev_ops->ndo_bpf ||
@@ -2463,7 +2465,8 @@ static int __bond_release_one(struct net_device *bond_dev, 


	bond_upper_dev_unlink(bond, slave);



	if (bond_mode_can_use_xmit_hash(bond))

	if (bond_mode_can_use_xmit_hash(bond) ||

	    BOND_MODE(bond) == BOND_MODE_BROADCAST)

		bond_update_slave_arr(bond, slave);



	slave_info(bond_dev, slave_dev, "Releasing %s interface\n",
@@ -2871,7 +2874,7 @@ static void bond_mii_monitor(struct work_struct *work) 
{

	struct bonding *bond = container_of(work, struct bonding,

					    mii_work.work);

	bool should_notify_peers = false;

	bool should_notify_peers;

	bool commit;

	unsigned long delay;

	struct slave *slave;
@@ -2883,30 +2886,33 @@ static void bond_mii_monitor(struct work_struct *work) 
		goto re_arm;



	rcu_read_lock();



	should_notify_peers = bond_should_notify_peers(bond);

	commit = !!bond_miimon_inspect(bond);

	if (bond->send_peer_notif) {

		rcu_read_unlock();

		if (rtnl_trylock()) {

			bond->send_peer_notif--;

			rtnl_unlock();

		}

	} else {



	rcu_read_unlock();

	}



	if (commit) {

	if (commit || bond->send_peer_notif) {

		/* Race avoidance with bond_close cancel of workqueue */

		if (!rtnl_trylock()) {

			delay = 1;

			should_notify_peers = false;

			goto re_arm;

		}



		if (commit) {

			bond_for_each_slave(bond, slave, iter) {

			bond_commit_link_state(slave, BOND_SLAVE_NOTIFY_LATER);

				bond_commit_link_state(slave,

						       BOND_SLAVE_NOTIFY_LATER);

			}

			bond_miimon_commit(bond);

		}



		if (bond->send_peer_notif) {

			bond->send_peer_notif--;

			if (should_notify_peers)

				call_netdevice_notifiers(NETDEV_NOTIFY_PEERS,

							 bond->dev);

		}



		rtnl_unlock();	/* might sleep, hold no other locks */

	}
@@ -2914,13 +2920,6 @@ static void bond_mii_monitor(struct work_struct *work) 
re_arm:

	if (bond->params.miimon)

		queue_delayed_work(bond->wq, &bond->mii_work, delay);



	if (should_notify_peers) {

		if (!rtnl_trylock())

			return;

		call_netdevice_notifiers(NETDEV_NOTIFY_PEERS, bond->dev);

		rtnl_unlock();

	}

}



static int bond_upper_dev_walk(struct net_device *upper,

drivers/net/can/bxcan.c

+1 −1
Original line number Diff line number Diff line
@@ -842,7 +842,7 @@ static netdev_tx_t bxcan_start_xmit(struct sk_buff *skb, 
	u32 id;

	int i, j;



	if (can_dropped_invalid_skb(ndev, skb))

	if (can_dev_dropped_skb(ndev, skb))

		return NETDEV_TX_OK;



	if (bxcan_tx_busy(priv))