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 7DED6A034F for ; Wed, 10 Nov 2021 07:33:52 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 772FD4068B; Wed, 10 Nov 2021 07:33:52 +0100 (CET) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2065.outbound.protection.outlook.com [40.107.93.65]) by mails.dpdk.org (Postfix) with ESMTP id 0222C40142 for ; Wed, 10 Nov 2021 07:33:50 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=J4LW4K5uTQI1c/9eZxDYXhTeIcfa8gklntqsgJYiBGDG/vbvr3YezR6bnZNUOuA8/cO84TuWDnqIHdF9yG0N0rLMIs6HLAQ+dicD5ULCla5NN52TsiNVTRoXuH45xzyrNOup6R66j3ZOK62GtjkQkE+lvb3O9/KvQtvzHRXbsASZzb/uXqEln+l3nFWyl3xVePOW3DvV9QDRmFoojenzaar2NCevtOtyYDrQzH+IV3U8JAzzKXCpi4LN1jvZzD8pkCk+yc7Max6NwmcrBlk+/oAy24ynUNQ9kWD3J9JLn/HQKNPeQmQnRoW/rSbkbS0pA7//q+3t7tktFAxdUc2qwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=fiGCe3v2XXVkAUSZTn6jB6ENRTQgAUn4/0UNExNs6xM=; b=PK8ZXYS+XSK0U1vamFsJvj+SNjYpSrv0Gfh45y2rfEvIM6/QuMm7mS+TcHMeVIjgcevfccrRCDkjClp7uMuH3hQGFYxRtFa7VGWVgu5NSYl37VBGPnBov04Mvmx5oIChxnPRyLE+uD0yrt8cp+TVDWNpu4UZZoC2Pt2eNyBZjb0F7Hm3k4fMzUDENNEaQfWWvyIvF+3pGqV0TBr1NxXCd4Z0hXo34MBvE5f4uueB+TLIrz64P1+PJy9Di56s2tA+ifk22shhPyA4OPSa/09B2vld8Js8OJ/6ZVyQc+c292fg5Rl7jCe1UKAwFy4nSjxBjBuPCjXdpxqJ5u2P+LRArA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=fiGCe3v2XXVkAUSZTn6jB6ENRTQgAUn4/0UNExNs6xM=; b=awUTgiCeAAldhumUYFgAoa6J0NSBMbd+HNZFq+Izc6BLip0groPkz4+f1GyPFaD3q3DC526SsgH2fQyVqq++NXrlSgJ+j6iRhR6YpAQQpDuqc1//FWyZ8dGTH3TIoKCPFPX+gO6cJg2rICWs1KupYff+KzfMBF+X1CucRFGLjudde///tBa0V+jadIdCpf99L/5Taih0fOl6bgN2YDnYCXIN5/iqoIR/VLKltypZYJyFE529jFgHINbIzy67NKvmTCK1DoJUqPyYdRcw+Rq6u0htI4ZEXZl+OCcAXF14lbo5jt5D+3gqEYlkI8LU5K2pTTBDGhaqjwLen/widI/3IQ== Received: from DS7PR03CA0243.namprd03.prod.outlook.com (2603:10b6:5:3b3::8) by BY5PR12MB3650.namprd12.prod.outlook.com (2603:10b6:a03:1a3::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.15; Wed, 10 Nov 2021 06:33:49 +0000 Received: from DM6NAM11FT013.eop-nam11.prod.protection.outlook.com (2603:10b6:5:3b3:cafe::75) by DS7PR03CA0243.outlook.office365.com (2603:10b6:5:3b3::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.15 via Frontend Transport; Wed, 10 Nov 2021 06:33:49 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by DM6NAM11FT013.mail.protection.outlook.com (10.13.173.142) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4690.15 via Frontend Transport; Wed, 10 Nov 2021 06:33:48 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Wed, 10 Nov 2021 06:33:45 +0000 From: Xueming Li To: Zhihong Wang CC: Luca Boccassi , Xiaoyun Li , dpdk stable Date: Wed, 10 Nov 2021 14:28:15 +0800 Message-ID: <20211110063216.2744012-12-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211110063216.2744012-1-xuemingl@nvidia.com> References: <20211110063216.2744012-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a8d0ee93-f743-4275-c7c4-08d9a4140dc7 X-MS-TrafficTypeDiagnostic: BY5PR12MB3650: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JI6ZIoZgohrMIMl3sW0ygWJfX127ZWdofm22ardD6UbZ5W5KNvrGbwp7o/WwV9na6P3pN2/E2YR24Gz68IT331rNaNvJyqUwo6XR9O4dyyOwD92TixLEdGP0FwcheQC/gQx1cN9rVpjg1F8ZaFu/JUBV9GnoILFMgf7s0siePTecuZBXpbEEqMe1W0W5olaJaj2vER9lXCKWV7tYribyD5kHN/a85R1rNIEDbfGhUYwp7Ov3aty5tYjIXFn3YwNy9Dcm4p3p0WozDsOPmUoBD1K5yKsEwxVvp1wYSbtVRor4aeeej1edT2E+UNJf9+gTowETZbM27K6nEfjXwJmuiZVz750wjP6GDYQ5YaDyVyw9KDZ+v7BigVR0Dx7ReXnrDoF36a+HjHWX0/qggBR4+S2kUVqe4muwfD+PEKzZBnFuHssk4ywx8tl2yRKjlxMC27ZnBWd43ZwnvvxsVwdvjq9GXqdeLYpxlh9t2lLRPO6MTBC6eMCSzKzEHyWr4QNTinH9BWodSsTsWqo9voF1bWMitc3qTuYt6/jYMfqyy9X/cXz9s960/jN07ZAnHo051Bh0mMQKl5gz49a4mx5fq2dfLhhcEUqy+x0R6Z8xn0d0H1DH/AEl8rPrpHdyLdTQnXhlL9AvkKILqF/JRHfCgZjLIy+8iGVgt+X3bJl8jY45f4DnmMVXW7ENnc2OROheXgrosdP3n95boMRkakR1ALiv2D6waqMwJHdTrjs+/ZeOHHcJuBMJF/56/QhIWimoCRZp5fWzqdVeyEAYZ6LwzB7E32LALCfBrTwayo3Q65L1SArDP0YmiYyF4+XUXdzElOPGuECrSX4L0V/0c0m/Vg== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(46966006)(36840700001)(2906002)(1076003)(54906003)(47076005)(4326008)(55016002)(36860700001)(2616005)(356005)(83380400001)(36756003)(6286002)(316002)(82310400003)(336012)(70206006)(426003)(86362001)(4001150100001)(7636003)(6666004)(70586007)(8676002)(26005)(966005)(508600001)(16526019)(8936002)(186003)(5660300002)(7696005)(6916009)(53546011); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Nov 2021 06:33:48.6094 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a8d0ee93-f743-4275-c7c4-08d9a4140dc7 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT013.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB3650 Subject: [dpdk-stable] patch 'app/testpmd: fix Tx retry in flowgen engine' has been queued to stable release 20.11.4 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.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 11/12/21. 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/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/d53332318f5138201e8ae30f405160145eb867ad Thanks. Xueming Li --- >From d53332318f5138201e8ae30f405160145eb867ad 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 Cc: Xueming Li [ 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 cabfc688ff..bb4bf85519 100644 --- a/app/test-pmd/flowgen.c +++ b/app/test-pmd/flowgen.c @@ -181,12 +181,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.33.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-10 14:17:02.630682792 +0800 +++ 0011-app-testpmd-fix-Tx-retry-in-flowgen-engine.patch 2021-11-10 14:17:01.750747073 +0800 @@ -1 +1 @@ -From ea275674a0c65dad334c8ab55ddd1d5a7e243af6 Mon Sep 17 00:00:00 2001 +From d53332318f5138201e8ae30f405160145eb867ad Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit ea275674a0c65dad334c8ab55ddd1d5a7e243af6 ] @@ -9 +11,0 @@ -Cc: stable@dpdk.org @@ -18 +20 @@ -index 3bf6e1ce97..f2e6255c36 100644 +index cabfc688ff..bb4bf85519 100644 @@ -21 +23 @@ -@@ -192,12 +192,12 @@ pkt_burst_flow_gen(struct fwd_stream *fs) +@@ -181,12 +181,12 @@ pkt_burst_flow_gen(struct fwd_stream *fs)