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 CDA7B43B7D for ; Tue, 5 Mar 2024 11:00:34 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C899A4026B; Tue, 5 Mar 2024 11:00:34 +0100 (CET) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2081.outbound.protection.outlook.com [40.107.92.81]) by mails.dpdk.org (Postfix) with ESMTP id BD08A4014F for ; Tue, 5 Mar 2024 11:00:32 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZDxGpZRVfKhWj4brV6Y6PsEQ0WJkyHtx2GfQAAkrO0TAVyuWRhN7q9aD3dePjBPh1bOy/IK5sTwNIVSKFsZPgK9jccUZMv+KUzSAPp3rAGson9I/2aXym3f/dr+u9OzeONmvV+MmxXW6gLVvg6II+ylgVXe/KvhxlelGZk1smmcQ8HPh98PJNKC59atBcpJ6WLJ+ND3jsDIyPeZtapgUpRfrfiIyMkYg/BMl92B6kz+a5R8u3OAYPxyHbRoFnzFEazq8YoLXfl44kXZUXIFhYlf/E/8doSlN00IrQYgiyJUqc2B1j18LnwXlD5uMXZKDLDvTOkWc6tQzAKbWNDzKLg== 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=TKqUCTXGL1fCHWsbBdeOdJsdV58lf4P6Gn2BOO/PrgM=; b=eoZsvy/NLHRHe2el3iL2yjBk2Pk/95ukTBYqvH3G5VDP4JiLo5RuoWYneKMAW/t+yYbEr1dF1WlsfQd5jVMYKZtqM3mjtYrqJ6XuB+ltbZALYFTZZYPyd8a7hK0iQEJtJHYTp3Nha9gzy/sIKD9i5ivk7bsRmw8U6CzsKE9x6NfJd/pNMcriEYC2EqHkHABIF9D7Pv+1Pm97EQzxdFVkojn/O1/ch8/6043Czx2wMPIlndGXY4jert4rbL0LdpWXO+ChrMHz3ULIFi9WP1PcvH8yQv13/2+sIpNuW9rwYnAnhUS9f8hPL12Y4nuVuudjtyXFTu/HsRfPyPujLruKjw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=gmail.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) 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=TKqUCTXGL1fCHWsbBdeOdJsdV58lf4P6Gn2BOO/PrgM=; b=WX7fXJSNweXnmJ4Y/6mn6G9skXAG425VTx49vAE+AvMUIvUsnF9BH8yKKsgHVxNMIXPjF0IMU196+xtX6rLxGg5AaXQZ75W9hQNmaZ5Ne6+dQxxWP30L+sMQKtbZ+CHz3fuOPP7CIHutnF11l3fAWsdN1JzyPRqz1wa7THt9vGCyO7taKobXmkqA/N8mN77XafdHJ/Cy8210xDpktIGhx9+9RDYAqRj4hjLsC1gqNbq4r7/b9YopOF1Vfx9GS5ZrecA8jnA3tkrKDJQ7VbNw4AaAxz3cDq344gROu3jKkBDapfyZL5UQZbZwd0go9Nl7xtjEVczZSIzbqc8oQnT6Ag== Received: from SA0PR11CA0139.namprd11.prod.outlook.com (2603:10b6:806:131::24) by DS0PR12MB8071.namprd12.prod.outlook.com (2603:10b6:8:df::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.38; Tue, 5 Mar 2024 10:00:30 +0000 Received: from SA2PEPF0000150A.namprd04.prod.outlook.com (2603:10b6:806:131:cafe::b0) by SA0PR11CA0139.outlook.office365.com (2603:10b6:806:131::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.38 via Frontend Transport; Tue, 5 Mar 2024 10:00:29 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) 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.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by SA2PEPF0000150A.mail.protection.outlook.com (10.167.242.42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.11 via Frontend Transport; Tue, 5 Mar 2024 10:00:29 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Tue, 5 Mar 2024 02:00:11 -0800 Received: from nvidia.com (10.126.231.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.12; Tue, 5 Mar 2024 02:00:09 -0800 From: Xueming Li To: Kumara Parameshwaran CC: Ferruh Yigit , dpdk stable Subject: patch 'app/testpmd: fix GRO packets flush on timeout' has been queued to stable release 23.11.1 Date: Tue, 5 Mar 2024 17:47:57 +0800 Message-ID: <20240305094757.439387-137-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240305094757.439387-1-xuemingl@nvidia.com> References: <20240305094757.439387-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SA2PEPF0000150A:EE_|DS0PR12MB8071:EE_ X-MS-Office365-Filtering-Correlation-Id: afb5d385-fa1d-4fce-8a45-08dc3cfb16ef X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: i/N9LcE5BEIEJpICiSb+fWpgNmedTG25md0AepAOWnip7nyhnPJMUY10WI3tkBVlmwgs6o/yfxsLKjhO00R5CQ6ujgQ+2R6aD2/3AAX+hD9ldnZSqzixBZcFGsECsRfhtR8guLS9yMigkxzktSv+Qnmk/7usKoJL+ECYlU5/jiaFmGqdxO3q3V6G9zAnL615eyUYXeyHfaPx9/KjWz/mb/bMi/smhSvawyJNVS8y2WTOR3WT/EsP4TZd7rsWqX23GcgLpep76/tlUjTccLZlO7KAFPZKX4ZuuZ5kklX3ZvuYjjT7goxvj9z8mZ9jPylS+G24EgxNr7x/UELsIHTSgcYi7+jyOj6eljRW/8KsTkf+aR1SyVjVpo0fo/RMDC81rhO+zHzj5H9gf8/rrah5mQTig952fL+JDANH+EhtPiY1VuIjIzXObaHLCFlbRr0KywWCIYBMZBDFV3nB/dz+hsDBvwpMSdJIOW0wPasjVZgpihlvTPo9GfOQZeq5KTY7QktzWGp+G0vxu8CdKbCwuX0ZM6mxMgG44mV336eIoqZ5J5yx46CbUDVnqnYJ/U+uqqSyQhSV3kdsZKHORQ8ew6Qyl9NCTZ3ubSAECEQ1HJBwz401Sse2BhNAOPQKmellzqlwr4biFZUZmD27v1O7I4I30p1I43q+iKOs1REf+q/PvRaL0oVjTG2oaBhtnRUIBl9QMSf6esY+aEMpaeHyKyprMFmKbIWpzAxUq6L8MhC36/eEH59eZn50YFkchDhl X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230031)(376005)(36860700004)(82310400014); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Mar 2024 10:00:29.7616 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: afb5d385-fa1d-4fce-8a45-08dc3cfb16ef X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SA2PEPF0000150A.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB8071 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 23.11.1 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/31/24. 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://git.dpdk.org/dpdk-stable/log/?h=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=05bea47b81f3f38d07cb3aedc6fc2a578c3caae8 Thanks. Xueming Li --- >From 05bea47b81f3f38d07cb3aedc6fc2a578c3caae8 Mon Sep 17 00:00:00 2001 From: Kumara Parameshwaran Date: Fri, 16 Feb 2024 09:17:50 +0530 Subject: [PATCH] app/testpmd: fix GRO packets flush on timeout Cc: Xueming Li [ upstream commit 461c287ab55303bad1e68bd1dfac6e6ec27953c3 ] In heavy-weight mode GRO which is based on timer, the GRO packets will not be flushed in spite of timer expiry if there is no packet in the current poll. If timer mode GRO is enabled the rte_gro_timeout_flush API should be invoked. Fixes: b7091f1dcfbc ("app/testpmd: enable the heavyweight mode TCP/IPv4 GRO") Signed-off-by: Kumara Parameshwaran Reviewed-by: Ferruh Yigit --- app/test-pmd/csumonly.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/app/test-pmd/csumonly.c b/app/test-pmd/csumonly.c index 21210aff43..d73f08b2c6 100644 --- a/app/test-pmd/csumonly.c +++ b/app/test-pmd/csumonly.c @@ -870,16 +870,28 @@ pkt_burst_checksum_forward(struct fwd_stream *fs) /* receive a burst of packet */ nb_rx = common_fwd_stream_receive(fs, pkts_burst, nb_pkt_per_burst); - if (unlikely(nb_rx == 0)) + if (unlikely(nb_rx == 0)) { +#ifndef RTE_LIB_GRO return false; +#else + gro_enable = gro_ports[fs->rx_port].enable; + /* + * Check if packets need to be flushed in the GRO context + * due to a timeout. + * + * Continue only in GRO heavyweight mode and if there are + * packets in the GRO context. + */ + if (!gro_enable || (gro_flush_cycles == GRO_DEFAULT_FLUSH_CYCLES) || + (rte_gro_get_pkt_count(current_fwd_lcore()->gro_ctx) == 0)) + return false; +#endif + } rx_bad_ip_csum = 0; rx_bad_l4_csum = 0; rx_bad_outer_l4_csum = 0; rx_bad_outer_ip_csum = 0; -#ifdef RTE_LIB_GRO - gro_enable = gro_ports[fs->rx_port].enable; -#endif txp = &ports[fs->tx_port]; tx_offloads = txp->dev_conf.txmode.offloads; @@ -1110,6 +1122,7 @@ tunnel_update: } #ifdef RTE_LIB_GRO + gro_enable = gro_ports[fs->rx_port].enable; if (unlikely(gro_enable)) { if (gro_flush_cycles == GRO_DEFAULT_FLUSH_CYCLES) { nb_rx = rte_gro_reassemble_burst(pkts_burst, nb_rx, -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-05 17:39:35.071099836 +0800 +++ 0136-app-testpmd-fix-GRO-packets-flush-on-timeout.patch 2024-03-05 17:39:31.093566504 +0800 @@ -1 +1 @@ -From 461c287ab55303bad1e68bd1dfac6e6ec27953c3 Mon Sep 17 00:00:00 2001 +From 05bea47b81f3f38d07cb3aedc6fc2a578c3caae8 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 461c287ab55303bad1e68bd1dfac6e6ec27953c3 ] @@ -14 +16,0 @@ -Cc: stable@dpdk.org