135 lines
3.3 KiB
Diff
135 lines
3.3 KiB
Diff
Description: backport of dpdk 16.04-rc1 fix for LP: #1559981
|
|
|
|
Forwarded: n/a (already upstream)
|
|
Author: Christian Ehrhardt <christian.ehrhardt@canonical.com>
|
|
Last-Update: 2016-03-20
|
|
|
|
From 308df2bfba3d238fc1d2d16cc10c84681803b408 Mon Sep 17 00:00:00 2001
|
|
From: Zhihong Wang <zhihong.wang@intel.com>
|
|
Date: Wed, 30 Dec 2015 16:59:51 -0500
|
|
Subject: [PATCH] examples/l3fwd: handle SIGINT and SIGTERM
|
|
|
|
Handle SIGINT and SIGTERM in l3fwd.
|
|
|
|
Signed-off-by: Zhihong Wang <zhihong.wang@intel.com>
|
|
Acked-by: Michael Qiu <michael.qiu@intel.com>
|
|
Acked-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
|
|
---
|
|
examples/l3fwd/main.c | 46 ++++++++++++++++++++++++++++++++++++++++++----
|
|
1 file changed, 42 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/examples/l3fwd/main.c b/examples/l3fwd/main.c
|
|
index 5b0c2dd..21a5782 100644
|
|
--- a/examples/l3fwd/main.c
|
|
+++ b/examples/l3fwd/main.c
|
|
@@ -41,6 +41,8 @@
|
|
#include <stdarg.h>
|
|
#include <errno.h>
|
|
#include <getopt.h>
|
|
+#include <signal.h>
|
|
+#include <stdbool.h>
|
|
|
|
#include <rte_common.h>
|
|
#include <rte_vect.h>
|
|
@@ -75,6 +77,8 @@
|
|
#include <cmdline_parse.h>
|
|
#include <cmdline_parse_etheraddr.h>
|
|
|
|
+static volatile bool force_quit;
|
|
+
|
|
#define APP_LOOKUP_EXACT_MATCH 0
|
|
#define APP_LOOKUP_LPM 1
|
|
#define DO_RFC_1812_CHECKS
|
|
@@ -1553,7 +1557,7 @@ main_loop(__attribute__((unused)) void *dummy)
|
|
portid, queueid);
|
|
}
|
|
|
|
- while (1) {
|
|
+ while (!force_quit) {
|
|
|
|
cur_tsc = rte_rdtsc();
|
|
|
|
@@ -1781,6 +1785,8 @@ main_loop(__attribute__((unused)) void *dummy)
|
|
|
|
}
|
|
}
|
|
+
|
|
+ return 0;
|
|
}
|
|
|
|
static int
|
|
@@ -2516,8 +2522,12 @@ check_all_ports_link_status(uint8_t port_num, uint32_t port_mask)
|
|
printf("\nChecking link status");
|
|
fflush(stdout);
|
|
for (count = 0; count <= MAX_CHECK_TIME; count++) {
|
|
+ if (force_quit)
|
|
+ return;
|
|
all_ports_up = 1;
|
|
for (portid = 0; portid < port_num; portid++) {
|
|
+ if (force_quit)
|
|
+ return;
|
|
if ((port_mask & (1 << portid)) == 0)
|
|
continue;
|
|
memset(&link, 0, sizeof(link));
|
|
@@ -2559,6 +2569,16 @@ check_all_ports_link_status(uint8_t port_num, uint32_t port_mask)
|
|
}
|
|
}
|
|
|
|
+static void
|
|
+signal_handler(int signum)
|
|
+{
|
|
+ if (signum == SIGINT || signum == SIGTERM) {
|
|
+ printf("\n\nSignal %d received, preparing to exit...\n",
|
|
+ signum);
|
|
+ force_quit = true;
|
|
+ }
|
|
+}
|
|
+
|
|
int
|
|
main(int argc, char **argv)
|
|
{
|
|
@@ -2579,6 +2599,10 @@ main(int argc, char **argv)
|
|
argc -= ret;
|
|
argv += ret;
|
|
|
|
+ force_quit = false;
|
|
+ signal(SIGINT, signal_handler);
|
|
+ signal(SIGTERM, signal_handler);
|
|
+
|
|
/* pre-init dst MACs for all ports to 02:00:00:00:00:xx */
|
|
for (portid = 0; portid < RTE_MAX_ETHPORTS; portid++) {
|
|
dest_eth_addr[portid] = ETHER_LOCAL_ADMIN_ADDR + ((uint64_t)portid << 40);
|
|
@@ -2733,12 +2757,26 @@ main(int argc, char **argv)
|
|
|
|
check_all_ports_link_status((uint8_t)nb_ports, enabled_port_mask);
|
|
|
|
+ ret = 0;
|
|
/* launch per-lcore init on every lcore */
|
|
rte_eal_mp_remote_launch(main_loop, NULL, CALL_MASTER);
|
|
RTE_LCORE_FOREACH_SLAVE(lcore_id) {
|
|
- if (rte_eal_wait_lcore(lcore_id) < 0)
|
|
- return -1;
|
|
+ if (rte_eal_wait_lcore(lcore_id) < 0) {
|
|
+ ret = -1;
|
|
+ break;
|
|
+ }
|
|
}
|
|
|
|
- return 0;
|
|
+ /* stop ports */
|
|
+ for (portid = 0; portid < nb_ports; portid++) {
|
|
+ if ((enabled_port_mask & (1 << portid)) == 0)
|
|
+ continue;
|
|
+ printf("Closing port %d...", portid);
|
|
+ rte_eth_dev_stop(portid);
|
|
+ rte_eth_dev_close(portid);
|
|
+ printf(" Done\n");
|
|
+ }
|
|
+ printf("Bye...\n");
|
|
+
|
|
+ return ret;
|
|
}
|
|
--
|
|
2.7.3
|
|
|