Commit 8fdb05de authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking fixes from Jakub Kicinski:
 "Including fixes from wireless and Netfilter.

  Previous releases - regressions:

   - eth: stmmac: fix stm32 (and potentially others) resume regression

   - nf_tables: fix inverted genmask check in nft_map_catchall_activate()

   - usb: r8152: fix resume reset deadlock

   - fix reporting RXH_XFRM_NO_CHANGE as input_xfrm for RSS contexts

  Previous releases - always broken:

   - sched: cls_u32: use skb_header_pointer_careful() to avoid OOB reads
     with malicious u32 rules

   - eth: ice: timestamping related fixes"

* tag 'net-6.19-rc9' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (38 commits)
  ipv6: Fix ECMP sibling count mismatch when clearing RTF_ADDRCONF
  netfilter: nf_tables: fix inverted genmask check in nft_map_catchall_activate()
  net: cpsw: Execute ndo_set_rx_mode callback in a work queue
  net: cpsw_new: Execute ndo_set_rx_mode callback in a work queue
  gve: Correct ethtool rx_dropped calculation
  gve: Fix stats report corruption on queue count change
  selftest: net: add a test-case for encap segmentation after GRO
  net: gro: fix outer network offset
  net: add proper RCU protection to /proc/net/ptype
  net: ethernet: adi: adin1110: Check return value of devm_gpiod_get_optional() in adin1110_check_spi()
  wifi: iwlwifi: mvm: pause TCM on fast resume
  wifi: iwlwifi: mld: cancel mlo_scan_start_wk
  net: spacemit: k1-emac: fix jumbo frame support
  net: enetc: Convert 16-bit register reads to 32-bit for ENETC v4
  net: enetc: Convert 16-bit register writes to 32-bit for ENETC v4
  net: enetc: Remove CBDR cacheability AXI settings for ENETC v4
  net: enetc: Remove SI/BDR cacheability AXI settings for ENETC v4
  tipc: use kfree_sensitive() for session key material
  net: stmmac: fix stm32 (and potentially others) resume regression
  net: rss: fix reporting RXH_XFRM_NO_CHANGE as input_xfrm for contexts
  ...
parents b2062460 bbf4a17a

MAINTAINERS

+12 −0
Original line number Diff line number Diff line
@@ -20978,6 +20978,18 @@ F: Documentation/devicetree/bindings/net/pse-pd/ 
F:	drivers/net/pse-pd/

F:	net/ethtool/pse-pd.c









PSP SECURITY PROTOCOL









M:	Daniel Zahka <daniel.zahka@gmail.com>









M:	Jakub Kicinski <kuba@kernel.org>









M:	Willem de Bruijn <willemdebruijn.kernel@gmail.com>









F:	Documentation/netlink/specs/psp.yaml









F:	Documentation/networking/psp.rst









F:	include/net/psp/









F:	include/net/psp.h









F:	include/uapi/linux/psp.h









F:	net/psp/









K:	struct\ psp(_assoc|_dev|hdr)\b

















PSTORE FILESYSTEM









M:	Kees Cook <kees@kernel.org>









R:	Tony Luck <tony.luck@intel.com>

























drivers/net/ethernet/adi/adin1110.c



+3
−0






























Original line number
Diff line number
Diff line







@@ -1089,6 +1089,9 @@ static int adin1110_check_spi(struct adin1110_priv *priv)

















	reset_gpio = devm_gpiod_get_optional(&priv->spidev->dev, "reset",









					     GPIOD_OUT_LOW);









	if (IS_ERR(reset_gpio))









		return dev_err_probe(&priv->spidev->dev, PTR_ERR(reset_gpio),









				     "failed to get reset gpio\n");









	if (reset_gpio) {









		/* MISO pin is used for internal configuration, can't have









		 * anyone else disturbing the SDO line.
































drivers/net/ethernet/cavium/liquidio/lio_main.c



+20
−19






























Original line number
Diff line number
Diff line







@@ -3505,6 +3505,23 @@ static int setup_nic_devices(struct octeon_device *octeon_dev)







		 */









		netdev->netdev_ops = &lionetdevops;



















		lio = GET_LIO(netdev);



















		memset(lio, 0, sizeof(struct lio));



















		lio->ifidx = ifidx_or_pfnum;



















		props = &octeon_dev->props[i];









		props->gmxport = resp->cfg_info.linfo.gmxport;









		props->netdev = netdev;



















		/* Point to the  properties for octeon device to which this









		 * interface belongs.









		 */









		lio->oct_dev = octeon_dev;









		lio->octprops = props;









		lio->netdev = netdev;



















		retval = netif_set_real_num_rx_queues(netdev, num_oqueues);









		if (retval) {









			dev_err(&octeon_dev->pci_dev->dev,








@@ -3521,16 +3538,6 @@ static int setup_nic_devices(struct octeon_device *octeon_dev)







			goto setup_nic_dev_free;









		}



















		lio = GET_LIO(netdev);



















		memset(lio, 0, sizeof(struct lio));



















		lio->ifidx = ifidx_or_pfnum;



















		props = &octeon_dev->props[i];









		props->gmxport = resp->cfg_info.linfo.gmxport;









		props->netdev = netdev;



















		lio->linfo.num_rxpciq = num_oqueues;









		lio->linfo.num_txpciq = num_iqueues;









		for (j = 0; j < num_oqueues; j++) {








@@ -3596,13 +3603,6 @@ static int setup_nic_devices(struct octeon_device *octeon_dev)







		netdev->min_mtu = LIO_MIN_MTU_SIZE;









		netdev->max_mtu = LIO_MAX_MTU_SIZE;



















		/* Point to the  properties for octeon device to which this









		 * interface belongs.









		 */









		lio->oct_dev = octeon_dev;









		lio->octprops = props;









		lio->netdev = netdev;



















		dev_dbg(&octeon_dev->pci_dev->dev,









			"if%d gmx: %d hw_addr: 0x%llx\n", i,









			lio->linfo.gmxport, CVM_CAST64(lio->linfo.hw_addr));








@@ -3750,6 +3750,7 @@ static int setup_nic_devices(struct octeon_device *octeon_dev)







	if (!devlink) {









		device_unlock(&octeon_dev->pci_dev->dev);









		dev_err(&octeon_dev->pci_dev->dev, "devlink alloc failed\n");









		i--;









		goto setup_nic_dev_free;









	}


















@@ -3765,11 +3766,11 @@ static int setup_nic_devices(struct octeon_device *octeon_dev)

















setup_nic_dev_free:



















	while (i--) {









	do {









		dev_err(&octeon_dev->pci_dev->dev,









			"NIC ifidx:%d Setup failed\n", i);









		liquidio_destroy_nic_device(octeon_dev, i);









	}









	} while (i--);



















setup_nic_dev_done:










































drivers/net/ethernet/cavium/liquidio/lio_vf_main.c



+2
−2






























Original line number
Diff line number
Diff line







@@ -2212,11 +2212,11 @@ static int setup_nic_devices(struct octeon_device *octeon_dev)

















setup_nic_dev_free:



















	while (i--) {









	do {









		dev_err(&octeon_dev->pci_dev->dev,









			"NIC ifidx:%d Setup failed\n", i);









		liquidio_destroy_nic_device(octeon_dev, i);









	}









	} while (i--);



















setup_nic_dev_done:










































drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c



+10
−0






























Original line number
Diff line number
Diff line







@@ -1531,6 +1531,10 @@ static irqreturn_t dpaa2_switch_irq0_handler_thread(int irq_num, void *arg)







	}



















	if_id = (status & 0xFFFF0000) >> 16;









	if (if_id >= ethsw->sw_attr.num_ifs) {









		dev_err(dev, "Invalid if_id %d in IRQ status\n", if_id);









		goto out;









	}









	port_priv = ethsw->ports[if_id];



















	if (status & DPSW_IRQ_EVENT_LINK_CHANGED)








@@ -3024,6 +3028,12 @@ static int dpaa2_switch_init(struct fsl_mc_device *sw_dev)







		goto err_close;









	}



















	if (!ethsw->sw_attr.num_ifs) {









		dev_err(dev, "DPSW device has no interfaces\n");









		err = -ENODEV;









		goto err_close;









	}



















	err = dpsw_get_api_version(ethsw->mc_io, 0,









				   &ethsw->major,









				   &ethsw->minor);