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 B557043B7D for ; Tue, 5 Mar 2024 10:56:34 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AF90340A89; Tue, 5 Mar 2024 10:56:34 +0100 (CET) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2073.outbound.protection.outlook.com [40.107.244.73]) by mails.dpdk.org (Postfix) with ESMTP id 905604014F for ; Tue, 5 Mar 2024 10:56:33 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hf7Tlc/PlbAZazu0/1tYjhbCmVAb+jpAJmQay8K2F8wOYlFihdixNtYJhLmzZKUdVoiTyH4ND7LpVPjGyi48/ZvF/ZZM4cdqHXitJlogAo5h6FE+A8ds9oRnlsP5aC9/LK6tm/ssUabLqrjdvzVfrqcAKZBq6s/OEqnCZRisaXnQbkmRe6nW0X1eGi0smvefMJzh5kJyFWTAqgt6oRXmgqph1UNkHJGa0LvvVgMtqyttDfylLbPhsHqdZwNfdVsN7nto3zzJKdEplAAjowLLHCSKoLRlNAz2tG8S5vFH2F3Ecf56QAjaDfJAYo7KF5BYsXCawik7VOBWpqK+6bpxdg== 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=CzN8uqzpwKKhZD6d4SbrRCdGlRA/GtE1Zj9GMB/s3kI=; b=UO+cGsiMpckdDHZCirb+d7CAN+XgnC+knNWjBGbv5az6hYXlmjgA8RpwGPvxLX0/tFyQkb+VgN3f6d+mAKOf/zYTqZembw+qL8z+HfUM8ccRQtBppmYhhMC+4UzblDnfofieIG9WqM9lqt3UDXgWqEts0xDqc9zsujhNee8D7OcxzgZ45/Dq/WA8o2UfjMDLNEBvtS8+j19ApRvJVxXerRQM3HJ5/Gy0Yp26pgJPfoRpa7slBQ4JVnHmku78yY11ePJDwuzmUDEEwTU/TYfzqEjiKHHXUHz6zcKuvngmR7Rc+rIdWMVbH/q+aiTrubb7skX5FT26OJZixDI0STiElA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=corigine.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=CzN8uqzpwKKhZD6d4SbrRCdGlRA/GtE1Zj9GMB/s3kI=; b=S2FJEaqR5XWTvKrPhpHgauf59HJQ43Px+sJ7dm/oaV2inHB6ntMpiID9GFYo934Q19+LGsf0I1g11VokmcxMLDDNjcl9bEZtlrm7teVQ511o/is4A7p5tMtk9Glwzmk0WViBlVVmVYMyBx2d+iQLPI8SP41NPxd4OmbDmEjYX4U0zBXITqj8FhgwKPG5j1C79Ygo3etJG6h1rVVDQrXxANcnBurDc4ho0Vv84b7etPQX1acW5jGNdDQu0+/QiOqCSHHTw/UGi0TBDwxhvPLjISik7FDetmiMyfM6Z7d7ufJGEWvvGOezZqWtrQ5gf2rbIBfbP+hJ/oD6MKCqXDgUeQ== Received: from BY5PR17CA0015.namprd17.prod.outlook.com (2603:10b6:a03:1b8::28) by IA0PR12MB8278.namprd12.prod.outlook.com (2603:10b6:208:3dc::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.39; Tue, 5 Mar 2024 09:56:31 +0000 Received: from CO1PEPF000042AA.namprd03.prod.outlook.com (2603:10b6:a03:1b8:cafe::bd) by BY5PR17CA0015.outlook.office365.com (2603:10b6:a03:1b8::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.24 via Frontend Transport; Tue, 5 Mar 2024 09:56:30 +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 CO1PEPF000042AA.mail.protection.outlook.com (10.167.243.39) 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 09:56:30 +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 01:56:14 -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 01:56:12 -0800 From: Xueming Li To: Long Wu CC: Chaoyong He , Peng Zhang , dpdk stable Subject: patch 'net/nfp: fix Rx descriptor' has been queued to stable release 23.11.1 Date: Tue, 5 Mar 2024 17:47:11 +0800 Message-ID: <20240305094757.439387-91-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: CO1PEPF000042AA:EE_|IA0PR12MB8278:EE_ X-MS-Office365-Filtering-Correlation-Id: ba5bc4d7-5050-40bc-c4be-08dc3cfa8809 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: T5giDHNJrxzUY0rlogmDyLgrB4fOZMU9uwgPhFMqQGt83tVrNq8eIXIuagsWgABG0vTfww+Z3iIwB280Lq2q0laSp6UXt1yu+bw2uKthR8r+wwEHq/I8wluXznthcLmA4EIbvRQ+6h3gNoJfrUyPVvGoA7iB3AItGyglxfojyFPdu+mlkGVGTWdZ7aE0nTnA0m1+HrNa86Jzz8iA6QPVE0E/HQWWfyTC1RX33dPZHW7oVfFePjhKPgKsgNvqZPTSAjCbwVBlfiTNcOUydtFsLpRnguMU6yGV7DPFzYWxC0JuKnWaMhsYr44SPv5vnSGmVw/hzOLl1FLFxMpVVJ/RO0ZLjzvx7uQwDIzySrgVS2AIpSu2lGNYklsYSSHEU5lOjod4PWy35FbXF1MnKrS+m1Q0tqWo8ITOQ4BkgzIFu1c87ay77pLhr1rwDuMGE4BdHZXBeDojlJre6jArNCkZoetKXRTQH11vdEeKU2lM9iCsD81ZgtbdUqpWCef9bQmtQZugCs56zZ4KJVYKc8q3bgqsDgP0OFgRBidfM/P0i6vm8mFBQXD2jVGinkPHvNJeCmhnvrWzboHledYF+yXlFizLa31Jq/2yVlkLVaI84mf4LQkbcbwvXcXfOlIZtA2dHPYs6veAFSWNK7LGxFAEyQGRE2fSQmdtoXaPMJbA0yaCDesQCgHNTLqZBanz/vdTQ3JynnSwiJ+nOIhih0TL2EEx0FuvG51HsGNhvyDxZJaIoh6/ne8i7JIKSvOKN6mM 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)(36860700004)(82310400014)(376005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Mar 2024 09:56:30.0193 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ba5bc4d7-5050-40bc-c4be-08dc3cfa8809 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: CO1PEPF000042AA.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR12MB8278 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=48fe88cb3ce34d1d38859ef2856eda2113bfc8c7 Thanks. Xueming Li --- >From 48fe88cb3ce34d1d38859ef2856eda2113bfc8c7 Mon Sep 17 00:00:00 2001 From: Long Wu Date: Mon, 11 Dec 2023 13:45:26 +0800 Subject: [PATCH] net/nfp: fix Rx descriptor Cc: Xueming Li [ upstream commit 580ea0b09a7c293c8912884109dc92abfea1229a ] If the Rx loop is broken and PMD does not update the descriptor, packets will not be received successfully. Fixes: 766d51c9ce29 ("net/nfp: merge receive function") Signed-off-by: Long Wu Reviewed-by: Chaoyong He Reviewed-by: Peng Zhang --- drivers/net/nfp/nfp_rxtx.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/net/nfp/nfp_rxtx.c b/drivers/net/nfp/nfp_rxtx.c index f21e120a43..8ca651ba55 100644 --- a/drivers/net/nfp/nfp_rxtx.c +++ b/drivers/net/nfp/nfp_rxtx.c @@ -747,15 +747,6 @@ nfp_net_recv_pkts(void *rx_queue, /* Checking the checksum flag */ nfp_net_rx_cksum(rxq, rxds, mb); - if (meta.port_id == 0) { - rx_pkts[avail++] = mb; - } else if (nfp_flower_pf_dispatch_pkts(hw, mb, meta.port_id)) { - avail_multiplexed++; - } else { - rte_pktmbuf_free(mb); - break; - } - /* Now resetting and updating the descriptor */ rxds->vals[0] = 0; rxds->vals[1] = 0; @@ -768,6 +759,15 @@ nfp_net_recv_pkts(void *rx_queue, rxq->rd_p++; if (unlikely(rxq->rd_p == rxq->rx_count)) /* Wrapping */ rxq->rd_p = 0; + + if (meta.port_id == 0) { + rx_pkts[avail++] = mb; + } else if (nfp_flower_pf_dispatch_pkts(hw, mb, meta.port_id)) { + avail_multiplexed++; + } else { + rte_pktmbuf_free(mb); + break; + } } if (nb_hold == 0) -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-05 17:39:33.732004191 +0800 +++ 0090-net-nfp-fix-Rx-descriptor.patch 2024-03-05 17:39:30.843566495 +0800 @@ -1 +1 @@ -From 580ea0b09a7c293c8912884109dc92abfea1229a Mon Sep 17 00:00:00 2001 +From 48fe88cb3ce34d1d38859ef2856eda2113bfc8c7 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 580ea0b09a7c293c8912884109dc92abfea1229a ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +22 @@ -index 5094bbf145..3840e2372c 100644 +index f21e120a43..8ca651ba55 100644 @@ -23 +25 @@ -@@ -765,15 +765,6 @@ nfp_net_recv_pkts(void *rx_queue, +@@ -747,15 +747,6 @@ nfp_net_recv_pkts(void *rx_queue, @@ -39 +41 @@ -@@ -786,6 +777,15 @@ nfp_net_recv_pkts(void *rx_queue, +@@ -768,6 +759,15 @@ nfp_net_recv_pkts(void *rx_queue,