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

Xueming Li xuemingl at nvidia.com
Mon Nov 11 07:27:39 CET 2024


Hi,

FYI, your patch has been queued to stable release 23.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/30/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://git.dpdk.org/dpdk-stable/log/?h=23.11-staging

This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=be22d7ff5d84de7805ebe4e4db3993114ea16408

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From be22d7ff5d84de7805ebe4e4db3993114ea16408 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
Cc: Xueming Li <xuemingl at nvidia.com>

[ 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 c5a4dec693..f6875b0762 100644
--- a/drivers/net/e1000/em_ethdev.c
+++ b/drivers/net/e1000/em_ethdev.c
@@ -1136,6 +1136,9 @@ eth_em_link_update(struct rte_eth_dev *dev, int wait_to_complete)
 	struct rte_eth_link link;
 	int link_up, count;

+	if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+		return -1;
+
 	link_up = 0;
 	hw->mac.get_link_status = 1;

--
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-11-11 14:23:07.638718189 +0800
+++ 0053-net-e1000-fix-link-status-crash-in-secondary-process.patch	2024-11-11 14:23:05.122192840 +0800
@@ -1 +1 @@
-From 84506cfe07326fd6ddb158f3fa57bd678751561a Mon Sep 17 00:00:00 2001
+From be22d7ff5d84de7805ebe4e4db3993114ea16408 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 84506cfe07326fd6ddb158f3fa57bd678751561a ]
@@ -14 +16,0 @@
-Cc: stable at dpdk.org


More information about the stable mailing list