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

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

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

  Current release - regressions:

    - core: hold instance lock during NETDEV_CHANGE

    - rtnetlink: fix bad unlock balance in do_setlink()

    - ipv6:
       - fix null-ptr-deref in addrconf_add_ifaddr()
       - align behavior across nexthops during path selection

  Previous releases - regressions:

    - sctp: prevent transport UaF in sendmsg

    - mptcp: only inc MPJoinAckHMacFailure for HMAC failures

  Previous releases - always broken:

    - sched:
       - make ->qlen_notify() idempotent
       - ensure sufficient space when sending filter netlink notifications
       - sch_sfq: really don't allow 1 packet limit

    - netfilter: fix incorrect avx2 match of 5th field octet

    - tls: explicitly disallow disconnect

    - eth: octeontx2-pf: fix VF root node parent queue priority"

* tag 'net-6.15-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (38 commits)
  ethtool: cmis_cdb: Fix incorrect read / write length extension
  selftests: netfilter: add test case for recent mismatch bug
  nft_set_pipapo: fix incorrect avx2 match of 5th field octet
  net: ppp: Add bound checking for skb data on ppp_sync_txmung
  net: Fix null-ptr-deref by sock_lock_init_class_and_name() and rmmod.
  ipv6: Align behavior across nexthops during path selection
  net: phy: allow MDIO bus PM ops to start/stop state machine for phylink-controlled PHY
  net: phy: move phy_link_change() prior to mdio_bus_phy_may_suspend()
  selftests/tc-testing: sfq: check that a derived limit of 1 is rejected
  net_sched: sch_sfq: move the limit validation
  net_sched: sch_sfq: use a temporary work area for validating configuration
  net: libwx: handle page_pool_dev_alloc_pages error
  selftests: mptcp: validate MPJoin HMacFailure counters
  mptcp: only inc MPJoinAckHMacFailure for HMAC failures
  rtnetlink: Fix bad unlock balance in do_setlink().
  net: ethtool: Don't call .cleanup_data when prepare_data fails
  tc: Ensure we have enough buffer space when sending filter netlink notifications
  net: libwx: Fix the wrong Rx descriptor field
  octeontx2-pf: qos: fix VF root node parent queue index
  selftests: tls: check that disconnect does nothing
  ...
parents 2eb959ee eaa517b7

Documentation/networking/netdevices.rst

+6 −4
Original line number Diff line number Diff line
@@ -338,10 +338,11 @@ operations directly under the netdev instance lock. 
Devices drivers are encouraged to rely on the instance lock where possible.



For the (mostly software) drivers that need to interact with the core stack,

there are two sets of interfaces: ``dev_xxx`` and ``netif_xxx`` (e.g.,

``dev_set_mtu`` and ``netif_set_mtu``). The ``dev_xxx`` functions handle

acquiring the instance lock themselves, while the ``netif_xxx`` functions

assume that the driver has already acquired the instance lock.

there are two sets of interfaces: ``dev_xxx``/``netdev_xxx`` and ``netif_xxx``

(e.g., ``dev_set_mtu`` and ``netif_set_mtu``). The ``dev_xxx``/``netdev_xxx``

functions handle acquiring the instance lock themselves, while the

``netif_xxx`` functions assume that the driver has already acquired

the instance lock.



Notifiers and netdev instance lock

==================================
@@ -354,6 +355,7 @@ For devices with locked ops, currently only the following notifiers are 
running under the lock:

* ``NETDEV_REGISTER``

* ``NETDEV_UP``

* ``NETDEV_CHANGE``



The following notifiers are running without the lock:

* ``NETDEV_UNREGISTER``

drivers/net/ethernet/marvell/octeontx2/nic/qos.c

+5 −0
Original line number Diff line number Diff line
@@ -165,6 +165,11 @@ static void __otx2_qos_txschq_cfg(struct otx2_nic *pfvf, 


		otx2_config_sched_shaping(pfvf, node, cfg, &num_regs);

	} else if (level == NIX_TXSCH_LVL_TL2) {

		/* configure parent txschq */

		cfg->reg[num_regs] = NIX_AF_TL2X_PARENT(node->schq);

		cfg->regval[num_regs] = (u64)hw->tx_link << 16;

		num_regs++;



		/* configure link cfg */

		if (level == pfvf->qos.link_cfg_lvl) {

			cfg->reg[num_regs] = NIX_AF_TL3_TL2X_LINKX_CFG(node->schq, hw->tx_link);

drivers/net/ethernet/wangxun/libwx/wx_lib.c

+4 −2
Original line number Diff line number Diff line
@@ -310,7 +310,8 @@ static bool wx_alloc_mapped_page(struct wx_ring *rx_ring, 
		return true;



	page = page_pool_dev_alloc_pages(rx_ring->page_pool);

	WARN_ON(!page);

	if (unlikely(!page))

		return false;

	dma = page_pool_get_dma_addr(page);



	bi->page_dma = dma;
@@ -546,7 +547,8 @@ static void wx_rx_checksum(struct wx_ring *ring, 
		return;



	/* Hardware can't guarantee csum if IPv6 Dest Header found */

	if (dptype.prot != WX_DEC_PTYPE_PROT_SCTP && WX_RXD_IPV6EX(rx_desc))

	if (dptype.prot != WX_DEC_PTYPE_PROT_SCTP &&

	    wx_test_staterr(rx_desc, WX_RXD_STAT_IPV6EX))

		return;



	/* if L4 checksum error */

drivers/net/ethernet/wangxun/libwx/wx_type.h

+1 −2
Original line number Diff line number Diff line
@@ -513,6 +513,7 @@ enum WX_MSCA_CMD_value { 
#define WX_RXD_STAT_L4CS             BIT(7) /* L4 xsum calculated */

#define WX_RXD_STAT_IPCS             BIT(8) /* IP xsum calculated */

#define WX_RXD_STAT_OUTERIPCS        BIT(10) /* Cloud IP xsum calculated*/

#define WX_RXD_STAT_IPV6EX           BIT(12) /* IPv6 Dest Header */

#define WX_RXD_STAT_TS               BIT(14) /* IEEE1588 Time Stamp */



#define WX_RXD_ERR_OUTERIPER         BIT(26) /* CRC IP Header error */
@@ -589,8 +590,6 @@ enum wx_l2_ptypes { 


#define WX_RXD_PKTTYPE(_rxd) \

	((le32_to_cpu((_rxd)->wb.lower.lo_dword.data) >> 9) & 0xFF)

#define WX_RXD_IPV6EX(_rxd) \

	((le32_to_cpu((_rxd)->wb.lower.lo_dword.data) >> 6) & 0x1)

/*********************** Transmit Descriptor Config Masks ****************/

#define WX_TXD_STAT_DD               BIT(0)  /* Descriptor Done */

#define WX_TXD_DTYP_DATA             0       /* Adv Data Descriptor */

drivers/net/phy/phy_device.c

+42 −15
Original line number Diff line number Diff line
@@ -244,6 +244,46 @@ static bool phy_drv_wol_enabled(struct phy_device *phydev) 
	return wol.wolopts != 0;

}



static void phy_link_change(struct phy_device *phydev, bool up)

{

	struct net_device *netdev = phydev->attached_dev;



	if (up)

		netif_carrier_on(netdev);

	else

		netif_carrier_off(netdev);

	phydev->adjust_link(netdev);

	if (phydev->mii_ts && phydev->mii_ts->link_state)

		phydev->mii_ts->link_state(phydev->mii_ts, phydev);

}



/**

 * phy_uses_state_machine - test whether consumer driver uses PAL state machine

 * @phydev: the target PHY device structure

 *

 * Ultimately, this aims to indirectly determine whether the PHY is attached

 * to a consumer which uses the state machine by calling phy_start() and

 * phy_stop().

 *

 * When the PHY driver consumer uses phylib, it must have previously called

 * phy_connect_direct() or one of its derivatives, so that phy_prepare_link()

 * has set up a hook for monitoring state changes.

 *

 * When the PHY driver is used by the MAC driver consumer through phylink (the

 * only other provider of a phy_link_change() method), using the PHY state

 * machine is not optional.

 *

 * Return: true if consumer calls phy_start() and phy_stop(), false otherwise.

 */

static bool phy_uses_state_machine(struct phy_device *phydev)

{

	if (phydev->phy_link_change == phy_link_change)

		return phydev->attached_dev && phydev->adjust_link;



	/* phydev->phy_link_change is implicitly phylink_phy_change() */

	return true;

}



static bool mdio_bus_phy_may_suspend(struct phy_device *phydev)

{

	struct device_driver *drv = phydev->mdio.dev.driver;
@@ -310,7 +350,7 @@ static __maybe_unused int mdio_bus_phy_suspend(struct device *dev) 
	 * may call phy routines that try to grab the same lock, and that may

	 * lead to a deadlock.

	 */

	if (phydev->attached_dev && phydev->adjust_link)

	if (phy_uses_state_machine(phydev))

		phy_stop_machine(phydev);



	if (!mdio_bus_phy_may_suspend(phydev))
@@ -364,7 +404,7 @@ static __maybe_unused int mdio_bus_phy_resume(struct device *dev) 
		}

	}



	if (phydev->attached_dev && phydev->adjust_link)

	if (phy_uses_state_machine(phydev))

		phy_start_machine(phydev);



	return 0;
@@ -1055,19 +1095,6 @@ struct phy_device *phy_find_first(struct mii_bus *bus) 
}

EXPORT_SYMBOL(phy_find_first);



static void phy_link_change(struct phy_device *phydev, bool up)

{

	struct net_device *netdev = phydev->attached_dev;



	if (up)

		netif_carrier_on(netdev);

	else

		netif_carrier_off(netdev);

	phydev->adjust_link(netdev);

	if (phydev->mii_ts && phydev->mii_ts->link_state)

		phydev->mii_ts->link_state(phydev->mii_ts, phydev);

}



/**

 * phy_prepare_link - prepares the PHY layer to monitor link status

 * @phydev: target phy_device struct