From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by dpdk.org (Postfix) with ESMTP id 961CA593A for ; Wed, 30 Dec 2015 14:38:01 +0100 (CET) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP; 30 Dec 2015 05:38:00 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,500,1444719600"; d="scan'208";a="850714524" Received: from irsmsx106.ger.corp.intel.com ([163.33.3.31]) by orsmga001.jf.intel.com with ESMTP; 30 Dec 2015 05:37:59 -0800 Received: from irsmsx105.ger.corp.intel.com ([169.254.7.104]) by IRSMSX106.ger.corp.intel.com ([169.254.8.88]) with mapi id 14.03.0248.002; Wed, 30 Dec 2015 13:37:58 +0000 From: "Ananyev, Konstantin" To: "Wang, Zhihong" , "dev@dpdk.org" Thread-Topic: [PATCH v4 3/3] examples/l3fwd: Handle SIGINT and SIGTERM in l3fwd Thread-Index: AQHRQsuyWiIqPSba+UmKzIXCbs2U/J7jZWCA Date: Wed, 30 Dec 2015 13:37:58 +0000 Message-ID: <2601191342CEEE43887BDE71AB97725836ADF284@irsmsx105.ger.corp.intel.com> References: <1451011032-83106-1-git-send-email-zhihong.wang@intel.com> <1451431644-98362-1-git-send-email-zhihong.wang@intel.com> <1451431644-98362-4-git-send-email-zhihong.wang@intel.com> In-Reply-To: <1451431644-98362-4-git-send-email-zhihong.wang@intel.com> Accept-Language: en-IE, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiYTA2ZDg0M2ItOWI4ZC00NWIxLWFmYWQtZGM1ODE3ZTYzYTI3IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX0lDIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE1LjQuMTAuMTkiLCJUcnVzdGVkTGFiZWxIYXNoIjoib25RdEJZOEVRa3ZrNDA1V0l3YlhHN3RUK1pnNDJmTWtGaHNCNFdHVmtxMD0ifQ== x-ctpclassification: CTP_IC x-originating-ip: [163.33.239.181] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dpdk-dev] [PATCH v4 3/3] examples/l3fwd: Handle SIGINT and SIGTERM in l3fwd 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: , X-List-Received-Date: Wed, 30 Dec 2015 13:38:02 -0000 > -----Original Message----- > From: Wang, Zhihong > Sent: Tuesday, December 29, 2015 11:27 PM > To: dev@dpdk.org > Cc: Ananyev, Konstantin; stephen@networkplumber.org; Qiu, Michael; Wang, = Zhihong > Subject: [PATCH v4 3/3] examples/l3fwd: Handle SIGINT and SIGTERM in l3fw= d >=20 > Handle SIGINT and SIGTERM in l3fwd. >=20 > Signed-off-by: Zhihong Wang > Acked-by: Michael Qiu > --- > examples/l3fwd/main.c | 167 +++++++++++++++++++++++++++++++++++++++++++-= ------ > 1 file changed, 145 insertions(+), 22 deletions(-) >=20 > diff --git a/examples/l3fwd/main.c b/examples/l3fwd/main.c > index 5b0c2dd..f73d2a4 100644 > --- a/examples/l3fwd/main.c > +++ b/examples/l3fwd/main.c > @@ -41,6 +41,9 @@ > #include > #include > #include > +#include > +#include > +#include >=20 > #include > #include > @@ -75,6 +78,16 @@ > #include > #include >=20 > +#define PORT_IDLE 0 > +#define PORT_INIT 1 > +#define PORT_WORK 2 > +#define PORT_STOP 3 > +#define PORT_QUIT 4 Seems ok, but over-complicated. I think all you need is just IDLE, INIT, QUIT. Konstantin > + > +static volatile uint32_t port_status; > +static volatile bool force_quit; > +static volatile int signo_quit; > + > #define APP_LOOKUP_EXACT_MATCH 0 > #define APP_LOOKUP_LPM 1 > #define DO_RFC_1812_CHECKS > @@ -1553,8 +1566,7 @@ main_loop(__attribute__((unused)) void *dummy) > portid, queueid); > } >=20 > - while (1) { > - > + while (!force_quit) { > cur_tsc =3D rte_rdtsc(); >=20 > /* > @@ -2516,8 +2528,12 @@ check_all_ports_link_status(uint8_t port_num, uint= 32_t port_mask) > printf("\nChecking link status"); > fflush(stdout); > for (count =3D 0; count <=3D MAX_CHECK_TIME; count++) { > + if (force_quit) > + return; > all_ports_up =3D 1; > for (portid =3D 0; portid < port_num; portid++) { > + if (force_quit) > + return; > if ((port_mask & (1 << portid)) =3D=3D 0) > continue; > memset(&link, 0, sizeof(link)); > @@ -2559,6 +2575,101 @@ check_all_ports_link_status(uint8_t port_num, uin= t32_t port_mask) > } > } >=20 > +static uint8_t > +start_ports(void) > +{ > + unsigned portid, nb_ports, avail_ports; > + int ret; > + > + if (rte_atomic32_cmpset(&port_status, > + PORT_IDLE, PORT_INIT) =3D=3D 0) { > + printf("Ports not idle...\n"); > + return 0; > + } > + > + nb_ports =3D rte_eth_dev_count(); > + avail_ports =3D 0; > + for (portid =3D 0; portid < nb_ports; portid++) { > + if ((enabled_port_mask & (1 << portid)) =3D=3D 0) > + continue; > + avail_ports++; > + printf("Starting port %d...", portid); > + ret =3D rte_eth_dev_start(portid); > + if (ret < 0) > + rte_exit(EXIT_FAILURE, > + "rte_eth_dev_start: err=3D%d, port=3D%d\n", > + ret, portid); > + /* > + * If enabled, put device in promiscuous mode. > + * This allows IO forwarding mode to forward packets > + * to itself through 2 cross-connected ports of the > + * target machine. > + */ > + if (promiscuous_on) > + rte_eth_promiscuous_enable(portid); > + printf(" Done\n"); > + } > + > + if (avail_ports) { > + if (rte_atomic32_cmpset(&port_status, > + PORT_INIT, PORT_WORK) =3D=3D 0) > + printf("Set port state failed!\n"); > + } else { > + if (rte_atomic32_cmpset(&port_status, > + PORT_INIT, PORT_IDLE) =3D=3D 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) =3D=3D 0) { > + printf("Ports not started...\n"); > + return; > + } > + > + nb_ports =3D rte_eth_dev_count(); > + for (portid =3D 0; portid < nb_ports; portid++) { > + if ((enabled_port_mask & (1 << portid)) =3D=3D 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) =3D=3D 0) > + printf("Set port state failed!\n"); > +} > + > +static void > +signal_handler(int signum) > +{ > + if (signum =3D=3D SIGINT || signum =3D=3D SIGTERM) { > + printf("\nSignal %d received, preparing to exit...\n", > + signum); > + if (rte_atomic32_cmpset(&port_status, > + PORT_IDLE, PORT_QUIT) =3D=3D 0) { > + printf("Ports started already...\n"); > + signo_quit =3D signum; > + force_quit =3D 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) > { > @@ -2571,6 +2682,12 @@ main(int argc, char **argv) > unsigned lcore_id; > uint32_t n_tx_queue, nb_lcores; > uint8_t portid, nb_rx_queue, queue, socketid; > + uint8_t avail_ports; > + > + port_status =3D PORT_IDLE; > + force_quit =3D false; > + signal(SIGINT, signal_handler); > + signal(SIGTERM, signal_handler); >=20 > /* init EAL */ > ret =3D rte_eal_init(argc, argv); > @@ -2711,34 +2828,40 @@ main(int argc, char **argv) > printf("\n"); >=20 > /* start ports */ > - for (portid =3D 0; portid < nb_ports; portid++) { > - if ((enabled_port_mask & (1 << portid)) =3D=3D 0) { > - continue; > + avail_ports =3D 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); > } > - /* Start device */ > - ret =3D rte_eth_dev_start(portid); > - if (ret < 0) > - rte_exit(EXIT_FAILURE, "rte_eth_dev_start: err=3D%d, port=3D%d\n", > - ret, portid); > - > - /* > - * If enabled, put device in promiscuous mode. > - * This allows IO forwarding mode to forward packets > - * to itself through 2 cross-connected ports of the > - * target machine. > - */ > - if (promiscuous_on) > - rte_eth_promiscuous_enable(portid); > + rte_exit(EXIT_FAILURE, > + "All ports are disabled, please check portmask...\n"); > } >=20 > check_all_ports_link_status((uint8_t)nb_ports, enabled_port_mask); >=20 > + ret =3D 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 =3D -1; > + break; > + } > } >=20 > - 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