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 28B0441E9F for ; Wed, 15 Mar 2023 15:37:07 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2526E42D0C; Wed, 15 Mar 2023 15:37:07 +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 ACC2342BAC 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=wUrYAuuV9w4M1kVW1TDpoVB8N3KWqRe/k1FE9PP9fdY=; b=V3zP7zKCEB0mnCGdJ83EfGag+XqGO3UIj9l6qoraSLuoesI6Stln9ozGhJa4bxoickv0QC VYIBLc41fc7H6F67uTdh+f6Xve7v37gOa9usgD0QdjRr//dnJDfqNh59+bCbkskUMI5uIX fr1qcGylQgDQt2eOU8t5X/tADa3gF/s= 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-524-qkrQ-M7dOb2N0v2av1qosg-1; Wed, 15 Mar 2023 10:37:02 -0400 X-MC-Unique: qkrQ-M7dOb2N0v2av1qosg-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 455C682799A; Wed, 15 Mar 2023 14:37:01 +0000 (UTC) Received: from rh.Home (unknown [10.39.192.83]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7EA5540C6E67; Wed, 15 Mar 2023 14:37:00 +0000 (UTC) From: Kevin Traynor To: David Marchand Cc: Ferruh Yigit , dpdk stable Subject: patch 'app/testpmd: fix Tx preparation in checksum engine' has been queued to stable release 21.11.4 Date: Wed, 15 Mar 2023 14:36:07 +0000 Message-Id: <20230315143640.677317-14-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/0a4ce1a382b90ad599732f317cbcecc5b7e23fb4 Thanks. Kevin --- >From 0a4ce1a382b90ad599732f317cbcecc5b7e23fb4 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Mon, 20 Feb 2023 19:34:54 +0100 Subject: [PATCH] app/testpmd: fix Tx preparation in checksum engine [ upstream commit 88a0b0f3858bf430616fe2bcac6f3eee05c383f5 ] "unprepared" packets could get to the wire in the retry loop. Split packets freeing in two stages: one for preparation failure, and one for transmission failure. Adjust dropped counter update accordingly. Fixes: 6b520d54ebfe ("app/testpmd: use Tx preparation in checksum engine") Signed-off-by: David Marchand Reviewed-by: Ferruh Yigit --- app/test-pmd/csumonly.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/app/test-pmd/csumonly.c b/app/test-pmd/csumonly.c index 0a72690c37..80d4d415bd 100644 --- a/app/test-pmd/csumonly.c +++ b/app/test-pmd/csumonly.c @@ -1159,8 +1159,11 @@ tunnel_update: nb_prep = rte_eth_tx_prepare(fs->tx_port, fs->tx_queue, tx_pkts_burst, nb_rx); - if (nb_prep != nb_rx) + if (nb_prep != nb_rx) { fprintf(stderr, "Preparing packet burst to transmit failed: %s\n", rte_strerror(rte_errno)); + fs->fwd_dropped += (nb_rx - nb_prep); + rte_pktmbuf_free_bulk(&tx_pkts_burst[nb_prep], nb_rx - nb_prep); + } nb_tx = rte_eth_tx_burst(fs->tx_port, fs->tx_queue, tx_pkts_burst, @@ -1170,10 +1173,10 @@ tunnel_update: * Retry if necessary */ - if (unlikely(nb_tx < nb_rx) && fs->retry_enabled) { + if (unlikely(nb_tx < nb_prep) && fs->retry_enabled) { retry = 0; - while (nb_tx < nb_rx && retry++ < burst_tx_retry_num) { + while (nb_tx < nb_prep && retry++ < burst_tx_retry_num) { rte_delay_us(burst_tx_delay_time); nb_tx += rte_eth_tx_burst(fs->tx_port, fs->tx_queue, - &tx_pkts_burst[nb_tx], nb_rx - nb_tx); + &tx_pkts_burst[nb_tx], nb_prep - nb_tx); } } @@ -1185,9 +1188,9 @@ tunnel_update: inc_tx_burst_stats(fs, nb_tx); - if (unlikely(nb_tx < nb_rx)) { - fs->fwd_dropped += (nb_rx - nb_tx); + if (unlikely(nb_tx < nb_prep)) { + fs->fwd_dropped += (nb_prep - nb_tx); do { rte_pktmbuf_free(tx_pkts_burst[nb_tx]); - } while (++nb_tx < nb_rx); + } while (++nb_tx < nb_prep); } -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-03-15 14:30:20.952595514 +0000 +++ 0014-app-testpmd-fix-Tx-preparation-in-checksum-engine.patch 2023-03-15 14:30:20.567123637 +0000 @@ -1 +1 @@ -From 88a0b0f3858bf430616fe2bcac6f3eee05c383f5 Mon Sep 17 00:00:00 2001 +From 0a4ce1a382b90ad599732f317cbcecc5b7e23fb4 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 88a0b0f3858bf430616fe2bcac6f3eee05c383f5 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index 1c24598515..90a59e0aa5 100644 +index 0a72690c37..80d4d415bd 100644 @@ -25 +26 @@ -@@ -1169,8 +1169,11 @@ tunnel_update: +@@ -1159,8 +1159,11 @@ tunnel_update: @@ -38 +39 @@ -@@ -1180,10 +1183,10 @@ tunnel_update: +@@ -1170,10 +1173,10 @@ tunnel_update: @@ -52 +53 @@ -@@ -1195,9 +1198,9 @@ tunnel_update: +@@ -1185,9 +1188,9 @@ tunnel_update: