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 EE6AB41E9F for ; Wed, 15 Mar 2023 15:37:06 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EA4FF427F5; Wed, 15 Mar 2023 15:37:06 +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 84D6E40A7A for ; Wed, 15 Mar 2023 15:37:05 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678891025; 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=2hQhzMU6CKN65aBfEujvJ/ZYgdKNPCQa4C2c2oZBfIw=; b=Xu7frBwYTvz4EEXgLZI0FFrZ5RcuqUqkBYkU7bgGuDiiwx+v/uNuCP9N8yUgH4DkyOoweO +41r2aopk8g9A6lM+n/m6/cnKA6sb48us1I+4wpq5cHUhxkrkiG6OePQ9xyiTbu7O0SBFa MJpjwHomuj0TBN+jMiFD5Mw6qb29PyU= 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-206-V0IA_HmZO6uwQxJBT_0qlg-1; Wed, 15 Mar 2023 10:37:03 -0400 X-MC-Unique: V0IA_HmZO6uwQxJBT_0qlg-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 5A95D82DFC5; Wed, 15 Mar 2023 14:37:03 +0000 (UTC) Received: from rh.Home (unknown [10.39.192.83]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9481140C6E67; Wed, 15 Mar 2023 14:37:02 +0000 (UTC) From: Kevin Traynor To: David Marchand Cc: Ferruh Yigit , dpdk stable Subject: patch 'app/testpmd: fix packet transmission in noisy VNF engine' has been queued to stable release 21.11.4 Date: Wed, 15 Mar 2023 14:36:09 +0000 Message-Id: <20230315143640.677317-16-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/4b158390a6da5ad362dc4b7616de9c737344a126 Thanks. Kevin --- >From 4b158390a6da5ad362dc4b7616de9c737344a126 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Mon, 20 Feb 2023 19:34:57 +0100 Subject: [PATCH] app/testpmd: fix packet transmission in noisy VNF engine [ upstream commit c2acd2db16cba89f403a980da5f4b6764085b01d ] nb_rx relates to the number of packets received from the driver. nb_tx is the total number of packets transmitted by this forward engine. Fix the retry stage, for dequeued packets, as it was incorrectly passing nb_rx / nb_tx as bounds of the tmp_pkts[] array, and fix tx stats accordingly. Fixes: 3c156061b938 ("app/testpmd: add noisy neighbour forwarding mode") Signed-off-by: David Marchand Reviewed-by: Ferruh Yigit --- app/test-pmd/noisy_vnf.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/test-pmd/noisy_vnf.c b/app/test-pmd/noisy_vnf.c index d70940006d..1be5f77efe 100644 --- a/app/test-pmd/noisy_vnf.c +++ b/app/test-pmd/noisy_vnf.c @@ -214,7 +214,8 @@ flush: tmp_pkts, nb_deqd); if (unlikely(sent < nb_deqd) && fs->retry_enabled) - nb_tx += do_retry(nb_rx, nb_tx, tmp_pkts, fs); - inc_tx_burst_stats(fs, nb_tx); + sent += do_retry(nb_deqd, sent, tmp_pkts, fs); + inc_tx_burst_stats(fs, sent); fs->fwd_dropped += drop_pkts(tmp_pkts, nb_deqd, sent); + nb_tx += sent; ncf->prev_time = rte_get_timer_cycles(); } -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-03-15 14:30:20.998407063 +0000 +++ 0016-app-testpmd-fix-packet-transmission-in-noisy-VNF-eng.patch 2023-03-15 14:30:20.568123640 +0000 @@ -1 +1 @@ -From c2acd2db16cba89f403a980da5f4b6764085b01d Mon Sep 17 00:00:00 2001 +From 4b158390a6da5ad362dc4b7616de9c737344a126 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit c2acd2db16cba89f403a980da5f4b6764085b01d ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index ce5a3e5e69..0e72dc034f 100644 +index d70940006d..1be5f77efe 100644 @@ -26 +27 @@ -@@ -218,7 +218,8 @@ flush: +@@ -214,7 +214,8 @@ flush: