From patchwork Tue Dec 29 23:27:23 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhihong Wang X-Patchwork-Id: 9684 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id ED2078E98; Wed, 30 Dec 2015 07:30:51 +0100 (CET) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id D77EF8E80 for ; Wed, 30 Dec 2015 07:30:48 +0100 (CET) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga102.fm.intel.com with ESMTP; 29 Dec 2015 22:30:48 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,499,1444719600"; d="scan'208";a="871632696" Received: from unknown (HELO dpdk5.sh.intel.com) ([10.239.129.244]) by fmsmga001.fm.intel.com with ESMTP; 29 Dec 2015 22:30:47 -0800 From: Zhihong Wang To: dev@dpdk.org Date: Tue, 29 Dec 2015 18:27:23 -0500 Message-Id: <1451431644-98362-3-git-send-email-zhihong.wang@intel.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1451431644-98362-1-git-send-email-zhihong.wang@intel.com> References: <1451011032-83106-1-git-send-email-zhihong.wang@intel.com> <1451431644-98362-1-git-send-email-zhihong.wang@intel.com> Subject: [dpdk-dev] [PATCH v4 2/3] examples/l2fwd: Handle SIGINT and SIGTERM in l2fwd X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Handle SIGINT and SIGTERM in l2fwd. Signed-off-by: Zhihong Wang Acked-by: Michael Qiu --- examples/l2fwd/main.c | 161 +++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 139 insertions(+), 22 deletions(-) diff --git a/examples/l2fwd/main.c b/examples/l2fwd/main.c index 720fd5a..9a6f80b 100644 --- a/examples/l2fwd/main.c +++ b/examples/l2fwd/main.c @@ -44,6 +44,9 @@ #include #include #include +#include +#include +#include #include #include @@ -69,6 +72,16 @@ #include #include +#define PORT_IDLE 0 +#define PORT_INIT 1 +#define PORT_WORK 2 +#define PORT_STOP 3 +#define PORT_QUIT 4 + +static volatile uint32_t port_status; +static volatile bool force_quit; +static volatile int signo_quit; + #define RTE_LOGTYPE_L2FWD RTE_LOGTYPE_USER1 #define NB_MBUF 8192 @@ -283,8 +296,7 @@ l2fwd_main_loop(void) portid); } - while (1) { - + while (!force_quit) { cur_tsc = rte_rdtsc(); /* @@ -491,8 +503,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 +550,110 @@ 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; + + if (rte_atomic32_cmpset(&port_status, + PORT_IDLE, PORT_INIT) == 0) { + printf("Ports not idle...\n"); + return 0; + } + + 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++; + 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"); + } + + if (avail_ports) { + if (rte_atomic32_cmpset(&port_status, + PORT_INIT, PORT_WORK) == 0) + printf("Set port state failed!\n"); + } else { + if (rte_atomic32_cmpset(&port_status, + PORT_INIT, PORT_IDLE) == 0) + printf("Set port state failed!\n"); + } + + return avail_ports; +} + +static void +stop_ports(void) +{ + unsigned portid, nb_ports; + + if (rte_atomic32_cmpset(&port_status, + PORT_WORK, PORT_STOP) == 0) { + printf("Ports not started...\n"); + return; + } + + 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"); + } + + if (rte_atomic32_cmpset(&port_status, + PORT_STOP, PORT_IDLE) == 0) + printf("Set port state failed!\n"); +} + +static void +signal_handler(int signum) +{ + if (signum == SIGINT || signum == SIGTERM) { + printf("\nSignal %d received, preparing to exit...\n", + signum); + if (rte_atomic32_cmpset(&port_status, + PORT_IDLE, PORT_QUIT) == 0) { + 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_status = PORT_IDLE; + force_quit = false; + signal(SIGINT, signal_handler); + signal(SIGTERM, signal_handler); + /* init EAL */ ret = rte_eal_init(argc, argv); if (ret < 0) @@ -627,14 +735,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 +771,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 +784,41 @@ 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) { + /* exit with the expected status */ + if (force_quit) { + printf("All ports disabled...\n"); + printf("Bye...\n"); + signal(signo_quit, SIG_DFL); + kill(getpid(), signo_quit); + } 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; }