From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <stable-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id 676AE46364
for <public@inbox.dpdk.org>; Fri, 7 Mar 2025 13:48:29 +0100 (CET)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 606D8402C3;
Fri, 7 Mar 2025 13:48:29 +0100 (CET)
Received: from us-smtp-delivery-124.mimecast.com
(us-smtp-delivery-124.mimecast.com [170.10.133.124])
by mails.dpdk.org (Postfix) with ESMTP id 97D9640E42
for <stable@dpdk.org>; Fri, 7 Mar 2025 13:48:27 +0100 (CET)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
s=mimecast20190719; t=1741351707;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding:
in-reply-to:in-reply-to:references:references;
bh=G33qCbpkj5w8sbz4SScZUKKCwYv4EVseT15z1jMqe9c=;
b=bKflkqek2jtoj6sSBIdSjlrdMIPT9icC3do+d/04t6t4TT6kFTbg5sPdRxKtaGrE1Br96I
DHKiMl+lGkuMQNyG2YTLcsNeUbvA4W2LGlxj00nP13KYUKWWJZnXWG7DzA9C7hhCHM6zCI
minbNQEEsYWIQ/f6cWh+b65Wa2u/L5Q=
Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com
(ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by
relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,
cipher=TLS_AES_256_GCM_SHA384) id us-mta-684-jtZcFPmENdG6WZ4PKspEVQ-1; Fri,
07 Mar 2025 07:48:25 -0500
X-MC-Unique: jtZcFPmENdG6WZ4PKspEVQ-1
X-Mimecast-MFC-AGG-ID: jtZcFPmENdG6WZ4PKspEVQ_1741351704
Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com
(mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256)
(No client certificate requested)
by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS
id CAC8519560BC; Fri, 7 Mar 2025 12:48:24 +0000 (UTC)
Received: from rh.Home (unknown [10.45.226.25])
by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP
id 2BA141956095; Fri, 7 Mar 2025 12:48:22 +0000 (UTC)
From: Kevin Traynor <ktraynor@redhat.com>
To: Anatoly Burakov <anatoly.burakov@intel.com>
Cc: Bruce Richardson <bruce.richardson@intel.com>,
dpdk stable <stable@dpdk.org>
Subject: patch 'net/e1000: fix crashes in secondary processes' has been queued
to stable release 24.11.2
Date: Fri, 7 Mar 2025 12:46:56 +0000
Message-ID: <20250307124726.475001-23-ktraynor@redhat.com>
In-Reply-To: <20250307124726.475001-1-ktraynor@redhat.com>
References: <20250307124726.475001-1-ktraynor@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15
X-Mimecast-Spam-Score: 0
X-Mimecast-MFC-PROC-ID: zkP3xhNUXPSm4eATynXSmnZYFCuPURVtglb8BghLoLs_1741351704
X-Mimecast-Originator: redhat.com
Content-Transfer-Encoding: 8bit
content-type: text/plain; charset="US-ASCII"; x-default=true
X-BeenThere: stable@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: patches for DPDK stable branches <stable.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/stable>,
<mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/stable>,
<mailto:stable-request@dpdk.org?subject=subscribe>
Errors-To: stable-bounces@dpdk.org
Hi,
FYI, your patch has been queued to stable release 24.11.2
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 03/12/25. So please
shout if anyone has objections.
Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.
Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable
This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/7fbe0b6f02a4be2676864b22734c5127210498c5
Thanks.
Kevin
---
>From 7fbe0b6f02a4be2676864b22734c5127210498c5 Mon Sep 17 00:00:00 2001
From: Anatoly Burakov <anatoly.burakov@intel.com>
Date: Mon, 17 Feb 2025 13:54:05 +0000
Subject: [PATCH] net/e1000: fix crashes in secondary processes
[ upstream commit b0ef6e7a970bc745537c5b5140d838431f118c5e ]
Currently, the architecture of e1000 base driver is such that it uses
function pointers internally. These are not guaranteed to be valid in
secondary processes, which can lead to crashes. This patch prevents EM,
IGB and IGC ethdev drivers from calling into these functions from
secondary processes
Fixes: af75078fece3 ("first public release")
Fixes: 805803445a02 ("e1000: support EM devices (also known as e1000/e1000e)")
Fixes: 4f09bc55ac3d ("net/igc: implement device base operations")
Signed-off-by: Anatoly Burakov <anatoly.burakov@intel.com>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
---
doc/guides/nics/e1000em.rst | 5 +
doc/guides/nics/igb.rst | 13 +++
doc/guides/nics/igc.rst | 5 +
drivers/net/e1000/em_ethdev.c | 80 +++++++++++++++
drivers/net/e1000/igb_ethdev.c | 176 +++++++++++++++++++++++++++++++++
drivers/net/igc/igc_ethdev.c | 97 ++++++++++++++++++
6 files changed, 376 insertions(+)
diff --git a/doc/guides/nics/e1000em.rst b/doc/guides/nics/e1000em.rst
index 5e752a29e5..ed4f57e9c6 100644
--- a/doc/guides/nics/e1000em.rst
+++ b/doc/guides/nics/e1000em.rst
@@ -154,2 +154,7 @@ The following are known limitations:
#. Qemu e1000 does not support interrupt auto-clear, application should disable interrupt immediately when woken up.
+
+Secondary Process Support
+-------------------------
+
+Control plane operations are currently not supported in secondary processes.
diff --git a/doc/guides/nics/igb.rst b/doc/guides/nics/igb.rst
index e3a91c316b..3f7a4156ff 100644
--- a/doc/guides/nics/igb.rst
+++ b/doc/guides/nics/igb.rst
@@ -32,2 +32,15 @@ Features of the IGB PMD are:
* TCP segmentation offload
* Jumbo frames supported
+
+Secondary Process Support
+-------------------------
+
+IGB Physical Function Driver
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Control plane operations are currently not supported in secondary processes.
+
+IGB Virtual Function Driver
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Control plane operations are currently not supported in secondary processes.
diff --git a/doc/guides/nics/igc.rst b/doc/guides/nics/igc.rst
index c5af806b7b..07a1b12bcb 100644
--- a/doc/guides/nics/igc.rst
+++ b/doc/guides/nics/igc.rst
@@ -105,2 +105,7 @@ Add a rule to enable ipv4-udp RSS:
testpmd> flow create 0 ingress pattern end actions rss types ipv4-udp end / end
+
+Secondary Process Support
+-------------------------
+
+Control plane operations are currently not supported in secondary processes.
diff --git a/drivers/net/e1000/em_ethdev.c b/drivers/net/e1000/em_ethdev.c
index f6875b0762..e26930f1d6 100644
--- a/drivers/net/e1000/em_ethdev.c
+++ b/drivers/net/e1000/em_ethdev.c
@@ -544,4 +544,12 @@ eth_em_start(struct rte_eth_dev *dev)
PMD_INIT_FUNC_TRACE();
+ /*
+ * This function calls into the base driver, which in turn will use
+ * function pointers, which are not guaranteed to be valid in secondary
+ * processes, so avoid using this function in secondary processes.
+ */
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return -E_RTE_SECONDARY;
+
ret = eth_em_stop(dev);
if (ret != 0)
@@ -728,4 +736,12 @@ eth_em_stop(struct rte_eth_dev *dev)
struct rte_intr_handle *intr_handle = pci_dev->intr_handle;
+ /*
+ * This function calls into the base driver, which in turn will use
+ * function pointers, which are not guaranteed to be valid in secondary
+ * processes, so avoid using this function in secondary processes.
+ */
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return -E_RTE_SECONDARY;
+
dev->data->dev_started = 0;
@@ -1017,4 +1033,8 @@ eth_em_rx_queue_intr_enable(struct rte_eth_dev *dev, __rte_unused uint16_t queue
struct rte_intr_handle *intr_handle = pci_dev->intr_handle;
+ /* device interrupts are only subscribed to in primary processes */
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return -E_RTE_SECONDARY;
+
em_rxq_intr_enable(hw);
rte_intr_ack(intr_handle);
@@ -1028,4 +1048,8 @@ eth_em_rx_queue_intr_disable(struct rte_eth_dev *dev, __rte_unused uint16_t queu
struct e1000_hw *hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+ /* device interrupts are only subscribed to in primary processes */
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return -E_RTE_SECONDARY;
+
em_rxq_intr_disable(hw);
@@ -1655,4 +1679,12 @@ eth_em_led_on(struct rte_eth_dev *dev)
struct e1000_hw *hw;
+ /*
+ * This function calls into the base driver, which in turn will use
+ * function pointers, which are not guaranteed to be valid in secondary
+ * processes, so avoid using this function in secondary processes.
+ */
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return -E_RTE_SECONDARY;
+
hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
return e1000_led_on(hw) == E1000_SUCCESS ? 0 : -ENOTSUP;
@@ -1664,4 +1696,12 @@ eth_em_led_off(struct rte_eth_dev *dev)
struct e1000_hw *hw;
+ /*
+ * This function calls into the base driver, which in turn will use
+ * function pointers, which are not guaranteed to be valid in secondary
+ * processes, so avoid using this function in secondary processes.
+ */
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return -E_RTE_SECONDARY;
+
hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
return e1000_led_off(hw) == E1000_SUCCESS ? 0 : -ENOTSUP;
@@ -1725,4 +1765,12 @@ eth_em_flow_ctrl_set(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)
uint32_t rctl;
+ /*
+ * This function calls into the base driver, which in turn will use
+ * function pointers, which are not guaranteed to be valid in secondary
+ * processes, so avoid using this function in secondary processes.
+ */
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return -E_RTE_SECONDARY;
+
hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
if (fc_conf->autoneg != hw->mac.autoneg)
@@ -1776,4 +1824,12 @@ eth_em_rar_set(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr,
struct e1000_hw *hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+ /*
+ * This function calls into the base driver, which in turn will use
+ * function pointers, which are not guaranteed to be valid in secondary
+ * processes, so avoid using this function in secondary processes.
+ */
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return -E_RTE_SECONDARY;
+
return e1000_rar_set(hw, mac_addr->addr_bytes, index);
}
@@ -1785,4 +1841,12 @@ eth_em_rar_clear(struct rte_eth_dev *dev, uint32_t index)
struct e1000_hw *hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+ /*
+ * This function calls into the base driver, which in turn will use
+ * function pointers, which are not guaranteed to be valid in secondary
+ * processes, so avoid using this function in secondary processes.
+ */
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return;
+
memset(addr, 0, sizeof(addr));
@@ -1794,4 +1858,12 @@ eth_em_default_mac_addr_set(struct rte_eth_dev *dev,
struct rte_ether_addr *addr)
{
+ /*
+ * This function calls into the base driver, which in turn will use
+ * function pointers, which are not guaranteed to be valid in secondary
+ * processes, so avoid using this function in secondary processes.
+ */
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return -E_RTE_SECONDARY;
+
eth_em_rar_clear(dev, 0);
@@ -1838,4 +1910,12 @@ eth_em_set_mc_addr_list(struct rte_eth_dev *dev,
struct e1000_hw *hw;
+ /*
+ * This function calls into the base driver, which in turn will use
+ * function pointers, which are not guaranteed to be valid in secondary
+ * processes, so avoid using this function in secondary processes.
+ */
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return -E_RTE_SECONDARY;
+
hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
e1000_update_mc_addr_list(hw, (u8 *)mc_addr_set, nb_mc_addr);
diff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.c
index c695f44c4c..1d966d67eb 100644
--- a/drivers/net/e1000/igb_ethdev.c
+++ b/drivers/net/e1000/igb_ethdev.c
@@ -1248,4 +1248,12 @@ eth_igb_start(struct rte_eth_dev *dev)
PMD_INIT_FUNC_TRACE();
+ /*
+ * This function calls into the base driver, which in turn will use
+ * function pointers, which are not guaranteed to be valid in secondary
+ * processes, so avoid using this function in secondary processes.
+ */
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return -E_RTE_SECONDARY;
+
/* disable uio/vfio intr/eventfd mapping */
rte_intr_disable(intr_handle);
@@ -1471,4 +1479,12 @@ eth_igb_stop(struct rte_eth_dev *dev)
E1000_DEV_PRIVATE(dev->data->dev_private);
+ /*
+ * This function calls into the base driver, which in turn will use
+ * function pointers, which are not guaranteed to be valid in secondary
+ * processes, so avoid using this function in secondary processes.
+ */
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return -E_RTE_SECONDARY;
+
if (adapter->stopped)
return 0;
@@ -1524,4 +1540,12 @@ eth_igb_dev_set_link_up(struct rte_eth_dev *dev)
struct e1000_hw *hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+ /*
+ * This function calls into the base driver, which in turn will use
+ * function pointers, which are not guaranteed to be valid in secondary
+ * processes, so avoid using this function in secondary processes.
+ */
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return -E_RTE_SECONDARY;
+
if (hw->phy.media_type == e1000_media_type_copper)
e1000_power_up_phy(hw);
@@ -1537,4 +1561,12 @@ eth_igb_dev_set_link_down(struct rte_eth_dev *dev)
struct e1000_hw *hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+ /*
+ * This function calls into the base driver, which in turn will use
+ * function pointers, which are not guaranteed to be valid in secondary
+ * processes, so avoid using this function in secondary processes.
+ */
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return -E_RTE_SECONDARY;
+
if (hw->phy.media_type == e1000_media_type_copper)
e1000_power_down_phy(hw);
@@ -2158,4 +2190,12 @@ eth_igb_fw_version_get(struct rte_eth_dev *dev, char *fw_version,
int ret;
+ /*
+ * This function calls into the base driver, which in turn will use
+ * function pointers, which are not guaranteed to be valid in secondary
+ * processes, so avoid using this function in secondary processes.
+ */
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return -E_RTE_SECONDARY;
+
e1000_get_fw_version(hw, &fw);
@@ -2406,4 +2446,12 @@ eth_igb_link_update(struct rte_eth_dev *dev, int wait_to_complete)
int link_check, count;
+ /*
+ * This function calls into the base driver, which in turn will use
+ * function pointers, which are not guaranteed to be valid in secondary
+ * processes, so avoid using this function in secondary processes.
+ */
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return -E_RTE_SECONDARY;
+
link_check = 0;
hw->mac.get_link_status = 1;
@@ -3028,4 +3076,12 @@ eth_igb_led_on(struct rte_eth_dev *dev)
struct e1000_hw *hw;
+ /*
+ * This function calls into the base driver, which in turn will use
+ * function pointers, which are not guaranteed to be valid in secondary
+ * processes, so avoid using this function in secondary processes.
+ */
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return -E_RTE_SECONDARY;
+
hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
return e1000_led_on(hw) == E1000_SUCCESS ? 0 : -ENOTSUP;
@@ -3037,4 +3093,12 @@ eth_igb_led_off(struct rte_eth_dev *dev)
struct e1000_hw *hw;
+ /*
+ * This function calls into the base driver, which in turn will use
+ * function pointers, which are not guaranteed to be valid in secondary
+ * processes, so avoid using this function in secondary processes.
+ */
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return -E_RTE_SECONDARY;
+
hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
return e1000_led_off(hw) == E1000_SUCCESS ? 0 : -ENOTSUP;
@@ -3099,4 +3163,12 @@ eth_igb_flow_ctrl_set(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)
uint32_t ctrl;
+ /*
+ * This function calls into the base driver, which in turn will use
+ * function pointers, which are not guaranteed to be valid in secondary
+ * processes, so avoid using this function in secondary processes.
+ */
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return -E_RTE_SECONDARY;
+
hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
if (fc_conf->autoneg != hw->mac.autoneg)
@@ -3185,4 +3257,12 @@ eth_igb_rar_set(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr,
uint32_t rah;
+ /*
+ * This function calls into the base driver, which in turn will use
+ * function pointers, which are not guaranteed to be valid in secondary
+ * processes, so avoid using this function in secondary processes.
+ */
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return -E_RTE_SECONDARY;
+
e1000_rar_set(hw, mac_addr->addr_bytes, index);
rah = E1000_READ_REG(hw, E1000_RAH(index));
@@ -3198,4 +3278,12 @@ eth_igb_rar_clear(struct rte_eth_dev *dev, uint32_t index)
struct e1000_hw *hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+ /*
+ * This function calls into the base driver, which in turn will use
+ * function pointers, which are not guaranteed to be valid in secondary
+ * processes, so avoid using this function in secondary processes.
+ */
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return;
+
memset(addr, 0, sizeof(addr));
@@ -3207,4 +3295,12 @@ eth_igb_default_mac_addr_set(struct rte_eth_dev *dev,
struct rte_ether_addr *addr)
{
+ /*
+ * This function calls into the base driver, which in turn will use
+ * function pointers, which are not guaranteed to be valid in secondary
+ * processes, so avoid using this function in secondary processes.
+ */
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return -E_RTE_SECONDARY;
+
eth_igb_rar_clear(dev, 0);
eth_igb_rar_set(dev, (void *)addr, 0, 0);
@@ -3340,4 +3436,12 @@ igbvf_dev_start(struct rte_eth_dev *dev)
uint32_t intr_vector = 0;
+ /*
+ * This function calls into the base driver, which in turn will use
+ * function pointers, which are not guaranteed to be valid in secondary
+ * processes, so avoid using this function in secondary processes.
+ */
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return -E_RTE_SECONDARY;
+
PMD_INIT_FUNC_TRACE();
@@ -3396,4 +3500,12 @@ igbvf_dev_stop(struct rte_eth_dev *dev)
E1000_DEV_PRIVATE(dev->data->dev_private);
+ /*
+ * This function calls into the base driver, which in turn will use
+ * function pointers, which are not guaranteed to be valid in secondary
+ * processes, so avoid using this function in secondary processes.
+ */
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return -E_RTE_SECONDARY;
+
if (adapter->stopped)
return 0;
@@ -3468,4 +3580,12 @@ igbvf_promiscuous_enable(struct rte_eth_dev *dev)
struct e1000_hw *hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+ /*
+ * This function calls into the base driver, which in turn will use
+ * function pointers, which are not guaranteed to be valid in secondary
+ * processes, so avoid using this function in secondary processes.
+ */
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return -E_RTE_SECONDARY;
+
/* Set both unicast and multicast promisc */
e1000_promisc_set_vf(hw, e1000_promisc_enabled);
@@ -3479,4 +3599,12 @@ igbvf_promiscuous_disable(struct rte_eth_dev *dev)
struct e1000_hw *hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+ /*
+ * This function calls into the base driver, which in turn will use
+ * function pointers, which are not guaranteed to be valid in secondary
+ * processes, so avoid using this function in secondary processes.
+ */
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return -E_RTE_SECONDARY;
+
/* If in allmulticast mode leave multicast promisc */
if (dev->data->all_multicast == 1)
@@ -3493,4 +3621,12 @@ igbvf_allmulticast_enable(struct rte_eth_dev *dev)
struct e1000_hw *hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+ /*
+ * This function calls into the base driver, which in turn will use
+ * function pointers, which are not guaranteed to be valid in secondary
+ * processes, so avoid using this function in secondary processes.
+ */
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return -E_RTE_SECONDARY;
+
/* In promiscuous mode multicast promisc already set */
if (dev->data->promiscuous == 0)
@@ -3505,4 +3641,12 @@ igbvf_allmulticast_disable(struct rte_eth_dev *dev)
struct e1000_hw *hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+ /*
+ * This function calls into the base driver, which in turn will use
+ * function pointers, which are not guaranteed to be valid in secondary
+ * processes, so avoid using this function in secondary processes.
+ */
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return -E_RTE_SECONDARY;
+
/* In promiscuous mode leave multicast promisc enabled */
if (dev->data->promiscuous == 0)
@@ -4608,4 +4752,12 @@ eth_igb_set_mc_addr_list(struct rte_eth_dev *dev,
struct e1000_hw *hw;
+ /*
+ * This function calls into the base driver, which in turn will use
+ * function pointers, which are not guaranteed to be valid in secondary
+ * processes, so avoid using this function in secondary processes.
+ */
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return -E_RTE_SECONDARY;
+
hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
e1000_update_mc_addr_list(hw, (u8 *)mc_addr_set, nb_mc_addr);
@@ -5056,4 +5208,12 @@ eth_igb_get_eeprom(struct rte_eth_dev *dev,
int first, length;
+ /*
+ * This function calls into the base driver, which in turn will use
+ * function pointers, which are not guaranteed to be valid in secondary
+ * processes, so avoid using this function in secondary processes.
+ */
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return -E_RTE_SECONDARY;
+
first = in_eeprom->offset >> 1;
length = in_eeprom->length >> 1;
@@ -5080,4 +5240,12 @@ eth_igb_set_eeprom(struct rte_eth_dev *dev,
int first, length;
+ /*
+ * This function calls into the base driver, which in turn will use
+ * function pointers, which are not guaranteed to be valid in secondary
+ * processes, so avoid using this function in secondary processes.
+ */
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return -E_RTE_SECONDARY;
+
first = in_eeprom->offset >> 1;
length = in_eeprom->length >> 1;
@@ -5180,4 +5348,8 @@ eth_igb_rx_queue_intr_disable(struct rte_eth_dev *dev, uint16_t queue_id)
uint32_t vec = E1000_MISC_VEC_ID;
+ /* device interrupts are only subscribed to in primary processes */
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return -E_RTE_SECONDARY;
+
if (rte_intr_allow_others(intr_handle))
vec = E1000_RX_VEC_START;
@@ -5200,4 +5372,8 @@ eth_igb_rx_queue_intr_enable(struct rte_eth_dev *dev, uint16_t queue_id)
uint32_t vec = E1000_MISC_VEC_ID;
+ /* device interrupts are only subscribed to in primary processes */
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return -E_RTE_SECONDARY;
+
if (rte_intr_allow_others(intr_handle))
vec = E1000_RX_VEC_START;
diff --git a/drivers/net/igc/igc_ethdev.c b/drivers/net/igc/igc_ethdev.c
index 87d7f7caa0..bf9143ccd8 100644
--- a/drivers/net/igc/igc_ethdev.c
+++ b/drivers/net/igc/igc_ethdev.c
@@ -13,4 +13,5 @@
#include <rte_malloc.h>
#include <rte_alarm.h>
+#include <rte_errno.h>
#include "igc_logs.h"
@@ -394,4 +395,12 @@ eth_igc_set_link_up(struct rte_eth_dev *dev)
struct igc_hw *hw = IGC_DEV_PRIVATE_HW(dev);
+ /*
+ * This function calls into the base driver, which in turn will use
+ * function pointers, which are not guaranteed to be valid in secondary
+ * processes, so avoid using this function in secondary processes.
+ */
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return -E_RTE_SECONDARY;
+
if (hw->phy.media_type == igc_media_type_copper)
igc_power_up_phy(hw);
@@ -406,4 +415,12 @@ eth_igc_set_link_down(struct rte_eth_dev *dev)
struct igc_hw *hw = IGC_DEV_PRIVATE_HW(dev);
+ /*
+ * This function calls into the base driver, which in turn will use
+ * function pointers, which are not guaranteed to be valid in secondary
+ * processes, so avoid using this function in secondary processes.
+ */
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return -E_RTE_SECONDARY;
+
if (hw->phy.media_type == igc_media_type_copper)
igc_power_down_phy(hw);
@@ -479,4 +496,12 @@ eth_igc_link_update(struct rte_eth_dev *dev, int wait_to_complete)
int link_check, count;
+ /*
+ * This function calls into the base driver, which in turn will use
+ * function pointers, which are not guaranteed to be valid in secondary
+ * processes, so avoid using this function in secondary processes.
+ */
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return -E_RTE_SECONDARY;
+
link_check = 0;
hw->mac.get_link_status = 1;
@@ -656,4 +681,12 @@ eth_igc_stop(struct rte_eth_dev *dev)
struct rte_eth_link link;
+ /*
+ * This function calls into the base driver, which in turn will use
+ * function pointers, which are not guaranteed to be valid in secondary
+ * processes, so avoid using this function in secondary processes.
+ */
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return -E_RTE_SECONDARY;
+
dev->data->dev_started = 0;
adapter->stopped = 1;
@@ -967,4 +1000,12 @@ eth_igc_start(struct rte_eth_dev *dev)
PMD_INIT_FUNC_TRACE();
+ /*
+ * This function calls into the base driver, which in turn will use
+ * function pointers, which are not guaranteed to be valid in secondary
+ * processes, so avoid using this function in secondary processes.
+ */
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return -E_RTE_SECONDARY;
+
/* disable all MSI-X interrupts */
IGC_WRITE_REG(hw, IGC_EIMC, 0x1f);
@@ -1550,4 +1591,12 @@ eth_igc_fw_version_get(struct rte_eth_dev *dev, char *fw_version,
int ret;
+ /*
+ * This function calls into the base driver, which in turn will use
+ * function pointers, which are not guaranteed to be valid in secondary
+ * processes, so avoid using this function in secondary processes.
+ */
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return -E_RTE_SECONDARY;
+
igc_get_fw_version(hw, &fw);
@@ -1640,4 +1689,12 @@ eth_igc_led_on(struct rte_eth_dev *dev)
struct igc_hw *hw = IGC_DEV_PRIVATE_HW(dev);
+ /*
+ * This function calls into the base driver, which in turn will use
+ * function pointers, which are not guaranteed to be valid in secondary
+ * processes, so avoid using this function in secondary processes.
+ */
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return -E_RTE_SECONDARY;
+
return igc_led_on(hw) == IGC_SUCCESS ? 0 : -ENOTSUP;
}
@@ -1648,4 +1705,12 @@ eth_igc_led_off(struct rte_eth_dev *dev)
struct igc_hw *hw = IGC_DEV_PRIVATE_HW(dev);
+ /*
+ * This function calls into the base driver, which in turn will use
+ * function pointers, which are not guaranteed to be valid in secondary
+ * processes, so avoid using this function in secondary processes.
+ */
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return -E_RTE_SECONDARY;
+
return igc_led_off(hw) == IGC_SUCCESS ? 0 : -ENOTSUP;
}
@@ -2191,4 +2256,8 @@ eth_igc_rx_queue_intr_disable(struct rte_eth_dev *dev, uint16_t queue_id)
uint32_t vec = IGC_MISC_VEC_ID;
+ /* device interrupts are only subscribed to in primary processes */
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return -E_RTE_SECONDARY;
+
if (rte_intr_allow_others(intr_handle))
vec = IGC_RX_VEC_START;
@@ -2210,4 +2279,8 @@ eth_igc_rx_queue_intr_enable(struct rte_eth_dev *dev, uint16_t queue_id)
uint32_t vec = IGC_MISC_VEC_ID;
+ /* device interrupts are only subscribed to in primary processes */
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return -E_RTE_SECONDARY;
+
if (rte_intr_allow_others(intr_handle))
vec = IGC_RX_VEC_START;
@@ -2273,4 +2346,12 @@ eth_igc_flow_ctrl_set(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)
int err;
+ /*
+ * This function calls into the base driver, which in turn will use
+ * function pointers, which are not guaranteed to be valid in secondary
+ * processes, so avoid using this function in secondary processes.
+ */
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return -E_RTE_SECONDARY;
+
if (fc_conf->autoneg != hw->mac.autoneg)
return -ENOTSUP;
@@ -2774,4 +2855,12 @@ eth_igc_timesync_read_rx_timestamp(__rte_unused struct rte_eth_dev *dev,
uint64_t rx_timestamp;
+ /*
+ * This function calls into the base driver, which in turn will use
+ * function pointers, which are not guaranteed to be valid in secondary
+ * processes, so avoid using this function in secondary processes.
+ */
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return -E_RTE_SECONDARY;
+
/* Get current link speed. */
eth_igc_link_update(dev, 1);
@@ -2810,4 +2899,12 @@ eth_igc_timesync_read_tx_timestamp(struct rte_eth_dev *dev,
int adjust = 0;
+ /*
+ * This function calls into the base driver, which in turn will use
+ * function pointers, which are not guaranteed to be valid in secondary
+ * processes, so avoid using this function in secondary processes.
+ */
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return -E_RTE_SECONDARY;
+
val = IGC_READ_REG(hw, IGC_TSYNCTXCTL);
if (!(val & IGC_TSYNCTXCTL_VALID))
--
2.48.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2025-03-07 11:02:57.736806885 +0000
+++ 0023-net-e1000-fix-crashes-in-secondary-processes.patch 2025-03-07 11:02:56.869335695 +0000
@@ -1 +1 @@
-From b0ef6e7a970bc745537c5b5140d838431f118c5e Mon Sep 17 00:00:00 2001
+From 7fbe0b6f02a4be2676864b22734c5127210498c5 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit b0ef6e7a970bc745537c5b5140d838431f118c5e ]
+
@@ -15 +16,0 @@
-Cc: stable@dpdk.org
@@ -20,6 +21,6 @@
- doc/guides/nics/e1000em.rst | 5 +
- doc/guides/nics/igb.rst | 13 ++
- doc/guides/nics/igc.rst | 5 +
- drivers/net/intel/e1000/em_ethdev.c | 80 ++++++++++++
- drivers/net/intel/e1000/igb_ethdev.c | 176 +++++++++++++++++++++++++++
- drivers/net/intel/e1000/igc_ethdev.c | 97 +++++++++++++++
+ doc/guides/nics/e1000em.rst | 5 +
+ doc/guides/nics/igb.rst | 13 +++
+ doc/guides/nics/igc.rst | 5 +
+ drivers/net/e1000/em_ethdev.c | 80 +++++++++++++++
+ drivers/net/e1000/igb_ethdev.c | 176 +++++++++++++++++++++++++++++++++
+ drivers/net/igc/igc_ethdev.c | 97 ++++++++++++++++++
@@ -61 +62 @@
-index c267431c5f..9790b58102 100644
+index c5af806b7b..07a1b12bcb 100644
@@ -72,5 +73,5 @@
-diff --git a/drivers/net/intel/e1000/em_ethdev.c b/drivers/net/intel/e1000/em_ethdev.c
-index bd3f7e44df..39dddf3384 100644
---- a/drivers/net/intel/e1000/em_ethdev.c
-+++ b/drivers/net/intel/e1000/em_ethdev.c
-@@ -574,4 +574,12 @@ eth_em_start(struct rte_eth_dev *dev)
+diff --git a/drivers/net/e1000/em_ethdev.c b/drivers/net/e1000/em_ethdev.c
+index f6875b0762..e26930f1d6 100644
+--- a/drivers/net/e1000/em_ethdev.c
++++ b/drivers/net/e1000/em_ethdev.c
+@@ -544,4 +544,12 @@ eth_em_start(struct rte_eth_dev *dev)
@@ -89 +90 @@
-@@ -758,4 +766,12 @@ eth_em_stop(struct rte_eth_dev *dev)
+@@ -728,4 +736,12 @@ eth_em_stop(struct rte_eth_dev *dev)
@@ -102 +103 @@
-@@ -1049,4 +1065,8 @@ eth_em_rx_queue_intr_enable(struct rte_eth_dev *dev, __rte_unused uint16_t queue
+@@ -1017,4 +1033,8 @@ eth_em_rx_queue_intr_enable(struct rte_eth_dev *dev, __rte_unused uint16_t queue
@@ -111 +112 @@
-@@ -1060,4 +1080,8 @@ eth_em_rx_queue_intr_disable(struct rte_eth_dev *dev, __rte_unused uint16_t queu
+@@ -1028,4 +1048,8 @@ eth_em_rx_queue_intr_disable(struct rte_eth_dev *dev, __rte_unused uint16_t queu
@@ -120 +121 @@
-@@ -1689,4 +1713,12 @@ eth_em_led_on(struct rte_eth_dev *dev)
+@@ -1655,4 +1679,12 @@ eth_em_led_on(struct rte_eth_dev *dev)
@@ -133 +134 @@
-@@ -1698,4 +1730,12 @@ eth_em_led_off(struct rte_eth_dev *dev)
+@@ -1664,4 +1696,12 @@ eth_em_led_off(struct rte_eth_dev *dev)
@@ -146 +147 @@
-@@ -1759,4 +1799,12 @@ eth_em_flow_ctrl_set(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)
+@@ -1725,4 +1765,12 @@ eth_em_flow_ctrl_set(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)
@@ -159 +160 @@
-@@ -1810,4 +1858,12 @@ eth_em_rar_set(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr,
+@@ -1776,4 +1824,12 @@ eth_em_rar_set(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr,
@@ -172 +173 @@
-@@ -1819,4 +1875,12 @@ eth_em_rar_clear(struct rte_eth_dev *dev, uint32_t index)
+@@ -1785,4 +1841,12 @@ eth_em_rar_clear(struct rte_eth_dev *dev, uint32_t index)
@@ -185 +186 @@
-@@ -1828,4 +1892,12 @@ eth_em_default_mac_addr_set(struct rte_eth_dev *dev,
+@@ -1794,4 +1858,12 @@ eth_em_default_mac_addr_set(struct rte_eth_dev *dev,
@@ -198 +199 @@
-@@ -1872,4 +1944,12 @@ eth_em_set_mc_addr_list(struct rte_eth_dev *dev,
+@@ -1838,4 +1910,12 @@ eth_em_set_mc_addr_list(struct rte_eth_dev *dev,
@@ -211,5 +212,5 @@
-diff --git a/drivers/net/intel/e1000/igb_ethdev.c b/drivers/net/intel/e1000/igb_ethdev.c
-index be3123572f..cbd2f15f5f 100644
---- a/drivers/net/intel/e1000/igb_ethdev.c
-+++ b/drivers/net/intel/e1000/igb_ethdev.c
-@@ -1249,4 +1249,12 @@ eth_igb_start(struct rte_eth_dev *dev)
+diff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.c
+index c695f44c4c..1d966d67eb 100644
+--- a/drivers/net/e1000/igb_ethdev.c
++++ b/drivers/net/e1000/igb_ethdev.c
+@@ -1248,4 +1248,12 @@ eth_igb_start(struct rte_eth_dev *dev)
@@ -228 +229 @@
-@@ -1472,4 +1480,12 @@ eth_igb_stop(struct rte_eth_dev *dev)
+@@ -1471,4 +1479,12 @@ eth_igb_stop(struct rte_eth_dev *dev)
@@ -241 +242 @@
-@@ -1525,4 +1541,12 @@ eth_igb_dev_set_link_up(struct rte_eth_dev *dev)
+@@ -1524,4 +1540,12 @@ eth_igb_dev_set_link_up(struct rte_eth_dev *dev)
@@ -254 +255 @@
-@@ -1538,4 +1562,12 @@ eth_igb_dev_set_link_down(struct rte_eth_dev *dev)
+@@ -1537,4 +1561,12 @@ eth_igb_dev_set_link_down(struct rte_eth_dev *dev)
@@ -267 +268 @@
-@@ -2159,4 +2191,12 @@ eth_igb_fw_version_get(struct rte_eth_dev *dev, char *fw_version,
+@@ -2158,4 +2190,12 @@ eth_igb_fw_version_get(struct rte_eth_dev *dev, char *fw_version,
@@ -280 +281 @@
-@@ -2407,4 +2447,12 @@ eth_igb_link_update(struct rte_eth_dev *dev, int wait_to_complete)
+@@ -2406,4 +2446,12 @@ eth_igb_link_update(struct rte_eth_dev *dev, int wait_to_complete)
@@ -293 +294 @@
-@@ -3029,4 +3077,12 @@ eth_igb_led_on(struct rte_eth_dev *dev)
+@@ -3028,4 +3076,12 @@ eth_igb_led_on(struct rte_eth_dev *dev)
@@ -306 +307 @@
-@@ -3038,4 +3094,12 @@ eth_igb_led_off(struct rte_eth_dev *dev)
+@@ -3037,4 +3093,12 @@ eth_igb_led_off(struct rte_eth_dev *dev)
@@ -319 +320 @@
-@@ -3100,4 +3164,12 @@ eth_igb_flow_ctrl_set(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)
+@@ -3099,4 +3163,12 @@ eth_igb_flow_ctrl_set(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)
@@ -332 +333 @@
-@@ -3186,4 +3258,12 @@ eth_igb_rar_set(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr,
+@@ -3185,4 +3257,12 @@ eth_igb_rar_set(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr,
@@ -345 +346 @@
-@@ -3199,4 +3279,12 @@ eth_igb_rar_clear(struct rte_eth_dev *dev, uint32_t index)
+@@ -3198,4 +3278,12 @@ eth_igb_rar_clear(struct rte_eth_dev *dev, uint32_t index)
@@ -358 +359 @@
-@@ -3208,4 +3296,12 @@ eth_igb_default_mac_addr_set(struct rte_eth_dev *dev,
+@@ -3207,4 +3295,12 @@ eth_igb_default_mac_addr_set(struct rte_eth_dev *dev,
@@ -371 +372 @@
-@@ -3341,4 +3437,12 @@ igbvf_dev_start(struct rte_eth_dev *dev)
+@@ -3340,4 +3436,12 @@ igbvf_dev_start(struct rte_eth_dev *dev)
@@ -384 +385 @@
-@@ -3397,4 +3501,12 @@ igbvf_dev_stop(struct rte_eth_dev *dev)
+@@ -3396,4 +3500,12 @@ igbvf_dev_stop(struct rte_eth_dev *dev)
@@ -397 +398 @@
-@@ -3469,4 +3581,12 @@ igbvf_promiscuous_enable(struct rte_eth_dev *dev)
+@@ -3468,4 +3580,12 @@ igbvf_promiscuous_enable(struct rte_eth_dev *dev)
@@ -410 +411 @@
-@@ -3480,4 +3600,12 @@ igbvf_promiscuous_disable(struct rte_eth_dev *dev)
+@@ -3479,4 +3599,12 @@ igbvf_promiscuous_disable(struct rte_eth_dev *dev)
@@ -423 +424 @@
-@@ -3494,4 +3622,12 @@ igbvf_allmulticast_enable(struct rte_eth_dev *dev)
+@@ -3493,4 +3621,12 @@ igbvf_allmulticast_enable(struct rte_eth_dev *dev)
@@ -436 +437 @@
-@@ -3506,4 +3642,12 @@ igbvf_allmulticast_disable(struct rte_eth_dev *dev)
+@@ -3505,4 +3641,12 @@ igbvf_allmulticast_disable(struct rte_eth_dev *dev)
@@ -449 +450 @@
-@@ -4609,4 +4753,12 @@ eth_igb_set_mc_addr_list(struct rte_eth_dev *dev,
+@@ -4608,4 +4752,12 @@ eth_igb_set_mc_addr_list(struct rte_eth_dev *dev,
@@ -462 +463 @@
-@@ -5057,4 +5209,12 @@ eth_igb_get_eeprom(struct rte_eth_dev *dev,
+@@ -5056,4 +5208,12 @@ eth_igb_get_eeprom(struct rte_eth_dev *dev,
@@ -475 +476 @@
-@@ -5081,4 +5241,12 @@ eth_igb_set_eeprom(struct rte_eth_dev *dev,
+@@ -5080,4 +5240,12 @@ eth_igb_set_eeprom(struct rte_eth_dev *dev,
@@ -488 +489 @@
-@@ -5181,4 +5349,8 @@ eth_igb_rx_queue_intr_disable(struct rte_eth_dev *dev, uint16_t queue_id)
+@@ -5180,4 +5348,8 @@ eth_igb_rx_queue_intr_disable(struct rte_eth_dev *dev, uint16_t queue_id)
@@ -497 +498 @@
-@@ -5201,4 +5373,8 @@ eth_igb_rx_queue_intr_enable(struct rte_eth_dev *dev, uint16_t queue_id)
+@@ -5200,4 +5372,8 @@ eth_igb_rx_queue_intr_enable(struct rte_eth_dev *dev, uint16_t queue_id)
@@ -506,4 +507,4 @@
-diff --git a/drivers/net/intel/e1000/igc_ethdev.c b/drivers/net/intel/e1000/igc_ethdev.c
-index 136f5af2a0..e712cfcf7c 100644
---- a/drivers/net/intel/e1000/igc_ethdev.c
-+++ b/drivers/net/intel/e1000/igc_ethdev.c
+diff --git a/drivers/net/igc/igc_ethdev.c b/drivers/net/igc/igc_ethdev.c
+index 87d7f7caa0..bf9143ccd8 100644
+--- a/drivers/net/igc/igc_ethdev.c
++++ b/drivers/net/igc/igc_ethdev.c
@@ -515,3 +516,3 @@
- #include "e1000_logs.h"
-@@ -398,4 +399,12 @@ eth_igc_set_link_up(struct rte_eth_dev *dev)
- struct e1000_hw *hw = IGC_DEV_PRIVATE_HW(dev);
+ #include "igc_logs.h"
+@@ -394,4 +395,12 @@ eth_igc_set_link_up(struct rte_eth_dev *dev)
+ struct igc_hw *hw = IGC_DEV_PRIVATE_HW(dev);
@@ -527,4 +528,4 @@
- if (hw->phy.media_type == e1000_media_type_copper)
- e1000_power_up_phy(hw);
-@@ -410,4 +419,12 @@ eth_igc_set_link_down(struct rte_eth_dev *dev)
- struct e1000_hw *hw = IGC_DEV_PRIVATE_HW(dev);
+ if (hw->phy.media_type == igc_media_type_copper)
+ igc_power_up_phy(hw);
+@@ -406,4 +415,12 @@ eth_igc_set_link_down(struct rte_eth_dev *dev)
+ struct igc_hw *hw = IGC_DEV_PRIVATE_HW(dev);
@@ -540,3 +541,3 @@
- if (hw->phy.media_type == e1000_media_type_copper)
- e1000_power_down_phy(hw);
-@@ -483,4 +500,12 @@ eth_igc_link_update(struct rte_eth_dev *dev, int wait_to_complete)
+ if (hw->phy.media_type == igc_media_type_copper)
+ igc_power_down_phy(hw);
+@@ -479,4 +496,12 @@ eth_igc_link_update(struct rte_eth_dev *dev, int wait_to_complete)
@@ -555 +556 @@
-@@ -660,4 +685,12 @@ eth_igc_stop(struct rte_eth_dev *dev)
+@@ -656,4 +681,12 @@ eth_igc_stop(struct rte_eth_dev *dev)
@@ -568 +569 @@
-@@ -971,4 +1004,12 @@ eth_igc_start(struct rte_eth_dev *dev)
+@@ -967,4 +1000,12 @@ eth_igc_start(struct rte_eth_dev *dev)
@@ -580,2 +581,2 @@
- E1000_WRITE_REG(hw, E1000_EIMC, 0x1f);
-@@ -1554,4 +1595,12 @@ eth_igc_fw_version_get(struct rte_eth_dev *dev, char *fw_version,
+ IGC_WRITE_REG(hw, IGC_EIMC, 0x1f);
+@@ -1550,4 +1591,12 @@ eth_igc_fw_version_get(struct rte_eth_dev *dev, char *fw_version,
@@ -592 +593 @@
- e1000_get_fw_version(hw, &fw);
+ igc_get_fw_version(hw, &fw);
@@ -594,2 +595,2 @@
-@@ -1644,4 +1693,12 @@ eth_igc_led_on(struct rte_eth_dev *dev)
- struct e1000_hw *hw = IGC_DEV_PRIVATE_HW(dev);
+@@ -1640,4 +1689,12 @@ eth_igc_led_on(struct rte_eth_dev *dev)
+ struct igc_hw *hw = IGC_DEV_PRIVATE_HW(dev);
@@ -605 +606 @@
- return e1000_led_on(hw) == E1000_SUCCESS ? 0 : -ENOTSUP;
+ return igc_led_on(hw) == IGC_SUCCESS ? 0 : -ENOTSUP;
@@ -607,2 +608,2 @@
-@@ -1652,4 +1709,12 @@ eth_igc_led_off(struct rte_eth_dev *dev)
- struct e1000_hw *hw = IGC_DEV_PRIVATE_HW(dev);
+@@ -1648,4 +1705,12 @@ eth_igc_led_off(struct rte_eth_dev *dev)
+ struct igc_hw *hw = IGC_DEV_PRIVATE_HW(dev);
@@ -618 +619 @@
- return e1000_led_off(hw) == E1000_SUCCESS ? 0 : -ENOTSUP;
+ return igc_led_off(hw) == IGC_SUCCESS ? 0 : -ENOTSUP;
@@ -620 +621 @@
-@@ -2195,4 +2260,8 @@ eth_igc_rx_queue_intr_disable(struct rte_eth_dev *dev, uint16_t queue_id)
+@@ -2191,4 +2256,8 @@ eth_igc_rx_queue_intr_disable(struct rte_eth_dev *dev, uint16_t queue_id)
@@ -629 +630 @@
-@@ -2214,4 +2283,8 @@ eth_igc_rx_queue_intr_enable(struct rte_eth_dev *dev, uint16_t queue_id)
+@@ -2210,4 +2279,8 @@ eth_igc_rx_queue_intr_enable(struct rte_eth_dev *dev, uint16_t queue_id)
@@ -638 +639 @@
-@@ -2277,4 +2350,12 @@ eth_igc_flow_ctrl_set(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)
+@@ -2273,4 +2346,12 @@ eth_igc_flow_ctrl_set(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)
@@ -651 +652 @@
-@@ -2778,4 +2859,12 @@ eth_igc_timesync_read_rx_timestamp(__rte_unused struct rte_eth_dev *dev,
+@@ -2774,4 +2855,12 @@ eth_igc_timesync_read_rx_timestamp(__rte_unused struct rte_eth_dev *dev,
@@ -664 +665 @@
-@@ -2814,4 +2903,12 @@ eth_igc_timesync_read_tx_timestamp(struct rte_eth_dev *dev,
+@@ -2810,4 +2899,12 @@ eth_igc_timesync_read_tx_timestamp(struct rte_eth_dev *dev,
@@ -675,2 +676,2 @@
- val = E1000_READ_REG(hw, E1000_TSYNCTXCTL);
- if (!(val & E1000_TSYNCTXCTL_VALID))
+ val = IGC_READ_REG(hw, IGC_TSYNCTXCTL);
+ if (!(val & IGC_TSYNCTXCTL_VALID))