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 03A5B433D8 for ; Mon, 11 Dec 2023 11:14:24 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F1C4D40ED2; Mon, 11 Dec 2023 11:14:23 +0100 (CET) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2068.outbound.protection.outlook.com [40.107.223.68]) by mails.dpdk.org (Postfix) with ESMTP id 1C28B40E0F for ; Mon, 11 Dec 2023 11:14:23 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PJ05ibeVgYskeL9GJkFpYbnm2SB0Ppj3g/shzrI+BvTsv4jw1xkEfJuznA87v9TP2Sq5D3I2qGQxaSx4OuILgRGECMRGoZChqeQClCfVIPGJyhLtQHSXnbAiRwEO73Zx0TsvOOClZDL9X7Z+i4sCkPzCso8V2gVcmyFNfP4SxFthtjWSqOrhm92cMrjXvemgWf8PrPDSjZIWT2ScH+gPWwieAWyu5dkJOdQjnM8phOhTUKyAJpMsKUHeg5OnrT9l1sMVgU+Kdg6ZD4q5tLS53urHQ3JLqd/3steNXmqjcvR3IyfIaqwdfoJcHimYJL1ULLqMsc2DV58q992ZHxh9SQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=6kkmXsfBshrpLmrcAyqe1oynf0ZFgwr1Q+eawB4kiQg=; b=lZtyvBDqWPhz0du6UeWBhXgOjAwQe6qp/rMlBHzje0QBugHwc4wbzC52Ucbu3rpf/CLY1uEyrjjYi56SL2o2pjO8Q0lZ/7o6/TUPy2Zgjw9/HUbeBuLleLKlnMc9XKgpOB8h4gKoxk5NuJD+t1S7CU0xSVXNYrZjp5FJzO3uDxIbJfNFbwEukzueSrWRK3dGjnpYkWxtzx+4ZYPbVzerlcWOI0L5TliFjCuulVGyTUNzHjyVuAm2bFzM67Fdo1l3ndKi0scznEl9WTcHiHLz831NorRWcifsElguF8ERZaQJOLv4FpKktBFHMhpITZbWtpXtKE4UQ+KDeI1aOTWkfw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=networkplumber.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=6kkmXsfBshrpLmrcAyqe1oynf0ZFgwr1Q+eawB4kiQg=; b=SDUvXGv5P0pJlXnaryGGp0Gk4F8bRvoRqkvgiTVVj6xl191qD6eIJ9dT7j9yEwgfphSzynQ/SUkwYSOhw3ySwtYL/6LAOj8wOQr+eyetyCpFntann3VCN4JjcnmZIL7sfQIfTpU5ghpxWGcyTWT5MxCybIhdOoWYYfwyU5rpOULXzEZN61XUheHD9dW/njNTxp2fHA+w6mHAQGaXAUTyJv7zJMKp38Hg/udH0qGnWoM7NAlXm4h29ufFfNVGFJ7weBB2fWkVUC9RLHLswnqjxYcY6qKOUpc7oxUbkuWveXoTwqWp+Yuyo75++sOr4aI1RSwAriXXxcrNPa06Vq6Xqw== Received: from MN2PR18CA0018.namprd18.prod.outlook.com (2603:10b6:208:23c::23) by DM4PR12MB6037.namprd12.prod.outlook.com (2603:10b6:8:b0::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.32; Mon, 11 Dec 2023 10:14:19 +0000 Received: from MN1PEPF0000ECDA.namprd02.prod.outlook.com (2603:10b6:208:23c:cafe::60) by MN2PR18CA0018.outlook.office365.com (2603:10b6:208:23c::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.33 via Frontend Transport; Mon, 11 Dec 2023 10:14:19 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by MN1PEPF0000ECDA.mail.protection.outlook.com (10.167.242.134) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.18 via Frontend Transport; Mon, 11 Dec 2023 10:14:19 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Mon, 11 Dec 2023 02:14:04 -0800 Received: from nvidia.com (10.126.231.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Mon, 11 Dec 2023 02:14:02 -0800 From: Xueming Li To: Stephen Hemminger CC: Ferruh Yigit , David Marchand , dpdk stable Subject: patch 'app/testpmd: fix early exit from signal' has been queued to stable release 22.11.4 Date: Mon, 11 Dec 2023 18:10:43 +0800 Message-ID: <20231211101226.2122-19-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231211101226.2122-1-xuemingl@nvidia.com> References: <20231022142250.10324-1-xuemingl@nvidia.com> <20231211101226.2122-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MN1PEPF0000ECDA:EE_|DM4PR12MB6037:EE_ X-MS-Office365-Filtering-Correlation-Id: 84457eca-6276-4103-ae03-08dbfa31f049 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qwFTAcORYlMnSLUQPXi8iAxmXSu1SaGZ06q+5Y+ja7a2jr4waj2RIg7/1Gdfd9/e/murnievPh8bfzfP8BEVH6TvApTJwxt6Ot8e8h21+NYUxZ/oDQZKNBZmXenSRksOJtGiy4YwabyJipJkBZPQ+BolSFJ0CpwVAjp4BrdZX/Csu2Qgiy91cLctqQvH1jmq4O9aogg75X0u6Xn+XwSFAVu3Xl56nKpghyHdu6wCA24uxe6N/nSM69lXDapZQUfLRhhpyv7s36htIysi/8wQxOzgFCLV+xSv3CbF+Zw6OipvPZla+4htvAp0d0hUBLS4s5TA96xz3c22DS5ZPJSLBZDStFRdZZuTKJEq7+yaGhCG0ptqsCJquu1NTFQpdqiAj+hM4IgsPfxtT7XzLv6bTXEmbVx6CCHIHri/Q9BDZIvxudrSpeeV9avU9BakrU5LQtyE4zwmmFi+Wc8nkwApPL6JWw2DDi4fGQTrrrd87XNbywYHgJ9pFZE48nmoHkWcXBJj83dX3WvXAeY3/LttGfc16cOgXAqyoamnVCBzTMdJwdz6CFA51Ng3p6E4pb2qOWyhLo0+fUD7ovXlWqH7pAhKRaxBTNfa5wZGOtFP1x4xa6QsxURJlaQl4izQm56YEbavrDl9h5zjpTHjasMwnQ9fuiz+De16j82SaRq3UVAhvvJBby/xqYl0QtMbzCrqZyo89tQ/dsDCSU/BIrGAju0n7Tj2PmFXhgVUr0W0CtQhqgpE2PHOUaelB38ll2hGZh1I4rj+tUhDY1rG3hXtSoRVCbBLNvx+NtJXLquTrUQ= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230031)(4636009)(376002)(396003)(39860400002)(136003)(346002)(230922051799003)(451199024)(1800799012)(186009)(82310400011)(64100799003)(40470700004)(36840700001)(46966006)(83380400001)(2906002)(82740400003)(478600001)(356005)(41300700001)(4001150100001)(7636003)(55016003)(70206006)(70586007)(54906003)(6916009)(426003)(966005)(40480700001)(316002)(6666004)(86362001)(7696005)(4326008)(8936002)(8676002)(53546011)(40460700003)(36756003)(1076003)(47076005)(6286002)(5660300002)(36860700001)(26005)(336012)(2616005)(16526019); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2023 10:14:19.2884 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 84457eca-6276-4103-ae03-08dbfa31f049 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: MN1PEPF0000ECDA.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB6037 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 Hi, FYI, your patch has been queued to stable release 22.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/13/23. 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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=976cefa8035d36d2f42a430cc1bcf877c12bff20 Thanks. Xueming Li --- >From 976cefa8035d36d2f42a430cc1bcf877c12bff20 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Thu, 26 Oct 2023 10:11:33 -0700 Subject: [PATCH] app/testpmd: fix early exit from signal Cc: Xueming Li [ upstream commit a996cd04aeeaeca88e6313174101a1229349fb47 ] Other signals may occur causing read to get interrupted. Loop until quit flag is set by signal, a character is entered, or end of file. This fixes bug where testpmd would exit early because of signal used by TAP device. Bugzilla ID: 1305 Fixes: 0fd1386c30c3 ("app/testpmd: cleanup cleanly from signal") Signed-off-by: Stephen Hemminger Acked-by: Ferruh Yigit Reviewed-by: David Marchand --- app/test-pmd/testpmd.c | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index 33c9888740..340c713c19 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -11,7 +11,6 @@ #include #ifndef RTE_EXEC_ENV_WINDOWS #include -#include #endif #include #include @@ -4646,25 +4645,17 @@ main(int argc, char** argv) } } else { char c; - fd_set fds; printf("Press enter to exit\n"); - - 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", + while (f_quit == 0) { + /* end-of-file or any character exits loop */ + if (read(0, &c, 1) >= 0) + break; + if (errno == EINTR) + continue; + rte_exit(EXIT_FAILURE, "Read failed: %s\n", strerror(errno)); + } } } -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-12-11 17:56:23.786477700 +0800 +++ 0018-app-testpmd-fix-early-exit-from-signal.patch 2023-12-11 17:56:22.907652300 +0800 @@ -1 +1 @@ -From a996cd04aeeaeca88e6313174101a1229349fb47 Mon Sep 17 00:00:00 2001 +From 976cefa8035d36d2f42a430cc1bcf877c12bff20 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit a996cd04aeeaeca88e6313174101a1229349fb47 ] @@ -13 +15,0 @@ -Cc: stable@dpdk.org @@ -23 +25 @@ -index 595b77748c..9e4e99e53b 100644 +index 33c9888740..340c713c19 100644 @@ -34 +36 @@ -@@ -4743,25 +4742,17 @@ main(int argc, char** argv) +@@ -4646,25 +4645,17 @@ main(int argc, char** argv)