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 6662C41E9F for ; Wed, 15 Mar 2023 15:37:28 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 62F9F42D16; Wed, 15 Mar 2023 15:37:28 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id BEBAA42B71 for ; Wed, 15 Mar 2023 15:37:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678891046; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=VpRpG3/hGpyEwquo2Eak8oWj9PNpyNX0E7dp+4Hgwy4=; b=ds9i9aKz68xkpfpe/w4J5p8a/v9BwqNzUMMspXXhNt+wYkR0L4YNnDLs+IsnDTBZAkN1ol EAWloVQEP2qseVSpfcSKGwOpO9e02LXU3laI6y7JWO2Wyq0bwppLhuWQ0WjVnanUA/F+fP bNb7VlC99v3jSW8fpPXHA7DCkmpUAAE= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-400-gGZKhvvDOq2DsXPLKl9p2g-1; Wed, 15 Mar 2023 10:37:24 -0400 X-MC-Unique: gGZKhvvDOq2DsXPLKl9p2g-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D7607185A790; Wed, 15 Mar 2023 14:37:23 +0000 (UTC) Received: from rh.Home (unknown [10.39.192.83]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3EE2C40C6E67; Wed, 15 Mar 2023 14:37:23 +0000 (UTC) From: Kevin Traynor To: Stephen Hemminger Cc: dpdk stable Subject: patch 'cmdline: handle EOF as quit' has been queued to stable release 21.11.4 Date: Wed, 15 Mar 2023 14:36:30 +0000 Message-Id: <20230315143640.677317-37-ktraynor@redhat.com> In-Reply-To: <20230315143640.677317-1-ktraynor@redhat.com> References: <20230315143640.677317-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 21.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 03/20/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://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/01a15c3c5cbc59f2feb27a2e52fa9c5816d13a72 Thanks. Kevin --- >From 01a15c3c5cbc59f2feb27a2e52fa9c5816d13a72 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 [ 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 8f1854cb0b..5600f012c2 100644 --- a/lib/cmdline/cmdline.c +++ b/lib/cmdline/cmdline.c @@ -200,7 +200,12 @@ cmdline_poll(struct cmdline *cl) 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; + } } -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-03-15 14:30:21.491198395 +0000 +++ 0037-cmdline-handle-EOF-as-quit.patch 2023-03-15 14:30:20.607123777 +0000 @@ -1 +1 @@ -From 415549f1ccce62b82cb182175346904a65f74cec Mon Sep 17 00:00:00 2001 +From 01a15c3c5cbc59f2feb27a2e52fa9c5816d13a72 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 415549f1ccce62b82cb182175346904a65f74cec ] + @@ -17 +18,0 @@ -Cc: stable@dpdk.org @@ -25 +26 @@ -index e1009ba4c4..8ad0690d85 100644 +index 8f1854cb0b..5600f012c2 100644 @@ -28 +29 @@ -@@ -198,7 +198,12 @@ cmdline_poll(struct cmdline *cl) +@@ -200,7 +200,12 @@ cmdline_poll(struct cmdline *cl)