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 E5E9B4301F for ; Thu, 10 Aug 2023 02:13:03 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DFB6140DD8; Thu, 10 Aug 2023 02:13:03 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2060.outbound.protection.outlook.com [40.107.93.60]) by mails.dpdk.org (Postfix) with ESMTP id 4E6CD406B6 for ; Thu, 10 Aug 2023 02:13:02 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=I1+SnesYXFg9bH8ZANGz/MhiiDBhvt8VVR5WFnRVx6PvIVltFjpWw0bAwgS8tzwaUzqy7cwwcamJOThAQuFRCXhRycraiGdccWj0A3dtDQ8ZK+63mnWahbDh5pls5a7kye6JOyTJYGnijDhoEjN13tYpsy8XYSXgcgyWTJGcEeE6P4TJU57nliEtSv3NpN/7X+u0bqwQ9jDLGo0iTCro1btthIVjj0t+1HZONu/iw1V271b6rE1ULETim6PH7KgXE4ySyzFS68GvU6Dn73Ni01swINv6lSmrYW41MKI8+70h3ONRu19OGUWXkU5Mp63x1OJRu1g0FgbtFkV8IgpqOQ== 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=OZTciufl0wV084B9yOP2euOfPpsKamtC7yoNe7qxdjU=; b=T94wHqZ6rKfMgnrz9On8dqsLcrB9ocEJTTuIxswL44Ok3mW/WFGXBdNUe+Bf4jI1Rwp8oCrDV2ghKZEQA7BP430mVhX5v3vwDJVxm2VIo6N48Avd3UuyCOqb65PVwATF2TenmQ7w1541SAuZE8NlyKJg8xLm+bKnB1xfzVmjKlyEc99DXAq1OrwTaJ40bvCb3VRwKyjGBsvAeLnd1ijyorQWC7P7NiIvwkJzA7/e4fpIfS6gm3tgsbZhxnHHUqEQuGLHxUozPua8IWC/nxaLm7SOM7PuToAPgydmI2u641QjIv8MQXDC8MW3py73aGKeOP374QkKpm02jwUICGLuWQ== 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 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=OZTciufl0wV084B9yOP2euOfPpsKamtC7yoNe7qxdjU=; b=srhp6pl/sSMGyqDNaPzSe3Sjg4Go+mB3d/dcDRK7viWh/psUUpSz3i27VHR2zd8Qpl86amxSMvxrAm4bZJYU5EOwMWUB4i8Vhw05S1eVrb04OEh0RBR21N3HUZmRt7aCJt7+bEhGjcDAwe5IojM+SzAN44IPFLkw3AW1llnAERFvsnazlt1T+g+dcqaRJRYFSUi6wcdES2QuL1otQnU2lSXJwL5cxlAi0XM/GqJs+/NO7VyEP9fK8BUYM62yAGX6f80ybh3lK0lf0p1+YpIVUpGQs0tz8k/zEvXYKBcsM1fw+cwEzbzAkYL5CQUDzxRYxLnpkTlSkNleUUNh91C2Mw== Received: from SA1P222CA0182.NAMP222.PROD.OUTLOOK.COM (2603:10b6:806:3c4::20) by PH8PR12MB7112.namprd12.prod.outlook.com (2603:10b6:510:22c::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.26; Thu, 10 Aug 2023 00:12:59 +0000 Received: from SA2PEPF000015C6.namprd03.prod.outlook.com (2603:10b6:806:3c4:cafe::dc) by SA1P222CA0182.outlook.office365.com (2603:10b6:806:3c4::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.28 via Frontend Transport; Thu, 10 Aug 2023 00:12:58 +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 SA2PEPF000015C6.mail.protection.outlook.com (10.167.241.196) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.19 via Frontend Transport; Thu, 10 Aug 2023 00:12:58 +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.5; Wed, 9 Aug 2023 17:12:46 -0700 Received: from nvidia.com (10.126.231.37) 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.986.37; Wed, 9 Aug 2023 17:12:45 -0700 From: Xueming Li To: Chaoyong He CC: =?UTF-8?q?Niklas=20S=C3=B6derlund?= , "dpdk stable" Subject: patch 'net/nfp: fix Tx descriptor free logic of NFD3' has been queued to stable release 22.11.3 Date: Thu, 10 Aug 2023 08:10:43 +0800 Message-ID: <20230810001045.2662-23-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230810001045.2662-1-xuemingl@nvidia.com> References: <20230625063544.11183-1-xuemingl@nvidia.com> <20230810001045.2662-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.126.231.37] 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: SA2PEPF000015C6:EE_|PH8PR12MB7112:EE_ X-MS-Office365-Filtering-Correlation-Id: 49e32610-817e-4922-791d-08db99368db2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4cm1atxw4pzMtAIEJ6j1Vl11KmxKu3CEUNzcw6tndHujbyvi86LqreFFb5EI22gMKG2aaJh35X8yyXHJkaLRA3+vMCwt1xF5FXyFTLv8Bv+G92nGaBWIkti9oX2xmAcfcLQDjXwBEqpYZ5jo40QSrK/NWcFx6xDaf/EbaxMfmyluqHGnL3qsWYOrdGkzqBeAShd6c9U6+Gh1JZB2+cHXXJ9LcZqgym+daMiRrlM+8aB7CzWGJourRUFIbuaMJr9n1vgiBeywNjyukXHD70JyTUsZfLN7gaoPLM9ICqgLaWFb4o2eXTQkjsQNh+Lhss3NPOYHQv8xltHq/xvMM85ZC9YbfhjhMGOKyOGK7cGmqmI/hhZgpBqJEVYxwonus+GjSNtoSL3+c4E3Qu8+wmhfU3ygS8zdBEh3j5qthb5Is8WAkhn6pvZypDG4XKPGX2scJe/Qm10F2cr303i10J2S9Ct6K73PKqlUY18WbgLpym8N1+OdlmTvSkVNkKQZKEtpA9ff5paQsld18FsoJoa9H8BrrXVayBdiufQejA/Ef2uDha419ypuyp06+q7/NvqxIxpqBUGYLR03g/xsUWvxIsadf0+ImnLf9MDw6jjueFMcnkq5RrXLgaWhktq32lF7p5a7tXYvayhoS7cR3/HvMyaK3J5RgfZLa8zpSoA9awxRZsEnygipXVyVrRW92puP4nLitytz0nK2yFrRxVBPeEH+T9HBetxjWMLd9JzB/WHZrGkSKRyHfrGA5fRzafGdWDd2xTaBjNzUGJ1+5hvg3g== 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:(13230028)(4636009)(376002)(136003)(396003)(346002)(39860400002)(82310400008)(1800799006)(451199021)(186006)(40470700004)(36840700001)(46966006)(86362001)(16526019)(7636003)(40480700001)(41300700001)(336012)(6286002)(53546011)(478600001)(8936002)(40460700003)(8676002)(26005)(1076003)(2616005)(7696005)(66574015)(426003)(5660300002)(83380400001)(47076005)(2906002)(36756003)(36860700001)(54906003)(55016003)(6916009)(316002)(70586007)(966005)(356005)(70206006)(82740400003)(4326008); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Aug 2023 00:12:58.6218 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 49e32610-817e-4922-791d-08db99368db2 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: SA2PEPF000015C6.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR12MB7112 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 22.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/11/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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=c12883295e0a268e471fe990acde498b50e1455d Thanks. Xueming Li --- >From c12883295e0a268e471fe990acde498b50e1455d Mon Sep 17 00:00:00 2001 From: Chaoyong He Date: Tue, 20 Jun 2023 10:49:57 +0800 Subject: [PATCH] net/nfp: fix Tx descriptor free logic of NFD3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Xueming Li [ upstream commit e97738919c2315e07c2e98b6a9cc3912c335364a ] In the Tx descriptor free logic of nfd3, the former logic might force cast a negative number into a very big unsigned number, and which will cause potential problem in the xmit loop. The xmit loop will continue in the place where it should break, and will overwrite the Tx descriptor which is not free to use by the PMD. Fixes: 74a640dac864 ("net/nfp: avoid modulo operations for handling ring wrapping") Signed-off-by: Chaoyong He Reviewed-by: Niklas Söderlund --- drivers/net/nfp/nfp_rxtx.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/net/nfp/nfp_rxtx.h b/drivers/net/nfp/nfp_rxtx.h index e2b48374fe..1c2a00e300 100644 --- a/drivers/net/nfp/nfp_rxtx.h +++ b/drivers/net/nfp/nfp_rxtx.h @@ -340,10 +340,14 @@ nfp_net_mbuf_alloc_failed(struct nfp_net_rxq *rxq) static inline uint32_t nfp_net_nfd3_free_tx_desc(struct nfp_net_txq *txq) { + uint32_t free_desc; + if (txq->wr_p >= txq->rd_p) - return txq->tx_count - (txq->wr_p - txq->rd_p) - 8; + free_desc = txq->tx_count - (txq->wr_p - txq->rd_p); else - return txq->rd_p - txq->wr_p - 8; + free_desc = txq->rd_p - txq->wr_p; + + return (free_desc > 8) ? (free_desc - 8) : 0; } /* -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-08-09 21:51:21.354583000 +0800 +++ 0126-net-nfp-fix-Tx-descriptor-free-logic-of-NFD3.patch 2023-08-09 21:51:18.294352000 +0800 @@ -1 +1 @@ -From e97738919c2315e07c2e98b6a9cc3912c335364a Mon Sep 17 00:00:00 2001 +From c12883295e0a268e471fe990acde498b50e1455d Mon Sep 17 00:00:00 2001 @@ -3 +3 @@ -Date: Thu, 18 May 2023 19:02:47 +0800 +Date: Tue, 20 Jun 2023 10:49:57 +0800 @@ -7,0 +8,3 @@ +Cc: Xueming Li + +[ upstream commit e97738919c2315e07c2e98b6a9cc3912c335364a ] @@ -17 +19,0 @@ -Cc: stable@dpdk.org @@ -22 +24 @@ - drivers/net/nfp/nfd3/nfp_nfd3.h | 8 ++++++-- + drivers/net/nfp/nfp_rxtx.h | 8 ++++++-- @@ -25,5 +27,5 @@ -diff --git a/drivers/net/nfp/nfd3/nfp_nfd3.h b/drivers/net/nfp/nfd3/nfp_nfd3.h -index 7bf2349904..e772bc4711 100644 ---- a/drivers/net/nfp/nfd3/nfp_nfd3.h -+++ b/drivers/net/nfp/nfd3/nfp_nfd3.h -@@ -52,10 +52,14 @@ struct nfp_net_nfd3_tx_desc { +diff --git a/drivers/net/nfp/nfp_rxtx.h b/drivers/net/nfp/nfp_rxtx.h +index e2b48374fe..1c2a00e300 100644 +--- a/drivers/net/nfp/nfp_rxtx.h ++++ b/drivers/net/nfp/nfp_rxtx.h +@@ -340,10 +340,14 @@ nfp_net_mbuf_alloc_failed(struct nfp_net_rxq *rxq)