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 E80F643C60 for ; Thu, 7 Mar 2024 02:36:11 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DBE8A42F01; Thu, 7 Mar 2024 02:36:11 +0100 (CET) Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by mails.dpdk.org (Postfix) with ESMTP id 5D1FC42E64 for ; Thu, 7 Mar 2024 02:36:10 +0100 (CET) Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-413007fe6a3so3355305e9.3 for ; Wed, 06 Mar 2024 17:36:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709775370; x=1710380170; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=GQXLkL7p/dvLFNLyaXs/k1LeNNimctjnO42tCpukucs=; b=ZVo1A53o3uDL+jUx9eho9s4eDPzDDV+iC8UpQfMaWLf5V4PwROgKtuRI+/J6RIoshL TNpdWyIziZ4Fm/JUpkkN5jz0XN+0Difi4LWW8qAe2CqUUeEwfOYez6NeTbdS2yym1E/u f4q9oXunPjtUJ32GX+xiJZxhBtAJzIQlCJaPSop0NfkqhD6xoX1xrI4j3gUvhz4v3Zpy id6x3vkbI5f3+5oJQOIxhftYULCumDwDfFVXbPHxo+IDBufTTl3onaBr0PJuj5nIPjYA tnytt7EsCBp+ICm+QyZGrG7igWa5W3brtMoAR5W9Y3IUJ0xrZpAyIGSok85ppRHTyNZ3 Wp2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709775370; x=1710380170; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GQXLkL7p/dvLFNLyaXs/k1LeNNimctjnO42tCpukucs=; b=sSSPSqRggfJcAqpAKVYDufyt3lgLLTNAjfbsDhkq+zwFu1eIUYQeKOVUwodKp5IGb3 U+ILJLUOgzXw/k5taQRI1eDti6ArkD18fcHSD3AdPOsM/+CI9C5R8CukyghImXS5aiZu hbWp/PwC1AXTDdp9bekbegSRaS9zexbw1HMxFho0uoxJ7VkzKkBoDp2hs8nRT2USrB4i ihbVn6OWi4bs4WZxqS8OV0xTwPUIwRkeS/knPDa64cyYTTi3oQnwTr3Q4gDwgO3HG1Yd FWFL8Ga3XopHkQt4RaDcWHb18CLH2jdr+O7Y2S4dtByyk2ar3wbTuyJ9gQf1fWTQONyR DJpg== X-Forwarded-Encrypted: i=1; AJvYcCUMx3HtcHtqrqA3CxQFcXYfLYMouF07DLttt60UT3Iu2RRQYJq6X1rkHlivjHknqBMg6zEVXjTw+02pHM8DfZY= X-Gm-Message-State: AOJu0YxhD3AT2kOVBmT4zQJZ2AuIY1a13NKGt1y/op4fcFa7k/6v68ab kAaaK50MKbDIuXKX9cAq3lYPMui3PYEf4COhwEsbZY+4X6msq8Vb X-Google-Smtp-Source: AGHT+IGxxhX5CCslOw0qSzHs67bggkj2LRdmQNmJ50yApVeJHH/ryHnBiv1k96i/njxQHKEq+i/CmA== X-Received: by 2002:a05:600c:5489:b0:412:d45e:839 with SMTP id iv9-20020a05600c548900b00412d45e0839mr10624679wmb.18.1709775369990; Wed, 06 Mar 2024 17:36:09 -0800 (PST) Received: from localhost ([137.220.120.171]) by smtp.gmail.com with ESMTPSA id bo16-20020a056000069000b0033e422d0963sm8474460wrb.41.2024.03.06.17.36.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Mar 2024 17:36:09 -0800 (PST) From: luca.boccassi@gmail.com 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 22.11.5 Date: Thu, 7 Mar 2024 01:31:27 +0000 Message-Id: <20240307013159.1735343-70-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240307013159.1735343-1-luca.boccassi@gmail.com> References: <20240307013159.1735343-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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.5 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/09/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/6d4646c0f7a0970c20ae9a1cca68d93b11df7815 Thanks. Luca Boccassi --- >From 6d4646c0f7a0970c20ae9a1cca68d93b11df7815 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 d597c209ba..cddcdef045 100644 --- a/app/test-pmd/parameters.c +++ b/app/test-pmd/parameters.c @@ -100,10 +100,6 @@ usage(char* progname) "of peer ports.\n"); 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 -#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"); @@ -167,8 +163,14 @@ usage(char* progname) printf(" --disable-device-start: do not automatically start port\n"); 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"); printf(" --mask-event : " -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-07 01:05:40.779703338 +0000 +++ 0070-app-testpmd-hide-bitrate-stats-in-help-if-disabled.patch 2024-03-07 01:05:34.886941884 +0000 @@ -1 +1 @@ -From e96491cb91fd048a79e848d713d65d45f0dde915 Mon Sep 17 00:00:00 2001 +From 6d4646c0f7a0970c20ae9a1cca68d93b11df7815 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 d597c209ba..cddcdef045 100644