patch 'eal: cleanup alarm and hotplug before memory detach' has been queued to stable release 22.11.2
Xueming Li
xuemingl at nvidia.com
Mon Feb 27 07:59:51 CET 2023
Hi,
FYI, your patch has been queued to stable release 22.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/01/23. 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=22.11-staging
This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=0772cc1d89c8e74cd4ee09650676d1a23467039e
Thanks.
Xueming Li <xuemingl at nvidia.com>
---
>From 0772cc1d89c8e74cd4ee09650676d1a23467039e Mon Sep 17 00:00:00 2001
From: Fengnan Chang <changfengnan at bytedance.com>
Date: Wed, 21 Dec 2022 11:41:52 +0800
Subject: [PATCH] eal: cleanup alarm and hotplug before memory detach
Cc: Xueming Li <xuemingl at nvidia.com>
[ upstream commit cc75968228576250159918ec1531eecc606bc423 ]
Alarm and multiprocess hotplug still need access hugepage memory,
if alarm event processed after memory detach, it may cause SEGV.
So cleanup alarm and multiprocess hotplug before memory detach.
Fixes: 90b13ab8d4f7 ("alarm: remove direct access to interrupt handle")
Fixes: a0cc7be20dd1 ("mem: cleanup multiprocess resources")
Signed-off-by: Fengnan Chang <changfengnan at bytedance.com>
---
.mailmap | 1 +
lib/eal/freebsd/eal.c | 2 +-
lib/eal/linux/eal.c | 4 ++--
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/.mailmap b/.mailmap
index e68cc9a6b4..736f62c206 100644
--- a/.mailmap
+++ b/.mailmap
@@ -372,6 +372,7 @@ Farah Smith <farah.smith at broadcom.com>
Fei Chen <chenwei.0515 at bytedance.com>
Feifei Wang <feifei.wang2 at arm.com> <feifei.wang at arm.com>
Fei Qin <fei.qin at corigine.com>
+Fengnan Chang <changfengnan at bytedance.com>
Fengtian Guo <fengtian.guo at 6wind.com>
Ferdinand Thiessen <rpm at fthiessen.de>
Ferruh Yigit <ferruh.yigit at amd.com> <ferruh.yigit at intel.com> <ferruh.yigit at xilinx.com> <ferruhy at gmail.com>
diff --git a/lib/eal/freebsd/eal.c b/lib/eal/freebsd/eal.c
index 607684c1a3..390e4257ff 100644
--- a/lib/eal/freebsd/eal.c
+++ b/lib/eal/freebsd/eal.c
@@ -896,9 +896,9 @@ rte_eal_cleanup(void)
eal_bus_cleanup();
rte_trace_save();
eal_trace_fini();
+ rte_eal_alarm_cleanup();
/* after this point, any DPDK pointers will become dangling */
rte_eal_memory_detach();
- rte_eal_alarm_cleanup();
eal_cleanup_config(internal_conf);
return 0;
}
diff --git a/lib/eal/linux/eal.c b/lib/eal/linux/eal.c
index 8c118d0d9f..c76f026023 100644
--- a/lib/eal/linux/eal.c
+++ b/lib/eal/linux/eal.c
@@ -1372,11 +1372,11 @@ rte_eal_cleanup(void)
eal_bus_cleanup();
rte_trace_save();
eal_trace_fini();
+ eal_mp_dev_hotplug_cleanup();
+ rte_eal_alarm_cleanup();
/* after this point, any DPDK pointers will become dangling */
rte_eal_memory_detach();
- eal_mp_dev_hotplug_cleanup();
rte_eal_malloc_heap_cleanup();
- rte_eal_alarm_cleanup();
eal_cleanup_config(internal_conf);
rte_eal_log_cleanup();
return 0;
--
2.25.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2023-02-27 14:08:43.588132300 +0800
+++ 0084-eal-cleanup-alarm-and-hotplug-before-memory-detach.patch 2023-02-27 14:08:40.809237000 +0800
@@ -1 +1 @@
-From cc75968228576250159918ec1531eecc606bc423 Mon Sep 17 00:00:00 2001
+From 0772cc1d89c8e74cd4ee09650676d1a23467039e Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit cc75968228576250159918ec1531eecc606bc423 ]
@@ -12 +14,0 @@
-Cc: stable at dpdk.org
@@ -22 +24 @@
-index 5015494210..9501257c17 100644
+index e68cc9a6b4..736f62c206 100644
@@ -34 +36 @@
-index 930340128d..7db4239c51 100644
+index 607684c1a3..390e4257ff 100644
@@ -49 +51 @@
-index d4c3507d16..fabafbc39b 100644
+index 8c118d0d9f..c76f026023 100644
@@ -52 +54 @@
-@@ -1374,11 +1374,11 @@ rte_eal_cleanup(void)
+@@ -1372,11 +1372,11 @@ rte_eal_cleanup(void)
More information about the stable
mailing list