Commit 2b73e754 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch '10GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue 

Tony Nguyen says:

====================
Intel Wired LAN Driver Updates 2026-01-27 (ixgbe, ice)

For ixgbe:
Kohei Enju adjusts the cleanup path on firmware error to resolve some
memory leaks and removes an instance of double init, free on ACI mutex.

For ice:
Aaron Ma adds NULL checks for q_vectors to avoid NULL pointer
dereference.

Jesse Brandeburg removes UDP checksum mismatch from being counted in Rx
errors.

* '10GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue:
  ice: stop counting UDP csum mismatch as rx_errors
  ice: Fix NULL pointer dereference in ice_vsi_set_napi_queues
  ixgbe: don't initialize aci lock in ixgbe_recovery_probe()
  ixgbe: fix memory leaks in the ixgbe_recovery_probe() path
====================

Link: https://patch.msgid.link/20260127223047.3979404-1-anthony.l.nguyen@intel.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents cc0cf10f 05faf2c0

drivers/net/ethernet/intel/ice/ice_lib.c

+6 −4
Original line number Diff line number Diff line
@@ -2783,10 +2783,12 @@ void ice_vsi_set_napi_queues(struct ice_vsi *vsi) 


	ASSERT_RTNL();

	ice_for_each_rxq(vsi, q_idx)

		if (vsi->rx_rings[q_idx] && vsi->rx_rings[q_idx]->q_vector)

			netif_queue_set_napi(netdev, q_idx, NETDEV_QUEUE_TYPE_RX,

					     &vsi->rx_rings[q_idx]->q_vector->napi);



	ice_for_each_txq(vsi, q_idx)

		if (vsi->tx_rings[q_idx] && vsi->tx_rings[q_idx]->q_vector)

			netif_queue_set_napi(netdev, q_idx, NETDEV_QUEUE_TYPE_TX,

					     &vsi->tx_rings[q_idx]->q_vector->napi);

	/* Also set the interrupt number for the NAPI */

drivers/net/ethernet/intel/ice/ice_main.c

+0 −1
Original line number Diff line number Diff line
@@ -6982,7 +6982,6 @@ void ice_update_vsi_stats(struct ice_vsi *vsi) 
		cur_ns->rx_errors = pf->stats.crc_errors +

				    pf->stats.illegal_bytes +

				    pf->stats.rx_undersize +

				    pf->hw_csum_rx_error +

				    pf->stats.rx_jabber +

				    pf->stats.rx_fragments +

				    pf->stats.rx_oversize;

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+10 −16
Original line number Diff line number Diff line
@@ -11468,20 +11468,17 @@ static void ixgbe_set_fw_version(struct ixgbe_adapter *adapter) 
 */

static int ixgbe_recovery_probe(struct ixgbe_adapter *adapter)

{

	struct net_device *netdev = adapter->netdev;

	struct pci_dev *pdev = adapter->pdev;

	struct ixgbe_hw *hw = &adapter->hw;

	bool disable_dev;

	int err = -EIO;



	if (hw->mac.type != ixgbe_mac_e610)

		goto clean_up_probe;

		return err;



	ixgbe_get_hw_control(adapter);

	mutex_init(&hw->aci.lock);

	err = ixgbe_get_flash_data(&adapter->hw);

	if (err)

		goto shutdown_aci;

		goto err_release_hw_control;



	timer_setup(&adapter->service_timer, ixgbe_service_timer, 0);

	INIT_WORK(&adapter->service_task, ixgbe_recovery_service_task);
@@ -11504,16 +11501,8 @@ static int ixgbe_recovery_probe(struct ixgbe_adapter *adapter) 
	devl_unlock(adapter->devlink);



	return 0;

shutdown_aci:

	mutex_destroy(&adapter->hw.aci.lock);

err_release_hw_control:

	ixgbe_release_hw_control(adapter);

clean_up_probe:

	disable_dev = !test_and_set_bit(__IXGBE_DISABLED, &adapter->state);

	free_netdev(netdev);

	devlink_free(adapter->devlink);

	pci_release_mem_regions(pdev);

	if (disable_dev)

		pci_disable_device(pdev);

	return err;

}
@@ -11655,8 +11644,13 @@ static int ixgbe_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	if (err)

		goto err_sw_init;



	if (ixgbe_check_fw_error(adapter))

		return ixgbe_recovery_probe(adapter);

	if (ixgbe_check_fw_error(adapter)) {

		err = ixgbe_recovery_probe(adapter);

		if (err)

			goto err_sw_init;



		return 0;

	}



	if (adapter->hw.mac.type == ixgbe_mac_e610) {

		err = ixgbe_get_caps(&adapter->hw);