patch 'examples/l3fwd-power: fix early shutdown' has been queued to stable release 19.11.11

christian.ehrhardt at canonical.com christian.ehrhardt at canonical.com
Tue Nov 30 17:35:49 CET 2021


Hi,

FYI, your patch has been queued to stable release 19.11.11

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before December 10th 2021. 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/cpaelzer/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/c98edab429c991ee3b2e22fff3c3a688e224d00d

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From c98edab429c991ee3b2e22fff3c3a688e224d00d Mon Sep 17 00:00:00 2001
From: Harneet Singh <harneet.singh at intel.com>
Date: Fri, 29 Oct 2021 14:05:56 +0000
Subject: [PATCH] examples/l3fwd-power: fix early shutdown

[ upstream commit 19781e7a038ac3fdae4d71904268daa6ee399001 ]

Currently, EAL init cannot be interrupted with SIGINT because the
signal handler is already overridden by the time EAL init happens.

Fix it by moving signal handler installation to after EAL
initialization, to allow SIGNIT to interrupt EAL initialization.

Fixes: d7937e2e3d12 ("power: initial import")
Fixes: 613ce6691c0d ("examples/l3fwd-power: implement proper shutdown")

Signed-off-by: Harneet Singh <harneet.singh at intel.com>
Acked-by: Anatoly Burakov <anatoly.burakov at intel.com>
---
 examples/l3fwd-power/main.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/l3fwd-power/main.c b/examples/l3fwd-power/main.c
index 70a47ed650..fdad035bc0 100644
--- a/examples/l3fwd-power/main.c
+++ b/examples/l3fwd-power/main.c
@@ -2216,9 +2216,6 @@ main(int argc, char **argv)
 	uint8_t num_telstats = RTE_DIM(telstats_strings);
 	const char *ptr_strings[num_telstats];
 
-	/* catch SIGINT and restore cpufreq governor to ondemand */
-	signal(SIGINT, signal_exit_now);
-
 	/* init EAL */
 	ret = rte_eal_init(argc, argv);
 	if (ret < 0)
@@ -2226,6 +2223,9 @@ main(int argc, char **argv)
 	argc -= ret;
 	argv += ret;
 
+	/* catch SIGINT and restore cpufreq governor to ondemand */
+	signal(SIGINT, signal_exit_now);
+
 	/* init RTE timer library to be used late */
 	rte_timer_subsystem_init();
 
-- 
2.34.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-11-30 16:50:14.286360444 +0100
+++ 0145-examples-l3fwd-power-fix-early-shutdown.patch	2021-11-30 16:50:06.026875261 +0100
@@ -1 +1 @@
-From 19781e7a038ac3fdae4d71904268daa6ee399001 Mon Sep 17 00:00:00 2001
+From c98edab429c991ee3b2e22fff3c3a688e224d00d Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 19781e7a038ac3fdae4d71904268daa6ee399001 ]
+
@@ -14 +15,0 @@
-Cc: stable at dpdk.org
@@ -23 +24 @@
-index 6988a0ed34..b8b3be2b8a 100644
+index 70a47ed650..fdad035bc0 100644
@@ -26,3 +27,3 @@
-@@ -2540,9 +2540,6 @@ main(int argc, char **argv)
- 	uint16_t portid;
- 	const char *ptr_strings[NUM_TELSTATS];
+@@ -2216,9 +2216,6 @@ main(int argc, char **argv)
+ 	uint8_t num_telstats = RTE_DIM(telstats_strings);
+ 	const char *ptr_strings[num_telstats];
@@ -36 +37 @@
-@@ -2550,6 +2547,9 @@ main(int argc, char **argv)
+@@ -2226,6 +2223,9 @@ main(int argc, char **argv)


More information about the stable mailing list