147 lines
3.6 KiB
Diff
147 lines
3.6 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 d3a274ce9dee28118b8647e0db72ef0f4b6a6323 Mon Sep 17 00:00:00 2001
|
|
From: Zhihong Wang <zhihong.wang@intel.com>
|
|
Date: Wed, 30 Dec 2015 16:59:49 -0500
|
|
Subject: [PATCH] app/testpmd: handle SIGINT and SIGTERM
|
|
|
|
Handle SIGINT and SIGTERM in testpmd.
|
|
|
|
Signed-off-by: Zhihong Wang <zhihong.wang@intel.com>
|
|
Acked-by: Michael Qiu <michael.qiu@intel.com>
|
|
---
|
|
app/test-pmd/cmdline.c | 20 +++++++++++++-------
|
|
app/test-pmd/testpmd.c | 39 +++++++++++++++++++++++++++++++++------
|
|
app/test-pmd/testpmd.h | 1 +
|
|
3 files changed, 47 insertions(+), 13 deletions(-)
|
|
|
|
Index: dpdk/app/test-pmd/cmdline.c
|
|
===================================================================
|
|
--- dpdk.orig/app/test-pmd/cmdline.c
|
|
+++ dpdk/app/test-pmd/cmdline.c
|
|
@@ -90,6 +90,8 @@
|
|
|
|
#include "testpmd.h"
|
|
|
|
+static struct cmdline *testpmd_cl;
|
|
+
|
|
static void cmd_reconfig_device_queue(portid_t id, uint8_t dev, uint8_t queue);
|
|
|
|
#ifdef RTE_NIC_BYPASS
|
|
@@ -9778,17 +9780,21 @@ cmdline_parse_ctx_t main_ctx[] = {
|
|
void
|
|
prompt(void)
|
|
{
|
|
- struct cmdline *cl;
|
|
-
|
|
/* initialize non-constant commands */
|
|
cmd_set_fwd_mode_init();
|
|
|
|
- cl = cmdline_stdin_new(main_ctx, "testpmd> ");
|
|
- if (cl == NULL) {
|
|
+ testpmd_cl = cmdline_stdin_new(main_ctx, "testpmd> ");
|
|
+ if (testpmd_cl == NULL)
|
|
return;
|
|
- }
|
|
- cmdline_interact(cl);
|
|
- cmdline_stdin_exit(cl);
|
|
+ cmdline_interact(testpmd_cl);
|
|
+ cmdline_stdin_exit(testpmd_cl);
|
|
+}
|
|
+
|
|
+void
|
|
+prompt_exit(void)
|
|
+{
|
|
+ if (testpmd_cl != NULL)
|
|
+ cmdline_quit(testpmd_cl);
|
|
}
|
|
|
|
static void
|
|
Index: dpdk/app/test-pmd/testpmd.c
|
|
===================================================================
|
|
--- dpdk.orig/app/test-pmd/testpmd.c
|
|
+++ dpdk/app/test-pmd/testpmd.c
|
|
@@ -1569,13 +1569,16 @@ pmd_test_exit(void)
|
|
if (test_done == 0)
|
|
stop_packet_forwarding();
|
|
|
|
- FOREACH_PORT(pt_id, ports) {
|
|
- printf("Stopping port %d...", pt_id);
|
|
- fflush(stdout);
|
|
- rte_eth_dev_close(pt_id);
|
|
- printf("done\n");
|
|
+ if (ports != NULL) {
|
|
+ no_link_check = 1;
|
|
+ FOREACH_PORT(pt_id, ports) {
|
|
+ printf("\nShutting down port %d...\n", pt_id);
|
|
+ fflush(stdout);
|
|
+ stop_port(pt_id);
|
|
+ close_port(pt_id);
|
|
+ }
|
|
}
|
|
- printf("bye...\n");
|
|
+ printf("\nBye...\n");
|
|
}
|
|
|
|
typedef void (*cmd_func_t)(void);
|
|
@@ -1983,12 +1986,35 @@ init_port(void)
|
|
ports[pid].enabled = 1;
|
|
}
|
|
|
|
+static void
|
|
+force_quit(void)
|
|
+{
|
|
+ pmd_test_exit();
|
|
+ prompt_exit();
|
|
+}
|
|
+
|
|
+static void
|
|
+signal_handler(int signum)
|
|
+{
|
|
+ if (signum == SIGINT || signum == SIGTERM) {
|
|
+ printf("\nSignal %d received, preparing to exit...\n",
|
|
+ signum);
|
|
+ force_quit();
|
|
+ /* exit with the expected status */
|
|
+ signal(signum, SIG_DFL);
|
|
+ kill(getpid(), signum);
|
|
+ }
|
|
+}
|
|
+
|
|
int
|
|
main(int argc, char** argv)
|
|
{
|
|
int diag;
|
|
uint8_t port_id;
|
|
|
|
+ signal(SIGINT, signal_handler);
|
|
+ signal(SIGTERM, signal_handler);
|
|
+
|
|
diag = rte_eal_init(argc, argv);
|
|
if (diag < 0)
|
|
rte_panic("Cannot init EAL\n");
|
|
@@ -2040,6 +2066,7 @@ main(int argc, char** argv)
|
|
start_packet_forwarding(0);
|
|
printf("Press enter to exit\n");
|
|
rc = read(0, &c, 1);
|
|
+ pmd_test_exit();
|
|
if (rc < 0)
|
|
return 1;
|
|
}
|
|
Index: dpdk/app/test-pmd/testpmd.h
|
|
===================================================================
|
|
--- dpdk.orig/app/test-pmd/testpmd.h
|
|
+++ dpdk/app/test-pmd/testpmd.h
|
|
@@ -462,6 +462,7 @@ unsigned int parse_item_list(char* str,
|
|
unsigned int *parsed_items, int check_unique_values);
|
|
void launch_args_parse(int argc, char** argv);
|
|
void prompt(void);
|
|
+void prompt_exit(void);
|
|
void nic_stats_display(portid_t port_id);
|
|
void nic_stats_clear(portid_t port_id);
|
|
void nic_xstats_display(portid_t port_id);
|