patch 'net/e1000: fix link status crash in secondary process' has been queued to stable release 21.11.9

Kevin Traynor ktraynor at redhat.com
Wed Nov 27 18:17:34 CET 2024


Hi,

FYI, your patch has been queued to stable release 21.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 12/02/24. 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/0fd960684c3b972884001672d3018a781cb45d07

Thanks.

Kevin

---
>From 0fd960684c3b972884001672d3018a781cb45d07 Mon Sep 17 00:00:00 2001
From: Jun Wang <junwang01 at cestc.cn>
Date: Fri, 12 Jul 2024 19:30:47 +0800
Subject: [PATCH] net/e1000: fix link status crash in secondary process

[ upstream commit 84506cfe07326fd6ddb158f3fa57bd678751561a ]

The code to update link status is not safe in secondary process.
If called from secondary it will crash, example from dumpcap:

    /dpdk/app/dpdk-dumpcap -i 0000:00:04.0
    File: /tmp/dpdk-dumpcap_0_0000:00:04.0_20240723020203.pcapng
    Segmentation fault (core dumped)

Fixes: 805803445a02 ("e1000: support EM devices (also known as e1000/e1000e)")

Signed-off-by: Jun Wang <junwang01 at cestc.cn>
Acked-by: Bruce Richardson <bruce.richardson at intel.com>
---
 drivers/net/e1000/em_ethdev.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/net/e1000/em_ethdev.c b/drivers/net/e1000/em_ethdev.c
index e983d5682a..619e1d4e2e 100644
--- a/drivers/net/e1000/em_ethdev.c
+++ b/drivers/net/e1000/em_ethdev.c
@@ -1122,4 +1122,7 @@ eth_em_link_update(struct rte_eth_dev *dev, int wait_to_complete)
 	int link_up, count;
 
+	if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+		return -1;
+
 	link_up = 0;
 	hw->mac.get_link_status = 1;
-- 
2.47.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-11-27 17:17:39.151369233 +0000
+++ 0027-net-e1000-fix-link-status-crash-in-secondary-process.patch	2024-11-27 17:17:38.182269150 +0000
@@ -1 +1 @@
-From 84506cfe07326fd6ddb158f3fa57bd678751561a Mon Sep 17 00:00:00 2001
+From 0fd960684c3b972884001672d3018a781cb45d07 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 84506cfe07326fd6ddb158f3fa57bd678751561a ]
+
@@ -14 +15,0 @@
-Cc: stable at dpdk.org
@@ -23 +24 @@
-index c5a4dec693..f6875b0762 100644
+index e983d5682a..619e1d4e2e 100644
@@ -26 +27 @@
-@@ -1137,4 +1137,7 @@ eth_em_link_update(struct rte_eth_dev *dev, int wait_to_complete)
+@@ -1122,4 +1122,7 @@ eth_em_link_update(struct rte_eth_dev *dev, int wait_to_complete)



More information about the stable mailing list