Commit 14ad5103 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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

Tony Nguyen says:

====================
Intel Wired LAN Driver Updates 2026-03-10 (ice, iavf, i40e, e1000e, e1000)

Nikolay Aleksandrov changes return code of RDMA related ice devlink get
parameters when irdma is not enabled to -EOPNOTSUPP as current return
of -ENODEV causes issues with devlink output.

Petr Oros resolves a couple of issues in iavf; freeing PTP resources
before reset and disable. Fixing contention issues with the netdev lock
between reset and some ethtool operations.

Alok Tiwari corrects an incorrect comparison of cloud filter values and
adjust some passed arguments to sizeof() for consistency on i40e.

Matt Vollrath removes an incorrect decrement for DMA error on e1000 and
e1000e drivers.

* '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue:
  e1000/e1000e: Fix leak in DMA error cleanup
  i40e: fix src IP mask checks and memcpy argument names in cloud filter
  iavf: fix incorrect reset handling in callbacks
  iavf: fix PTP use-after-free during reset
  drivers: net: ice: fix devlink parameters get without irdma
====================

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


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents e62a22f4 e94eaef1

drivers/net/ethernet/intel/e1000/e1000_main.c

+0 −2
Original line number Diff line number Diff line
@@ -2952,8 +2952,6 @@ static int e1000_tx_map(struct e1000_adapter *adapter, 
dma_error:

	dev_err(&pdev->dev, "TX DMA map failed\n");

	buffer_info->dma = 0;

	if (count)

		count--;



	while (count--) {

		if (i == 0)

drivers/net/ethernet/intel/e1000e/netdev.c

+0 −2
Original line number Diff line number Diff line
@@ -5652,8 +5652,6 @@ static int e1000_tx_map(struct e1000_ring *tx_ring, struct sk_buff *skb, 
dma_error:

	dev_err(&pdev->dev, "Tx DMA map failed\n");

	buffer_info->dma = 0;

	if (count)

		count--;



	while (count--) {

		if (i == 0)

drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c

+7 −7
Original line number Diff line number Diff line
@@ -3833,10 +3833,10 @@ static int i40e_vc_del_cloud_filter(struct i40e_vf *vf, u8 *msg) 
		cfilter.n_proto = ETH_P_IP;

		if (mask.dst_ip[0] & tcf.dst_ip[0])

			memcpy(&cfilter.ip.v4.dst_ip, tcf.dst_ip,

			       ARRAY_SIZE(tcf.dst_ip));

		else if (mask.src_ip[0] & tcf.dst_ip[0])

			       sizeof(cfilter.ip.v4.dst_ip));

		else if (mask.src_ip[0] & tcf.src_ip[0])

			memcpy(&cfilter.ip.v4.src_ip, tcf.src_ip,

			       ARRAY_SIZE(tcf.dst_ip));

			       sizeof(cfilter.ip.v4.src_ip));

		break;

	case VIRTCHNL_TCP_V6_FLOW:

		cfilter.n_proto = ETH_P_IPV6;
@@ -3891,7 +3891,7 @@ static int i40e_vc_del_cloud_filter(struct i40e_vf *vf, u8 *msg) 
		/* for ipv6, mask is set for all sixteen bytes (4 words) */

		if (cfilter.n_proto == ETH_P_IPV6 && mask.dst_ip[3])

			if (memcmp(&cfilter.ip.v6.dst_ip6, &cf->ip.v6.dst_ip6,

				   sizeof(cfilter.ip.v6.src_ip6)))

				   sizeof(cfilter.ip.v6.dst_ip6)))

				continue;

		if (mask.vlan_id)

			if (cfilter.vlan_id != cf->vlan_id)
@@ -3979,10 +3979,10 @@ static int i40e_vc_add_cloud_filter(struct i40e_vf *vf, u8 *msg) 
		cfilter->n_proto = ETH_P_IP;

		if (mask.dst_ip[0] & tcf.dst_ip[0])

			memcpy(&cfilter->ip.v4.dst_ip, tcf.dst_ip,

			       ARRAY_SIZE(tcf.dst_ip));

		else if (mask.src_ip[0] & tcf.dst_ip[0])

			       sizeof(cfilter->ip.v4.dst_ip));

		else if (mask.src_ip[0] & tcf.src_ip[0])

			memcpy(&cfilter->ip.v4.src_ip, tcf.src_ip,

			       ARRAY_SIZE(tcf.dst_ip));

			       sizeof(cfilter->ip.v4.src_ip));

		break;

	case VIRTCHNL_TCP_V6_FLOW:

		cfilter->n_proto = ETH_P_IPV6;

drivers/net/ethernet/intel/iavf/iavf.h

+1 −2
Original line number Diff line number Diff line
@@ -260,7 +260,6 @@ struct iavf_adapter { 
	struct work_struct adminq_task;

	struct work_struct finish_config;

	wait_queue_head_t down_waitqueue;

	wait_queue_head_t reset_waitqueue;

	wait_queue_head_t vc_waitqueue;

	struct iavf_q_vector *q_vectors;

	struct list_head vlan_filter_list;
@@ -626,5 +625,5 @@ void iavf_add_adv_rss_cfg(struct iavf_adapter *adapter); 
void iavf_del_adv_rss_cfg(struct iavf_adapter *adapter);

struct iavf_mac_filter *iavf_add_filter(struct iavf_adapter *adapter,

					const u8 *macaddr);

int iavf_wait_for_reset(struct iavf_adapter *adapter);

void iavf_reset_step(struct iavf_adapter *adapter);

#endif /* _IAVF_H_ */

drivers/net/ethernet/intel/iavf/iavf_ethtool.c

+6 −13
Original line number Diff line number Diff line
@@ -492,7 +492,6 @@ static int iavf_set_ringparam(struct net_device *netdev, 
{

	struct iavf_adapter *adapter = netdev_priv(netdev);

	u32 new_rx_count, new_tx_count;

	int ret = 0;



	if ((ring->rx_mini_pending) || (ring->rx_jumbo_pending))

		return -EINVAL;
@@ -537,13 +536,11 @@ static int iavf_set_ringparam(struct net_device *netdev, 
	}



	if (netif_running(netdev)) {

		iavf_schedule_reset(adapter, IAVF_FLAG_RESET_NEEDED);

		ret = iavf_wait_for_reset(adapter);

		if (ret)

			netdev_warn(netdev, "Changing ring parameters timeout or interrupted waiting for reset");

		adapter->flags |= IAVF_FLAG_RESET_NEEDED;

		iavf_reset_step(adapter);

	}



	return ret;

	return 0;

}



/**
@@ -1723,7 +1720,6 @@ static int iavf_set_channels(struct net_device *netdev, 
{

	struct iavf_adapter *adapter = netdev_priv(netdev);

	u32 num_req = ch->combined_count;

	int ret = 0;



	if ((adapter->vf_res->vf_cap_flags & VIRTCHNL_VF_OFFLOAD_ADQ) &&

	    adapter->num_tc) {
@@ -1745,13 +1741,10 @@ static int iavf_set_channels(struct net_device *netdev, 


	adapter->num_req_queues = num_req;

	adapter->flags |= IAVF_FLAG_REINIT_ITR_NEEDED;

	iavf_schedule_reset(adapter, IAVF_FLAG_RESET_NEEDED);

	adapter->flags |= IAVF_FLAG_RESET_NEEDED;

	iavf_reset_step(adapter);



	ret = iavf_wait_for_reset(adapter);

	if (ret)

		netdev_warn(netdev, "Changing channel count timeout or interrupted waiting for reset");



	return ret;

	return 0;

}



/**