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 D2CE5A0C45 for ; Tue, 30 Nov 2021 17:36:37 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CCD9C410F7; Tue, 30 Nov 2021 17:36:37 +0100 (CET) Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by mails.dpdk.org (Postfix) with ESMTP id 53FBA41177 for ; Tue, 30 Nov 2021 17:36:36 +0100 (CET) Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) (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 smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id BB9063F1B2 for ; Tue, 30 Nov 2021 16:36:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1638290195; bh=2+YDkr+WoxJ822TS3GNBKnU1gt8YLEcdt1saWMHEVuQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=fo2qAHw2Pt3OfMK6fzf9wlMY4g0MKlMovnA9eZ+macfusatvKyozJlIElfm/nb3wl 5kLrgRgp1y981qopxTGpFQWOJnGeZZduqwRBn6jMkSxRhcwGGKMerhrNf8B8NE52iY iq9+21TBWmOj0C05vfOGHT7oszytFNI5KGDNC1AtQSZUHyc1/+BIOSU+syXHS/nfMI SgAx3CvwyRsJud+UO0pY5+hUCHjsUJ/jDFWnVX6pbsJJ44gIglmKVAeQ9I/sPBpsWY xT+f87Hhk+byaeQXo7TVMk3tulIq/8ykxiec3mDJwfcQMidqtnyS8U22FKN379NSN5 wAkuEJCnGtHiw== Received: by mail-ed1-f71.google.com with SMTP id m17-20020aa7d351000000b003e7c0bc8523so17442275edr.1 for ; Tue, 30 Nov 2021 08:36:35 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2+YDkr+WoxJ822TS3GNBKnU1gt8YLEcdt1saWMHEVuQ=; b=3xd+oz/G2OTb2dYom6nR3WoKbld/CP/4/7k6Cjx6NB/dbORMgjtW7yYLVowAkMigYA xqTrVcxYWAaGU10ii7qCfl8gNUbYhsFONEGRJN8mx/2pe6elnX5REJqXKu6Svwyb4xmV D5BoPThwqRoOpXnXe4HvtmGsUfn2PlN4Vn+WrD7DUsrCmzVRGLewUM6X9oxKNPvxWhC7 otorB2dXqx5M3+C3CkwwnCRq7InFEolEhIFgYbAxb0obbU9r0nIWeHi7oMBgwWtzES1n +DH0DUdXKuuMeA/sJCgxIfNbyi/4PO1BKdRvQfDTpE/oGH0q1cdW7qfJLNb4lPOqNGoT pLRA== X-Gm-Message-State: AOAM530Iwgbi5pGKCACf76l8zR4VzwBfR11Tu9Av5vJnATwwoW2Ckgfl PaGfGcyQKXSRjGLcRvAechbFQM/WAIsgBKhJImaZktugTI5jeUBS5j7DGEJeCYbPYUlWLWyG7ku l/mlVuRirur0l0l5nmP/7eb7S X-Received: by 2002:a17:906:dc8d:: with SMTP id cs13mr174607ejc.109.1638290194319; Tue, 30 Nov 2021 08:36:34 -0800 (PST) X-Google-Smtp-Source: ABdhPJwIr2E6XPpIuAAnz/KiKxYcGyI3czE1DtzqNCILjau5zUiQGhQepexQDdF53khHXPHIGGAUMg== X-Received: by 2002:a17:906:dc8d:: with SMTP id cs13mr174593ejc.109.1638290194126; Tue, 30 Nov 2021 08:36:34 -0800 (PST) Received: from localhost.localdomain ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id e13sm9224302eje.95.2021.11.30.08.36.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Nov 2021 08:36:33 -0800 (PST) From: christian.ehrhardt@canonical.com To: Zhihong Wang Cc: Xiaoyun Li , dpdk stable Subject: patch 'app/testpmd: fix Tx retry in flowgen engine' has been queued to stable release 19.11.11 Date: Tue, 30 Nov 2021 17:33:31 +0100 Message-Id: <20211130163605.2460997-7-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211130163605.2460997-1-christian.ehrhardt@canonical.com> References: <20211130163605.2460997-1-christian.ehrhardt@canonical.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 19.11.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before December 10th 2021. 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/92f8daa19fbabbdb847b4317db01f6cda791beb1 Thanks. Christian Ehrhardt --- >From 92f8daa19fbabbdb847b4317db01f6cda791beb1 Mon Sep 17 00:00:00 2001 From: Zhihong Wang Date: Fri, 13 Aug 2021 16:05:45 +0800 Subject: [PATCH] app/testpmd: fix Tx retry in flowgen engine [ upstream commit ea275674a0c65dad334c8ab55ddd1d5a7e243af6 ] Fix tx_pkt number in tx retry logic. Fixes: bf56fce1fb45 ("app/testpmd: add retry option") Signed-off-by: Zhihong Wang Acked-by: Xiaoyun Li --- app/test-pmd/flowgen.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/test-pmd/flowgen.c b/app/test-pmd/flowgen.c index 3e1335b627..ac00f61a92 100644 --- a/app/test-pmd/flowgen.c +++ b/app/test-pmd/flowgen.c @@ -186,12 +186,12 @@ pkt_burst_flow_gen(struct fwd_stream *fs) /* * Retry if necessary */ - if (unlikely(nb_tx < nb_rx) && fs->retry_enabled) { + if (unlikely(nb_tx < nb_pkt) && fs->retry_enabled) { retry = 0; - while (nb_tx < nb_rx && retry++ < burst_tx_retry_num) { + while (nb_tx < nb_pkt && retry++ < burst_tx_retry_num) { rte_delay_us(burst_tx_delay_time); nb_tx += rte_eth_tx_burst(fs->tx_port, fs->tx_queue, - &pkts_burst[nb_tx], nb_rx - nb_tx); + &pkts_burst[nb_tx], nb_pkt - nb_tx); } } fs->tx_packets += nb_tx; -- 2.34.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-30 16:50:06.575406750 +0100 +++ 0007-app-testpmd-fix-Tx-retry-in-flowgen-engine.patch 2021-11-30 16:50:05.510871476 +0100 @@ -1 +1 @@ -From ea275674a0c65dad334c8ab55ddd1d5a7e243af6 Mon Sep 17 00:00:00 2001 +From 92f8daa19fbabbdb847b4317db01f6cda791beb1 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit ea275674a0c65dad334c8ab55ddd1d5a7e243af6 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index 3bf6e1ce97..f2e6255c36 100644 +index 3e1335b627..ac00f61a92 100644 @@ -21 +22 @@ -@@ -192,12 +192,12 @@ pkt_burst_flow_gen(struct fwd_stream *fs) +@@ -186,12 +186,12 @@ pkt_burst_flow_gen(struct fwd_stream *fs)