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 B450943BA7 for ; Tue, 5 Mar 2024 16:36:05 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AC12242E41; Tue, 5 Mar 2024 16:36:05 +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 064F9410D3 for ; Tue, 5 Mar 2024 16:36:04 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709652964; 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=iaqz3hT0HikwftNHiM9zT+odo1s2XX/SGiKFIgmr8wI=; b=fhwFtbijBd2URO+hTykGrFaT7nfxS5OHB7VFtv7SWXTJIo6oDKgBjOPkvUnjDkhjCV1Evj x0BUgnPsCheCitys+YsVT5KvGPZhwRIkhzIlQfb23WzPqHUdwFG+vR/hZif6taNerjsM7c zUF68Gu+VGRUnfh3ehj4a3xe9sGDIvE= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-7-tFqmrWD9PQih4w0Mu30h_Q-1; Tue, 05 Mar 2024 10:35:59 -0500 X-MC-Unique: tFqmrWD9PQih4w0Mu30h_Q-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3FC0F3801FEC; Tue, 5 Mar 2024 15:35:59 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.194.197]) by smtp.corp.redhat.com (Postfix) with ESMTP id 73112200AE7F; Tue, 5 Mar 2024 15:35:58 +0000 (UTC) From: Kevin Traynor To: Stephen Hemminger Cc: Ferruh Yigit , dpdk stable Subject: patch 'app/testpmd: hide --bitrate-stats in help if disabled' has been queued to stable release 21.11.7 Date: Tue, 5 Mar 2024 15:34:21 +0000 Message-ID: <20240305153449.263666-48-ktraynor@redhat.com> In-Reply-To: <20240305153449.263666-1-ktraynor@redhat.com> References: <20240305153449.263666-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 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.7 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/11/24. 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/2597a7df7c42e851ed9dbdc63ae01e0a5470963d Thanks. Kevin --- >From 2597a7df7c42e851ed9dbdc63ae01e0a5470963d Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Tue, 9 Jan 2024 15:09:27 -0800 Subject: [PATCH] app/testpmd: hide --bitrate-stats in help if disabled [ upstream commit e96491cb91fd048a79e848d713d65d45f0dde915 ] Like other #ifdef options, bitrate-stats should not be printed in help if not configured. Also reordered latencystats help string to group it with bitrate-stats. Fixes: e25e6c70fb56 ("app/testpmd: add --bitrate-stats option") Signed-off-by: Stephen Hemminger Acked-by: Ferruh Yigit --- app/test-pmd/parameters.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/app/test-pmd/parameters.c b/app/test-pmd/parameters.c index e3c9757f3f..79ba728f69 100644 --- a/app/test-pmd/parameters.c +++ b/app/test-pmd/parameters.c @@ -113,8 +113,4 @@ usage(char* progname) "If the drop-queue doesn't exist, the packet is dropped. " "By default drop-queue=127.\n"); -#ifdef RTE_LIB_LATENCYSTATS - printf(" --latencystats=N: enable latency and jitter statistics " - "monitoring on forwarding lcore id N.\n"); -#endif printf(" --disable-crc-strip: disable CRC stripping by hardware.\n"); printf(" --enable-scatter: enable scattered Rx.\n"); @@ -177,6 +173,12 @@ usage(char* progname) printf(" --no-lsc-interrupt: disable link status change interrupt.\n"); printf(" --no-rmv-interrupt: disable device removal interrupt.\n"); +#ifdef RTE_LIB_BITRATESTATS printf(" --bitrate-stats=N: set the logical core N to perform " "bit-rate calculation.\n"); +#endif +#ifdef RTE_LIB_LATENCYSTATS + printf(" --latencystats=N: enable latency and jitter statistics " + "monitoring on forwarding lcore id N.\n"); +#endif printf(" --print-event : " "enable print of designated event or all of them.\n"); -- 2.43.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-05 14:08:55.793175386 +0000 +++ 0048-app-testpmd-hide-bitrate-stats-in-help-if-disabled.patch 2024-03-05 14:08:54.674520829 +0000 @@ -1 +1 @@ -From e96491cb91fd048a79e848d713d65d45f0dde915 Mon Sep 17 00:00:00 2001 +From 2597a7df7c42e851ed9dbdc63ae01e0a5470963d Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e96491cb91fd048a79e848d713d65d45f0dde915 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index a9ca58339d..11b0cce577 100644 +index e3c9757f3f..79ba728f69 100644 @@ -24,4 +25,3 @@ -@@ -101,8 +101,4 @@ usage(char* progname) - printf(" --eth-peer=X,M:M:M:M:M:M: set the MAC address of the X peer " - "port (0 <= X < %d).\n", RTE_MAX_ETHPORTS); --#endif +@@ -113,8 +113,4 @@ usage(char* progname) + "If the drop-queue doesn't exist, the packet is dropped. " + "By default drop-queue=127.\n"); @@ -31 +31 @@ - #endif +-#endif @@ -33 +33,2 @@ -@@ -168,6 +164,12 @@ usage(char* progname) + printf(" --enable-scatter: enable scattered Rx.\n"); +@@ -177,6 +173,12 @@ usage(char* progname) @@ -44 +45 @@ - printf(" --print-event : " + printf(" --print-event : "