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 8589CA0524 for ; Fri, 5 Feb 2021 12:39:33 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7C7AD188A64; Fri, 5 Feb 2021 12:39:33 +0100 (CET) Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by mails.dpdk.org (Postfix) with ESMTP id 329C54067B for ; Fri, 5 Feb 2021 12:39:32 +0100 (CET) Received: by mail-wm1-f51.google.com with SMTP id w4so5753937wmi.4 for ; Fri, 05 Feb 2021 03:39:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tU5eETnulDCrEcXjzPIS3bwNvNktEamP4/qLTRMBdFc=; b=QhLTYBmd1C0TmZSv8eCX9gKZ20urn+AgNzIl0IHtIYWBlQWnzHtliXMfZDwOpOXU7j 6M52R/X/g35jgbVRFxMe5ikTiI/hW/4DjBvbHrWHQJX/VYwUuCf8BqoFJRQ6eC4yDgAI My3uHPu0DSTvtw4bCr/wMwFBHpuv9RJj/8/RWXRQ8tWhGh/9WQ7LReGTSoJLfFTWpEqv cWcNY0IwJ5/yRrVXMsZeaGHrwJT5d3StZ/Pa/iZJ/2Il8UoT9txXTieC5b4EmKNJIs8f 0L1w6MXrG+mbc6MNkeVE+xPvR22ZLOMhvpU2hv7p4jV5zzvNMqqmdkQ5xpSUYpjCG+f+ rbmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=tU5eETnulDCrEcXjzPIS3bwNvNktEamP4/qLTRMBdFc=; b=pb8uhy0Zc7f3xqMKlQWWzPfgqCeAee0yFku6QWahcWNbQ3PPX9a706yWQzhdsFl3fX zMuw0B5Yb1MNspKdY2a4vjRua7NCpfe2QSPAL2h8+/ORbM1ZD47Cupbkz7Uyb3fNSlu+ nkBpciIdOGJeXDCAs1VxbZssGLUgkq9LxDfCits7CO6JzkV5iiS8fbsPMdRUItImZdwf lzAjUQLcdEZgitNbdciXYh3Fjs5frDgpK//DcWVCrFFHDo90zSKCRZ7oA2FSTefQBzGy HSyngQ9idXgwPXzK8Fug7FUD6gr86aV3u3D0ywn8RM1cIyr2v0qyA+MR9sVzfOAHcjDT kQew== X-Gm-Message-State: AOAM533lvFe3c3NnquS5OYGSWsbfODXInhvXyUpeSNkRQdNcl2SYF1Bt HzhwEkZJuR41OW/X1CKxjqA= X-Google-Smtp-Source: ABdhPJx32KMuleV0SpxzCqNNvx4vuQlTJskxOwxbbRnwHDLQLFLX/ls+rP9N9IZx2q+JXbI9FP/bsA== X-Received: by 2002:a05:600c:4ed3:: with SMTP id g19mr3157824wmq.95.1612525171949; Fri, 05 Feb 2021 03:39:31 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id r16sm11659617wrt.68.2021.02.05.03.39.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:39:31 -0800 (PST) From: luca.boccassi@gmail.com To: Dapeng Yu Cc: Xiaoyun Li , dpdk stable Date: Fri, 5 Feb 2021 11:19:12 +0000 Message-Id: <20210205111920.1272063-266-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210205111920.1272063-1-luca.boccassi@gmail.com> References: <20210205111920.1272063-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'app/testpmd: avoid exit without terminal restore' has been queued to stable release 20.11.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/07/21. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/2f31a5ca4d6c620549ab48a2d2f361c3e92ed3fb Thanks. Luca Boccassi --- >From 2f31a5ca4d6c620549ab48a2d2f361c3e92ed3fb Mon Sep 17 00:00:00 2001 From: Dapeng Yu Date: Mon, 25 Jan 2021 11:29:53 +0800 Subject: [PATCH] app/testpmd: avoid exit without terminal restore [ upstream commit b3e3d602a5ff6b91dd6006328b95e78ccd513f20 ] In interactive mode, if testpmd exit by calling rte_exit without restore terminal attributes, terminal will not echo keyboard input. register a function with atexit() in prompt(), when exit() in rte_exit() is called, the registered function restores terminal attributes. Fixes: 5a8fb55c48ab ("app/testpmd: support unidirectional configuration") Signed-off-by: Dapeng Yu Acked-by: Xiaoyun Li --- app/test-pmd/cmdline.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index 94240c840b..5436cfbd7d 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -17114,6 +17114,7 @@ cmdline_read_from_file(const char *filename) void prompt(void) { + int ret; /* initialize non-constant commands */ cmd_set_fwd_mode_init(); cmd_set_fwd_retry_mode_init(); @@ -17121,15 +17122,23 @@ prompt(void) testpmd_cl = cmdline_stdin_new(main_ctx, "testpmd> "); if (testpmd_cl == NULL) return; + + ret = atexit(prompt_exit); + if (ret != 0) + printf("Cannot set exit function for cmdline\n"); + cmdline_interact(testpmd_cl); - cmdline_stdin_exit(testpmd_cl); + if (ret != 0) + cmdline_stdin_exit(testpmd_cl); } void prompt_exit(void) { - if (testpmd_cl != NULL) + if (testpmd_cl != NULL) { cmdline_quit(testpmd_cl); + cmdline_stdin_exit(testpmd_cl); + } } static void -- 2.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:40.912871889 +0000 +++ 0266-app-testpmd-avoid-exit-without-terminal-restore.patch 2021-02-05 11:18:29.346701392 +0000 @@ -1 +1 @@ -From b3e3d602a5ff6b91dd6006328b95e78ccd513f20 Mon Sep 17 00:00:00 2001 +From 2f31a5ca4d6c620549ab48a2d2f361c3e92ed3fb Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit b3e3d602a5ff6b91dd6006328b95e78ccd513f20 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index b338f5fe63..789f35f099 100644 +index 94240c840b..5436cfbd7d 100644 @@ -26 +27 @@ -@@ -17131,6 +17131,7 @@ cmdline_read_from_file(const char *filename) +@@ -17114,6 +17114,7 @@ cmdline_read_from_file(const char *filename) @@ -34 +35 @@ -@@ -17138,15 +17139,23 @@ prompt(void) +@@ -17121,15 +17122,23 @@ prompt(void)