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 C511841D52 for ; Thu, 23 Feb 2023 16:07:22 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C124A4323D; Thu, 23 Feb 2023 16:07:22 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 4071143236 for ; Thu, 23 Feb 2023 16:07:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677164840; 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=DSoReyytk6ayRDwD5cKgAbueSG0lV8/hs3BvdGg5v4w=; b=gBBVw4Ph3hjh1HFabUDbuZ5qlNZKREfEgFsrNTLuScU6Ho0TRG8t/Pjpil7NXImSimFJSq R/IlUIoE7oLP7FltPuW0dT8GHdR8y88VOm/Iq0CJQsBoXH0CdrSvX7SYwub9iBft6kCR5F 41ID2oJK1yRh1J0M+5epHPxNI7ZNdj8= 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-189-X8J_6YP4Ptuti0YiYng13w-1; Thu, 23 Feb 2023 10:07:19 -0500 X-MC-Unique: X8J_6YP4Ptuti0YiYng13w-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E6F8F81173B; Thu, 23 Feb 2023 15:07:07 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id F272E2166B2C; Thu, 23 Feb 2023 15:07:06 +0000 (UTC) From: Kevin Traynor To: Gregory Etelson Cc: Ferruh Yigit , dpdk stable Subject: patch 'app/testpmd: fix interactive mode with no ports' has been queued to stable release 21.11.4 Date: Thu, 23 Feb 2023 15:05:06 +0000 Message-Id: <20230223150631.723699-15-ktraynor@redhat.com> In-Reply-To: <20230223150631.723699-1-ktraynor@redhat.com> References: <20230223150631.723699-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 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 02/28/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/f6a5384a93f14bf104ebc5244f68a9f503f229f0 Thanks. Kevin --- >From f6a5384a93f14bf104ebc5244f68a9f503f229f0 Mon Sep 17 00:00:00 2001 From: Gregory Etelson Date: Thu, 19 Jan 2023 19:45:59 +0200 Subject: [PATCH] app/testpmd: fix interactive mode with no ports [ upstream commit 7e40372522c5a129da616d1420ff582968b81b46 ] Testpmd terminated unconditionally if it failed to start all ports. The patch allows testpmd to get into the command line, if the interactive mode was requested. Fixes: 6937d2103e22 ("app/testpmd: add option to not start device") Signed-off-by: Gregory Etelson Acked-by: Ferruh Yigit --- app/test-pmd/testpmd.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index ce8fd3d7d3..f1daa6e09d 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -4377,6 +4377,11 @@ main(int argc, char** argv) } - if (!no_device_start && start_port(RTE_PORT_ALL) != 0) - rte_exit(EXIT_FAILURE, "Start ports failed\n"); + if (!no_device_start && start_port(RTE_PORT_ALL) != 0) { + if (!interactive) { + rte_eal_cleanup(); + rte_exit(EXIT_FAILURE, "Start ports failed\n"); + } + fprintf(stderr, "Start ports failed\n"); + } /* set all ports to promiscuous mode by default */ -- 2.39.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-02-23 14:46:24.216104344 +0000 +++ 0015-app-testpmd-fix-interactive-mode-with-no-ports.patch 2023-02-23 14:46:23.718235785 +0000 @@ -1 +1 @@ -From 7e40372522c5a129da616d1420ff582968b81b46 Mon Sep 17 00:00:00 2001 +From f6a5384a93f14bf104ebc5244f68a9f503f229f0 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 7e40372522c5a129da616d1420ff582968b81b46 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 134d79a555..e366f81a0f 100644 +index ce8fd3d7d3..f1daa6e09d 100644 @@ -24 +25 @@ -@@ -4484,6 +4484,11 @@ main(int argc, char** argv) +@@ -4377,6 +4377,11 @@ main(int argc, char** argv)