Handle SIGINT and SIGTERM in l2fwd.
Signed-off-by: Zhihong Wang <zhihong.wang at intel.com>
Acked-by: Michael Qiu <michael.qiu at intel.com>
---
examples/l2fwd/main.c | 123 +++++++++++++++++++++++++++++++++++++++++---------
1 file changed, 101 insertions(+), 22 deletions(-)
diff --git a/examples/l2fwd/main.c b/examples/l2fwd/main.c
index 720fd5a..ecd5d2b 100644
--- a/examples/l2fwd/main.c
+++ b/examples/l2fwd/main.c
@@ -44,6 +44,9 @@
#include <ctype.h>
#include <errno.h>
#include <getopt.h>
+#include <signal.h>
+#include <unistd.h>
+#include <stdbool.h>
#include <rte_common.h>
#include <rte_log.h>
@@ -69,6 +72,10 @@
#include <rte_mempool.h>
#include <rte_mbuf.h>
+static volatile bool port_started;
+static volatile bool force_quit;
+static volatile int signo_quit;
+
#define RTE_LOGTYPE_L2FWD RTE_LOGTYPE_USER1
#define NB_MBUF 8192
@@ -283,8 +290,7 @@ l2fwd_main_loop(void)
portid);
}
- while (1) {
-
+ while (!force_quit) {
cur_tsc = rte_rdtsc();
/*
@@ -491,8 +497,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));
@@ -534,18 +544,85 @@ check_all_ports_link_status(uint8_t port_num, uint32_t
port_mask)
}
}
+static uint8_t
+start_ports(void)
+{
+ unsigned portid, nb_ports, avail_ports;
+ int ret;
+
+ nb_ports = rte_eth_dev_count();
+ avail_ports = 0;
+ for (portid = 0; portid < nb_ports; portid++) {
+ if ((l2fwd_enabled_port_mask & (1 << portid)) == 0)
+ continue;
+ avail_ports++;
+ port_started = true;
+ printf("Starting port %d...", portid);
+ ret = rte_eth_dev_start(portid);
+ if (ret < 0)
+ rte_exit(EXIT_FAILURE,
+ "rte_eth_dev_start:err=%d, port=%u\n",
+ ret, (unsigned) portid);
+ rte_eth_promiscuous_enable(portid);
+ printf(" Done\n");
+ }
+
+ return avail_ports;
+}
+
+static void
+stop_ports(void)
+{
+ unsigned portid, nb_ports;
+
+ nb_ports = rte_eth_dev_count();
+ for (portid = 0; portid < nb_ports; portid++) {
+ if ((l2fwd_enabled_port_mask & (1 << portid)) == 0)
+ continue;
+ printf("Stopping port %d...", portid);
+ rte_eth_dev_stop(portid);
+ rte_eth_dev_close(portid);
+ printf(" Done\n");
+ }
+ port_started = false;
+}
+
+static void
+signal_handler(int signum)
+{
+ if (signum == SIGINT || signum == SIGTERM) {
+ printf("\nSignal %d received, preparing to exit...\n",
+ signum);
+ if (port_started) {
+ printf("Ports started already...\n");
+ signo_quit = signum;
+ force_quit = true;
+ } else {
+ printf("Ports not started yet...\n");
+ printf("Bye...\n");
+ /* exit with the expected status */
+ signal(signum, SIG_DFL);
+ kill(getpid(), signum);
+ }
+ }
+}
+
int
main(int argc, char **argv)
{
struct lcore_queue_conf *qconf;
struct rte_eth_dev_info dev_info;
int ret;
- uint8_t nb_ports;
- uint8_t nb_ports_available;
+ uint8_t nb_ports, avail_ports;
uint8_t portid, last_port;
unsigned lcore_id, rx_lcore_id;
unsigned nb_ports_in_mask = 0;
+ port_started = false;
+ force_quit = false;
+ signal(SIGINT, signal_handler);
+ signal(SIGTERM, signal_handler);
+
/* init EAL */
ret = rte_eal_init(argc, argv);
if (ret < 0)
@@ -627,14 +704,11 @@ main(int argc, char **argv)
printf("Lcore %u: RX port %u\n", rx_lcore_id, (unsigned)
portid);
}
- nb_ports_available = nb_ports;
-
/* Initialise each port */
for (portid = 0; portid < nb_ports; portid++) {
/* skip ports that are not enabled */
if ((l2fwd_enabled_port_mask & (1 << portid)) == 0) {
printf("Skipping disabled port %u\n", (unsigned)
portid);
- nb_ports_available--;
continue;
}
/* init port */
@@ -666,16 +740,6 @@ main(int argc, char **argv)
rte_exit(EXIT_FAILURE, "rte_eth_tx_queue_setup:err=%d,
port=%u\n",
ret, (unsigned) portid);
- /* Start device */
- ret = rte_eth_dev_start(portid);
- if (ret < 0)
- rte_exit(EXIT_FAILURE, "rte_eth_dev_start:err=%d,
port=%u\n",
- ret, (unsigned) portid);
-
- printf("done: \n");
-
- rte_eth_promiscuous_enable(portid);
-
printf("Port %u, MAC address:
%02X:%02X:%02X:%02X:%02X:%02X\n\n",
(unsigned) portid,
l2fwd_ports_eth_addr[portid].addr_bytes[0],
@@ -689,19 +753,34 @@ main(int argc, char **argv)
memset(&port_statistics, 0, sizeof(port_statistics));
}
- if (!nb_ports_available) {
+ /* start ports */
+ avail_ports = start_ports();
+
+ if (!avail_ports) {
rte_exit(EXIT_FAILURE,
- "All available ports are disabled. Please set
portmask.\n");
+ "All ports are disabled, please check portmask...\n");
}
check_all_ports_link_status(nb_ports, l2fwd_enabled_port_mask);
+ ret = 0;
/* launch per-lcore init on every lcore */
rte_eal_mp_remote_launch(l2fwd_launch_one_lcore, 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 */
+ stop_ports();
+ printf("Bye...\n");
+ /* exit with the expected status */
+ if (force_quit) {
+ signal(signo_quit, SIG_DFL);
+ kill(getpid(), signo_quit);
+ }
+
+ return ret;
}
--
2.5.0
