From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id BDD2A41B83; Mon, 30 Jan 2023 21:09:30 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EAB6440FDF; Mon, 30 Jan 2023 21:09:22 +0100 (CET) Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) by mails.dpdk.org (Postfix) with ESMTP id E107440EE2 for ; Mon, 30 Jan 2023 21:09:20 +0100 (CET) Received: by mail-pj1-f53.google.com with SMTP id j5so12153019pjn.5 for ; Mon, 30 Jan 2023 12:09:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Nl8Toz9rumMESy70bSmDSlnROkQfEzaWttPqzzbL5jU=; b=r4DFESHIzxEKeh5T/3DHeIRRbkrpDJCt1iV/gz+TEjEQmJCS17kvViItw0EMid3F+4 Tu1epkI0JrGXHCq4ivUvlXe8ICtAuzd85PGX/RAwE3XiJufxImmEjnROhPsI5A2HlXO+ KKxF3MKfKgAIn9Fd5SerjEXeTUsJwQt27Q+lBnHykgthpUXxL5LDCGtZ4lwHi/yPf+9E 56QzZIv9rJNYzwhS2xdWvIfgYmPM0y8ieZjfAPxYv4N9je/FeyYVH0JGunOhdnHOsk0l Z5DfITTbK4/znvt+HHELIzjLV1WvgPnBL2PB6o6Cs1TXIWp5uCdiwcJtwmzDK6YXjQn6 xVPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Nl8Toz9rumMESy70bSmDSlnROkQfEzaWttPqzzbL5jU=; b=YCm0TqetudBiNvKOQqF1TGHC69TAMeYCjJj92acJVw/htUPxgB+I56W6frYKlAGNjb GfDakOLVBtN7Ubjewxm3Knbn7wR1xaHC3I4gDo0u9WAD1+ar3Rd9KohgdGTsbzKw39vn 1vnVDHatLo3Xs7pzTKk3bKVIk9xOcA5KNt22r1Kov7z3wicsUyZj69q7ThDGya0wyHHp WWsAm2Wa8Q6IbaohTb9dbGoklJP5E1UADuvtvCoHNaTSAH55SUAYCxqSkoXbaIpKPwDA eIgTOU9SBHqAh9SLcfv++anzVc1s3wt+PKUCDGALP8zzdP3KIFafoT3Ap5eJGAY4GP06 9zFA== X-Gm-Message-State: AO0yUKXkUpa3umIyssLYXpBszbiWK6wGCID6bfZtXzelxV/ewQl+Wu92 Kbutog3uzWsVHcqD60TzrPa8/BPgDhf2f03VynA= X-Google-Smtp-Source: AK7set/Sxz5M2Fbon9oGkIyjQaqgMzGKa2ZmdDbSK2GkkgHL/4+X8V67if+TdSjqwKK6utOghjG+ew== X-Received: by 2002:a05:6a20:1590:b0:bd:17a4:c33b with SMTP id h16-20020a056a20159000b000bd17a4c33bmr5671581pzj.37.1675109359597; Mon, 30 Jan 2023 12:09:19 -0800 (PST) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id p19-20020a637413000000b004774b5dc24dsm7024329pgc.12.2023.01.30.12.09.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 12:09:19 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Subject: [PATCH v10 2/2] testpmd: cleanup cleanly from signal Date: Mon, 30 Jan 2023 12:09:14 -0800 Message-Id: <20230130200914.22049-3-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230130200914.22049-1-stephen@networkplumber.org> References: <20221014172328.185219-1-stephen@networkplumber.org> <20230130200914.22049-1-stephen@networkplumber.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Do a clean shutdown of testpmd when a signal is received; instead of having testpmd kill itself. This fixes the problem where a signal could be received in the middle of a PMD and then the signal handler would call PMD's close routine leading to locking problems. An added benefit is it gets rid of some Windows specific code. Fixes: d9a191a00e81 ("app/testpmd: fix quitting in container") Signed-off-by: Stephen Hemminger --- app/test-pmd/cmdline.c | 30 ++++++---------- app/test-pmd/testpmd.c | 77 ++++++++++++++++++++---------------------- app/test-pmd/testpmd.h | 1 + 3 files changed, 48 insertions(+), 60 deletions(-) diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index b32dc8bfd445..1f73056eb19a 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -65,7 +65,6 @@ #include "cmdline_tm.h" #include "bpf_cmd.h" -static struct cmdline *testpmd_cl; static cmdline_parse_ctx_t *main_ctx; static TAILQ_HEAD(, testpmd_driver_commands) driver_commands_head = TAILQ_HEAD_INITIALIZER(driver_commands_head); @@ -12921,28 +12920,21 @@ cmdline_read_from_file(const char *filename) void prompt(void) { - int ret; + struct cmdline *cl; - testpmd_cl = cmdline_stdin_new(main_ctx, "testpmd> "); - if (testpmd_cl == NULL) + cl = cmdline_stdin_new(main_ctx, "testpmd> "); + if (cl == NULL) return; - ret = atexit(prompt_exit); - if (ret != 0) - fprintf(stderr, "Cannot set exit function for cmdline\n"); - - cmdline_interact(testpmd_cl); - if (ret != 0) - cmdline_stdin_exit(testpmd_cl); -} - -void -prompt_exit(void) -{ - if (testpmd_cl != NULL) { - cmdline_quit(testpmd_cl); - cmdline_stdin_exit(testpmd_cl); + /* loop until signal or quit command */ + while (f_quit == 0 && cl_quit == 0) { + /* exit loop on eof or read error */ + if (cmdline_poll(cl) <= 0) + break; } + + cmdline_quit(cl); + cmdline_stdin_exit(cl); } void diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index 134d79a55547..d01b6105b7de 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -11,6 +11,7 @@ #include #ifndef RTE_EXEC_ENV_WINDOWS #include +#include #endif #include #include @@ -231,7 +232,7 @@ unsigned int xstats_display_num; /**< Size of extended statistics to show */ * In container, it cannot terminate the process which running with 'stats-period' * option. Set flag to exit stats period loop after received SIGINT/SIGTERM. */ -static volatile uint8_t f_quit; +volatile uint8_t f_quit; uint8_t cl_quit; /* Quit testpmd from cmdline. */ /* @@ -4315,13 +4316,6 @@ init_port(void) memset(txring_numa, NUMA_NO_CONFIG, RTE_MAX_ETHPORTS); } -static void -force_quit(void) -{ - pmd_test_exit(); - prompt_exit(); -} - static void print_stats(void) { @@ -4340,28 +4334,9 @@ print_stats(void) } static void -signal_handler(int signum) +signal_handler(int signum __rte_unused) { - if (signum == SIGINT || signum == SIGTERM) { - fprintf(stderr, "\nSignal %d received, preparing to exit...\n", - signum); -#ifdef RTE_LIB_PDUMP - /* uninitialize packet capture framework */ - rte_pdump_uninit(); -#endif -#ifdef RTE_LIB_LATENCYSTATS - if (latencystats_enabled != 0) - rte_latencystats_uninit(); -#endif - force_quit(); - /* Set flag to indicate the force termination. */ - f_quit = 1; - /* exit with the expected status */ -#ifndef RTE_EXEC_ENV_WINDOWS - signal(signum, SIG_DFL); - kill(getpid(), signum); -#endif - } + f_quit = 1; } int @@ -4536,15 +4511,9 @@ main(int argc, char** argv) start_packet_forwarding(0); } prompt(); - pmd_test_exit(); } else #endif { - char c; - int rc; - - f_quit = 0; - printf("No commandline core given, start packet forwarding\n"); start_packet_forwarding(tx_first); if (stats_period != 0) { @@ -4567,15 +4536,41 @@ main(int argc, char** argv) prev_time = cur_time; rte_delay_us_sleep(US_PER_S); } - } + } else { + char c; + fd_set fds; + + printf("Press enter to exit\n"); - printf("Press enter to exit\n"); - rc = read(0, &c, 1); - pmd_test_exit(); - if (rc < 0) - return 1; + FD_ZERO(&fds); + FD_SET(0, &fds); + + /* wait for signal or enter */ + ret = select(1, &fds, NULL, NULL, NULL); + if (ret < 0 && errno != EINTR) + rte_exit(EXIT_FAILURE, + "Select failed: %s\n", + strerror(errno)); + + /* if got enter then consume it */ + if (ret == 1 && read(0, &c, 1) < 0) + rte_exit(EXIT_FAILURE, + "Read failed: %s\n", + strerror(errno)); + } } + pmd_test_exit(); + +#ifdef RTE_LIB_PDUMP + /* uninitialize packet capture framework */ + rte_pdump_uninit(); +#endif +#ifdef RTE_LIB_LATENCYSTATS + if (latencystats_enabled != 0) + rte_latencystats_uninit(); +#endif + ret = rte_eal_cleanup(); if (ret != 0) rte_exit(EXIT_FAILURE, diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h index 7d24d25970d2..022210a7a964 100644 --- a/app/test-pmd/testpmd.h +++ b/app/test-pmd/testpmd.h @@ -34,6 +34,7 @@ #define RTE_PORT_HANDLING (uint16_t)3 extern uint8_t cl_quit; +extern volatile uint8_t f_quit; /* * It is used to allocate the memory for hash key. -- 2.39.0