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 9447741EA5 for ; Wed, 15 Mar 2023 23:46:53 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9050242B8E; Wed, 15 Mar 2023 23:46:53 +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 755C140141 for ; Wed, 15 Mar 2023 23:46:52 +0100 (CET) Received: by mail-wm1-f51.google.com with SMTP id x22so16937wmj.3 for ; Wed, 15 Mar 2023 15:46:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678920412; 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=XbrkssmVYiJIcCakxL7KfNKHUZJqoy/kqkTcdUgwJ8c=; b=TBZI9uewVTYzlDtPdIYrKyt3JOJMl9qQuk30hDM2Te0PQyowFMW4BmozsqIhpvMPWx xVQOG/OF/b56DSELLT2VkwvK11Z0sS5ImdqfbXlJPOIXm7z8EgRDbuVx7iH7+jNCKBzq I8wtMpI59Jv3P8WlhCJrNOZ5ughTxLDhYc4JW01NNWI0Exopt3UnUYbgeEG4smd1dKoO 2LHeT26kZv3Kv9UIsAoaca14neUNk+2UIZ/Mjg6mBz0Yq1mKT9kXu5in37YZrNJHYbsr 5JriQ9cG98GAOBvsefx1Cg2JzcTjaGVurjKYvii8hbh+hKfEzjOBHyX3is0uQJM+f8vO 2/dg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678920412; 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=XbrkssmVYiJIcCakxL7KfNKHUZJqoy/kqkTcdUgwJ8c=; b=o7XVPs3cqntB3TcP5W7L4lyDmcx6b+GkkMsAKykdOGMW2pZkv/9RNhG4ikNk7JxcZp vI0Ag1FOkV47k44w69dRBYxLwDVozXGX2MQCocf7TAhqTko6ePFuQ1K2olQXKEavsKSo HMfcsKT4+USqrUQ7JOySCuQzFx+jv9RxN6B3YKbOwsfxY+hmFlt2WY2XKTULGlNa65Vp 7958MVgIX3ou8SvGSU09vDkMgcwTIDhCt/WD8+RPC8KsxunxKMhb0jy46YayoO4IRZLQ +EIHqijPQqEd9m8Bav6lnKcJh23R1nYGc8odldCIvEO1SMnA2iFUlHBo0QyB+mw0SUoA QsIw== X-Gm-Message-State: AO0yUKU0y787ls60nTHx/VxB3cSy+44/MEuSXXyexkWoz3r1Hcw3Ug55 B3zz5YR6D0XkM2kJX5YktX6eSwLT/Wfyeg== X-Google-Smtp-Source: AK7set+opm066D/09sBDD68wQnh1al1CfqWh743Ol//ffbluD0WeTQJsbKFy6xXlazxYF2q5g1ci3g== X-Received: by 2002:a05:600c:45d2:b0:3ed:2a8f:e6dd with SMTP id s18-20020a05600c45d200b003ed2a8fe6ddmr8216202wmo.6.1678920412034; Wed, 15 Mar 2023 15:46:52 -0700 (PDT) Received: from localhost ([137.220.119.58]) by smtp.gmail.com with ESMTPSA id p8-20020a7bcc88000000b003e22508a343sm3113902wma.12.2023.03.15.15.46.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Mar 2023 15:46:51 -0700 (PDT) From: luca.boccassi@gmail.com To: David Marchand Cc: Ferruh Yigit , dpdk stable Subject: patch 'app/testpmd: fix Tx preparation in checksum engine' has been queued to stable release 20.11.8 Date: Wed, 15 Mar 2023 22:46:00 +0000 Message-Id: <20230315224631.1025649-9-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230315224631.1025649-1-luca.boccassi@gmail.com> References: <20230223093715.3926893-71-luca.boccassi@gmail.com> <20230315224631.1025649-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 20.11.8 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/17/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/609789aebdf2a1aa9944fab0e9a6704d258d17a0 Thanks. Luca Boccassi --- >From 609789aebdf2a1aa9944fab0e9a6704d258d17a0 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 aa1c60e7b3..7a91fcb63f 100644 --- a/app/test-pmd/csumonly.c +++ b/app/test-pmd/csumonly.c @@ -1133,9 +1133,12 @@ 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) { printf("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, nb_prep); @@ -1143,12 +1146,12 @@ 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); } } fs->tx_packets += nb_tx; @@ -1157,11 +1160,11 @@ tunnel_update: fs->rx_bad_outer_l4_csum += rx_bad_outer_l4_csum; 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); } get_end_cycles(fs, start_tsc); -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-03-15 22:44:50.159222075 +0000 +++ 0009-app-testpmd-fix-Tx-preparation-in-checksum-engine.patch 2023-03-15 22:44:49.519848919 +0000 @@ -1 +1 @@ -From 88a0b0f3858bf430616fe2bcac6f3eee05c383f5 Mon Sep 17 00:00:00 2001 +From 609789aebdf2a1aa9944fab0e9a6704d258d17a0 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 aa1c60e7b3..7a91fcb63f 100644 @@ -25 +26 @@ -@@ -1168,10 +1168,13 @@ tunnel_update: +@@ -1133,9 +1133,12 @@ tunnel_update: @@ -31,3 +32,2 @@ - fprintf(stderr, - "Preparing packet burst to transmit failed: %s\n", - rte_strerror(rte_errno)); + printf("Preparing packet burst to transmit failed: %s\n", + rte_strerror(rte_errno)); @@ -40 +40 @@ -@@ -1179,12 +1182,12 @@ tunnel_update: +@@ -1143,12 +1146,12 @@ tunnel_update: @@ -56,2 +56,2 @@ -@@ -1194,11 +1197,11 @@ tunnel_update: - fs->rx_bad_outer_ip_csum += rx_bad_outer_ip_csum; +@@ -1157,11 +1160,11 @@ tunnel_update: + fs->rx_bad_outer_l4_csum += rx_bad_outer_l4_csum;