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 49BE9428F8 for ; Sun, 9 Apr 2023 17:31:40 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 44BF642D10; Sun, 9 Apr 2023 17:31:40 +0200 (CEST) Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on2061.outbound.protection.outlook.com [40.107.96.61]) by mails.dpdk.org (Postfix) with ESMTP id 966A44067E for ; Sun, 9 Apr 2023 17:31:39 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ONugyL3FAxi36quZoRG3b+Vd1AEnt6tk004fvl1Ja4BNQ9u+XwQ6effZesGG5FkI8h5IpyLKYDqVYO6C1ZfLnpGqfyXCSsXKg0MdqVf52ZKoG0/pKOuMw1RMDCQZ0EVDNT27A1BM/8NKNHgLcaBfoNW8U1G1dD7nez+LQ4sMs0Mp72X1oUatu1IUY8rfFP3Ew7c30B4t8TOPpf8nkbQce+0ujWffVKdNpbEHFUUKLcOZK67yuyHGRvaYQeEXv8PPrJymtGscEV3xOfflJ363YciNZexn9JjgVeAqm6PTwP+5M8zoG1TIj2w0fCUDOzHqqtSOj8SQnp4HvLKWnECVjQ== 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=oxXDLU/eOigbXM12r1Nbepe0TsKA4vUw0FuYfi8WYrA=; b=T1xZN0ZMjqAloLNigI9IalvfCgLRM7S06e/r6aMMZHit8L1KIVmNYbqo9WhFavp/sLrzwcvDUFyDKXj04QjsF7gsA4GYAHcWNcw0mHMpbNmUmP4XfcwXQG8QpCdiUTVFIH0GgIDp2vGfS/crG3eFatXbddTSLNhFYtwQbLBaoRlAns4kxLbRvXeOuTy+H7zpSbYznPvAvI15XpbB/w0KRpoYo4yMz/GZHuOj8yEf1e8TnmNEcZubqaj4M8/K8kxsYKQ6HvbuPDsxIfVU87Nj9RyMjy1lKfxOt+PPW0/bumKlemJM3zzdnMp47kqxf0iwhKyDvrUck/nFhWJbTe8fWA== 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 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=oxXDLU/eOigbXM12r1Nbepe0TsKA4vUw0FuYfi8WYrA=; b=lzzxpveBo5jxwEMB5kQYZJjeH3TUS+LTD4N+k+ZBc4k5WYMrUJoWe7KrUa7nsyyq94gGdh5fhw9SHmlpqe6FWSL0PFrvg1cs5sNyCsBg23P2k7YMvpXCuYfrAldEX3w1THbxld/X6P+iLIJyjgTW/KkqMVeVU2K/GdPjussDE6OpBUXP4ZTfBQudsQqoSyG/Bdgr4YSJo6l3kMOylan2Q5wN2g+mnBLXj5sXd9fAS1l6mz8swOtwCxFinXD6oBHEMGDiDUjngYFYHTBv5ecDSkzmxy6imb9VPVX4yIVFSQAvr0+b2aVj0IBSGCFSnmFZ9K7MqE7+aRLR+qoUQ9r2sQ== Received: from BN9PR03CA0441.namprd03.prod.outlook.com (2603:10b6:408:113::26) by BL1PR12MB5222.namprd12.prod.outlook.com (2603:10b6:208:31e::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.38; Sun, 9 Apr 2023 15:31:36 +0000 Received: from BN8NAM11FT028.eop-nam11.prod.protection.outlook.com (2603:10b6:408:113:cafe::12) by BN9PR03CA0441.outlook.office365.com (2603:10b6:408:113::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.38 via Frontend Transport; Sun, 9 Apr 2023 15:31:36 +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 BN8NAM11FT028.mail.protection.outlook.com (10.13.176.225) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6298.20 via Frontend Transport; Sun, 9 Apr 2023 15:31:36 +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.5; Sun, 9 Apr 2023 08:31:22 -0700 Received: from nvidia.com (10.126.230.37) 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.37; Sun, 9 Apr 2023 08:31:21 -0700 From: Xueming Li To: Stephen Hemminger CC: dpdk stable Subject: patch 'cmdline: handle EOF as quit' has been queued to stable release 22.11.2 Date: Sun, 9 Apr 2023 23:24:17 +0800 Message-ID: <20230409152529.5308-70-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230409152529.5308-1-xuemingl@nvidia.com> References: <20230227062349.13764-1-xuemingl@nvidia.com> <20230409152529.5308-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.37] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM11FT028:EE_|BL1PR12MB5222:EE_ X-MS-Office365-Filtering-Correlation-Id: ce769da8-704c-4bc7-e19b-08db390f819b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qQ/3UgaWDARPHvlfkXZXQgtwk09ZNfUOesRUS85VUl+VibK68HyPoc8hsuq/+OXBsWYwbOcPsN1FzGc51p5d3zZv2+QDkZcRmTDyyRrYQywja70ynd9oFF89A3xovicq6V8mzq4OiHagXGoFzzX0Yk1pl12aPGajrruaRgQXzTByDcZxwH5A58lLfEd8jiF2iPMPY1byv7cU7nOU1An0ElfIdwp0Ipu6vv/KTVi/qkDsJjtoz15tBRi6bWWGg1PFJoocAo6g9jHMgHyhOhET1QmG9cC3PKgFd89G4/2bRVAYUrj0GY3Nso3Xk4HDu1iHX76V2abf3cq65fDlpoOsTkMhff6dxryQemvxs3FgqsyMnt0JEpZY7T0RK3UuoH0O7hzZQsvkw037T8f5Xgexe/qN8efYB8JkTQ/2nzRoEYRaRHE/XquOT/rEswW1ZfgkZX1Hrk+jvD2MUBofnR2PxF5TWz0qC58kNHuIQe/VbkNlR/PG9HNiiy8yaO76q0W5PeKP7hCFFL5qP9XAdxAMqYeZewGNmBWfTtI2A4PVsIK+Qtd11IJsCk1Edqt6F8S91LVHUUyutCIJQL2LB1/rQqpKcl7mHZl1cjM7vNpFo/0GoXXmPkWH5O3XvvYzLxZvfeXBdVlw5yUONJ0A4kOTFDSAG6xDsiZHWg6B1l2XA1LtHmFbsF/GjUioMZvY9swmUkGtYzdprtCHMHri0iPpcsSUuQgJ9Itjc1TVFVrvyXavd/FEpQ5ZVjBr7nQ+juXm8G8huiTM3WxLiV0SrX8oySqF8sooyMuZCBMsaTKGCSikGF8MEyNkg3C4P5Opio255twmfEFIfvN7A4om4DQp6A== 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:(13230028)(4636009)(376002)(39860400002)(346002)(396003)(136003)(451199021)(40470700004)(46966006)(36840700001)(7636003)(5660300002)(356005)(41300700001)(40480700001)(55016003)(478600001)(82310400005)(2616005)(36860700001)(8676002)(8936002)(82740400003)(83380400001)(47076005)(2906002)(336012)(426003)(186003)(6286002)(16526019)(40460700003)(86362001)(1076003)(26005)(70586007)(70206006)(53546011)(4326008)(6916009)(316002)(7696005)(36756003)(6666004)(966005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Apr 2023 15:31:36.2639 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ce769da8-704c-4bc7-e19b-08db390f819b 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: BN8NAM11FT028.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR12MB5222 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.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 04/11/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/log/?h=22.11-staging/commit/564dbb6a03e87eb4818098b6884da37c72e4f3be Thanks. Xueming Li --- >From 564dbb6a03e87eb4818098b6884da37c72e4f3be Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Fri, 3 Feb 2023 11:14:08 -0800 Subject: [PATCH] cmdline: handle EOF as quit Cc: Xueming Li [ upstream commit 415549f1ccce62b82cb182175346904a65f74cec ] If end of file is reached on input, then cmdline_poll() will return 1 (ie file has something); and then the cmdline_in() call to read will return 0. With the existing code, caller has no way to tell that end of file has been reached and will retry forever. A good way to handle this is to make end of file equivalent to the quit command. Since no more input is possible at that point. Fixes: 067855e651d6 ("cmdline: add polling mode") Signed-off-by: Stephen Hemminger --- lib/cmdline/cmdline.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/cmdline/cmdline.c b/lib/cmdline/cmdline.c index e1009ba4c4..8ad0690d85 100644 --- a/lib/cmdline/cmdline.c +++ b/lib/cmdline/cmdline.c @@ -197,9 +197,14 @@ cmdline_poll(struct cmdline *cl) if (read_status < 0) return read_status; - status = cmdline_in(cl, &c, 1); - if (status < 0 && cl->rdl.status != RDLINE_EXITED) - return status; + if (read_status == 0) { + /* end of file is implicit quit */ + cmdline_quit(cl); + } else { + status = cmdline_in(cl, &c, 1); + if (status < 0 && cl->rdl.status != RDLINE_EXITED) + return status; + } } return cl->rdl.status; -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-04-09 21:45:40.539801600 +0800 +++ 0069-cmdline-handle-EOF-as-quit.patch 2023-04-09 21:45:38.679042200 +0800 @@ -1 +1 @@ -From 415549f1ccce62b82cb182175346904a65f74cec Mon Sep 17 00:00:00 2001 +From 564dbb6a03e87eb4818098b6884da37c72e4f3be Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 415549f1ccce62b82cb182175346904a65f74cec ] @@ -17 +19,0 @@ -Cc: stable@dpdk.org