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 DD68041EA2; Wed, 15 Mar 2023 18:31:42 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9C2E0427F5; Wed, 15 Mar 2023 18:31:38 +0100 (CET) Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by mails.dpdk.org (Postfix) with ESMTP id 3A84540141 for ; Wed, 15 Mar 2023 18:31:37 +0100 (CET) Received: by mail-pf1-f182.google.com with SMTP id ce7so12186988pfb.9 for ; Wed, 15 Mar 2023 10:31:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20210112.gappssmtp.com; s=20210112; t=1678901496; 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=kvFzelHGrxT6naiQWCtiqtVvSbim6M/rajpMjWbadu0=; b=t9DkcOokZFP+rQzy332td1Q4IueLZAnsy3+M07fQghBZYxFz4rORkXGcutFFYBklOG H2rxXQ/959cHru4jtttT2JxKh6rI9JvB14z8jAkkE98UWwOJISEapKDVTbOW/vNYUkFt kp1kPdhGVDy/VKvc59efibZb4/cWJ/GBTkJqq+2yS+T1aX+2/fs0qmj6Sf7j22ZMy88b kXp3crJrqdDBhd2Onvdy3DL3VclW/ISu23RhWGickjmRT2cKV4yHi+3ETlvBYtsNDBZq C6jAdG3x5qtoOaSlMA0EI9SPgyLITthZwsooqv43kfJas5NO2Msg7+avQYwvWq+NSACA b9wQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678901496; 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=kvFzelHGrxT6naiQWCtiqtVvSbim6M/rajpMjWbadu0=; b=WiKGLyTpgmU4Z5OG5zDzJGmqFcRLsfepfKdaHR/zUXCSN/e+BkgCR35FOzMs2kDC7D zyBOrvyWYMeeY+80bhXmnCFwJu/GeRTPIViCBDRVWvx5RMZ+AgcDsXU3WeDm2xINkzk6 VxD1r7ekyo/iLjXaWrdBhRgG8kSbUhGInBkhrk2sy1xgExgxiO2fANY7dTIt6oAaHvq9 s2Qq71QHHquYvxkgKyAiDTXT+lchDXwrC6yWiFooEKufSaJ0+UD/9/M4fabp+MoyxJtT rgXa1vHaxx8y23J/YabV8wRHuSVhnWx6iaUdIodIDUaqaX+k9ob4rZxdrhHsS0nKlTcR 0jiA== X-Gm-Message-State: AO0yUKXjhYKvf7frHh4z6hSo9RcDkb0aP5FqlXjJMyD1rK809B7RPpW6 C1cNApD+hfhHNjn3T7gFHVaPaPBvxCG5OMajFqG1Gg== X-Google-Smtp-Source: AK7set+rp6xR2hqU4PoMnf6pH1prm9GyBwHzGbw+ocvn1TpweFDIYHUcIrcY/IArilbyL27mxA2szQ== X-Received: by 2002:a62:3816:0:b0:625:ca90:754d with SMTP id f22-20020a623816000000b00625ca90754dmr668689pfa.3.1678901496157; Wed, 15 Mar 2023 10:31:36 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id s5-20020aa78285000000b005d296facfa3sm3803256pfm.36.2023.03.15.10.31.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Mar 2023 10:31:35 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Aman Singh , Yuying Zhang , Olivier Matz , Ferruh Yigit Subject: [PATCH v4 1/2] testpmd: go back to using cmdline_interact Date: Wed, 15 Mar 2023 10:31:31 -0700 Message-Id: <20230315173132.4044-2-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230315173132.4044-1-stephen@networkplumber.org> References: <20230313171905.67720-1-stephen@networkplumber.org> <20230315173132.4044-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 The cmdline library poll function is broken on Windows and was never tested, don't use it. Instead, use sigaction() to cancel read character on Unix OS's and a new helper to cancel I/O on Windows. Fixes: 0fd1386c30c3 ("app/testpmd: cleanup cleanly from signal") Bugzilla ID: 1180 Signed-off-by: Stephen Hemminger --- app/test-pmd/cmdline.c | 27 ++++++++++++++------------- app/test-pmd/testpmd.c | 11 +++++++++++ lib/cmdline/cmdline.h | 10 ++++++++++ lib/cmdline/cmdline_os_unix.c | 5 +++++ lib/cmdline/cmdline_os_windows.c | 14 ++++++++++++++ lib/cmdline/cmdline_private.h | 2 +- lib/cmdline/version.map | 3 +++ 7 files changed, 58 insertions(+), 14 deletions(-) diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index 6fa870dc329b..072437d9bfcf 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -66,6 +66,7 @@ #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); @@ -13028,26 +13029,26 @@ cmdline_read_from_file(const char *filename) printf("Read CLI commands from %s\n", filename); } +void +prompt_exit(void) +{ + cmdline_cancel(testpmd_cl); + cmdline_quit(testpmd_cl); +} + /* prompt function, called from main on MAIN lcore */ void prompt(void) { - struct cmdline *cl; - - cl = cmdline_stdin_new(main_ctx, "testpmd> "); - if (cl == NULL) + testpmd_cl = cmdline_stdin_new(main_ctx, "testpmd> "); + if (testpmd_cl == NULL) { + fprintf(stderr, + "Failed to create stdin based cmdline context\n"); return; - - /* loop until signal or quit command */ - while (f_quit == 0 && cl_quit == 0) { - int status = cmdline_poll(cl); - - if (status < 0 || status == RDLINE_EXITED) - break; } - cmdline_quit(cl); - cmdline_stdin_exit(cl); + cmdline_interact(testpmd_cl); + cmdline_stdin_exit(testpmd_cl); } void diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index 2ce19ed47ab4..5cb6f9252395 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -4469,6 +4469,7 @@ static void signal_handler(int signum __rte_unused) { f_quit = 1; + prompt_exit(); } int @@ -4479,8 +4480,18 @@ main(int argc, char** argv) uint16_t count; int ret; +#ifdef RTE_EXEC_ENV_WINDOWS signal(SIGINT, signal_handler); signal(SIGTERM, signal_handler); +#else + /* Want read() not to be restarted on signal */ + struct sigaction action = { + .sa_handler = signal_handler, + }; + + sigaction(SIGINT, &action, NULL); + sigaction(SIGTERM, &action, NULL); +#endif testpmd_logtype = rte_log_register("testpmd"); if (testpmd_logtype < 0) diff --git a/lib/cmdline/cmdline.h b/lib/cmdline/cmdline.h index b14355ef5121..2a1721cf9712 100644 --- a/lib/cmdline/cmdline.h +++ b/lib/cmdline/cmdline.h @@ -60,6 +60,16 @@ int cmdline_poll(struct cmdline *cl); void cmdline_interact(struct cmdline *cl); void cmdline_quit(struct cmdline *cl); + +/** + * This function causes the read() in cmdline_interact to exit. + * + * @param cl + * The command line object. + */ +__rte_experimental +void cmdline_cancel(struct cmdline *cl); + #ifdef __cplusplus } #endif diff --git a/lib/cmdline/cmdline_os_unix.c b/lib/cmdline/cmdline_os_unix.c index 64a945a34fb3..5f9839a15f98 100644 --- a/lib/cmdline/cmdline_os_unix.c +++ b/lib/cmdline/cmdline_os_unix.c @@ -51,3 +51,8 @@ cmdline_vdprintf(int fd, const char *format, va_list op) { return vdprintf(fd, format, op); } + +void +cmdline_cancel(__rte_unused struct cmdline *cl) +{ +} diff --git a/lib/cmdline/cmdline_os_windows.c b/lib/cmdline/cmdline_os_windows.c index 73ed9ba290b8..80863bfc8a00 100644 --- a/lib/cmdline/cmdline_os_windows.c +++ b/lib/cmdline/cmdline_os_windows.c @@ -203,3 +203,17 @@ cmdline_vdprintf(int fd, const char *format, va_list op) return ret; } + +void +cmdline_cancel(struct cmdline *cl) +{ + if (!cl) + return; + + /* force the outstanding read on console to exit */ + if (cl->oldterm.is_console_input) { + HANDLE handle = (HANDLE)_get_osfhandle(cl->s_in); + + CancelIoEx(handle, NULL); + } +} diff --git a/lib/cmdline/cmdline_private.h b/lib/cmdline/cmdline_private.h index a3271c76934a..7ec42ac3c78f 100644 --- a/lib/cmdline/cmdline_private.h +++ b/lib/cmdline/cmdline_private.h @@ -24,7 +24,7 @@ #define RDLINE_HISTORY_MAX_LINE 64 struct rdline { - enum rdline_status status; + volatile enum rdline_status status; /* rdline bufs */ struct cirbuf left; struct cirbuf right; diff --git a/lib/cmdline/version.map b/lib/cmdline/version.map index e3d59aaf8d61..a8a417cd6ff1 100644 --- a/lib/cmdline/version.map +++ b/lib/cmdline/version.map @@ -84,5 +84,8 @@ EXPERIMENTAL { # added in 22.07 cmdline_parse_check; + # added in 23.03 + cmdline_cancel; + local: *; }; -- 2.39.2