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 2DE92A034F for ; Wed, 10 Nov 2021 07:34:52 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 21F1F40142; Wed, 10 Nov 2021 07:34:52 +0100 (CET) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2052.outbound.protection.outlook.com [40.107.237.52]) by mails.dpdk.org (Postfix) with ESMTP id 4098240142 for ; Wed, 10 Nov 2021 07:34:51 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gB9DeD1Ti26oY8z3lsfkCuvjktcQksMM+4uya/q9/jqWzuyyucFphTIZkGgpX7vP5xI4bUGNqSBI+qMaMWd4WV2RzcYccgLz0/q8zyJk6z4RfHlsmdVxllVSn1G1DKO7BnFCuGmsDfh5+WvO4WH7gGfDhZqzrjcVqW6nxvOqTT0iB7pJnRA+/JDQBuhlq77Vfs/N6MML1SZQv9fIt8EKBmpJLBFFHc+Yu4DDHhCA8OC/PcYeU6fs4thBu2D0Br3o4qHKMlPWbAtiewBk1puEUg+bYX+QMVrnEEPt/fLMZk6agfpYYHE26dr1KpftES8sNnhaVNnbV4Fl2wYBzlzLiA== 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=QXcgLRjt5oVwets+siUBtSURQKRDSZHg5ivP+4QgnIQ=; b=YfzL7jqOqO/YmQN5/A0RPiYSnvKKojAAwwPYXQd5LOnLMDOQcsP+44PQLHJz4jgkSdmh+y9Cuc7CVFIszi3SEZW4RismtgTUUHz4e9mbXUEaKkYeG+mm/SGeRwkANUQNfh9Jm6aeZN0mh7DvjT1SmLHjuIiex9JedeAQ4jMjn4la/lIgH4S+dxIgvvk2N2HxQF/Z56vjKmB1R0W0ANFiS1GA1ofb2FQ8P4HurD//v7ZS2I4O7d+OoKObA4ziMJ3PeZrFmlwXliaBmfGUsq1zQdq3hRvMlHJy5arY9xGrzNAnesFiuDUzgB0cwphk50533EoWgAlVlWiFmCr0B8mXBw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=corigine.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=QXcgLRjt5oVwets+siUBtSURQKRDSZHg5ivP+4QgnIQ=; b=qm+1VP/Ud7GNtiNEStKQxEQXjDVXvUxq5fRXtastNcZl0BfZ13U0jv036jpvARndHqPUoGgJTKy1LLArrDeRtuLffWn3abyVl1eLBHlL34Li8hZ1tI8ktXogr1tGFcdZ9qtZE8Vz+TyQgVd3rieXTFd1Ri9KO4yN1utud9p171APQGUBat/KuGE7o3UsQwj9n6bcPG9OLjN1CYJ52hgwCU7IGKIn2s27P8bA03wJ9Xh3ea1WWp0+WUzz/5QG/fTrG6IwG9VQ1Z7PRs5zIsMlDm5sMYtcoKr/OTmfdpJAxjH6r+onl9JQGH+TAxleg9B4w0WzDV5KBcb8CLZY8RQHDg== Received: from DM6PR02CA0132.namprd02.prod.outlook.com (2603:10b6:5:1b4::34) by DM5PR12MB1612.namprd12.prod.outlook.com (2603:10b6:4:a::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.13; Wed, 10 Nov 2021 06:34:49 +0000 Received: from DM6NAM11FT006.eop-nam11.prod.protection.outlook.com (2603:10b6:5:1b4:cafe::ca) by DM6PR02CA0132.outlook.office365.com (2603:10b6:5:1b4::34) 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:34:49 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; corigine.com; dkim=none (message not signed) header.d=none;corigine.com; 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 DM6NAM11FT006.mail.protection.outlook.com (10.13.173.104) 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:34:48 +0000 Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Wed, 10 Nov 2021 06:34:47 +0000 From: Xueming Li To: Heinrich Kuhn CC: Luca Boccassi , Simon Horman , dpdk stable Date: Wed, 10 Nov 2021 14:28:24 +0800 Message-ID: <20211110063216.2744012-21-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.5] 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: a6e10277-7208-4578-7ed2-08d9a41431b6 X-MS-TrafficTypeDiagnostic: DM5PR12MB1612: 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: iwiBgldYK6csBADj5lbahNRllUuG63Q0vcWlWkNe0432TJUsVbL9Dn9QXCJsMkGA7urghSS4R4nrQgQQQcHAQKrlBMvZEmu2HV3XmCrrziGnrShve2Stp4RxwH59VxV/eAEv+M+yJaQl68l9UuD3nO1Kf4Ba+LVxW9/2SMAzEcnAk+dePap2mV6siW0vd+Z0z7IHjklAhZ1Jom95QsqTZbG32Bm7wKkZV8/1g/pzuZAtoyP7UWPr+uLlr/vd9aDkNUNTK5bejuWVCWmzSECcGgPqWnu0nbdeb4EfYmJPGCqmT2lcySoT2rbbiPVoqERxcwqQZidYYiY+p89alx77F2ZyqaByjRh6h89TCP03DTjoUmEFgM2XZa+61hMjBBVY008wXLejQESbpqdcXQqkTvXoLt2PiVw0Butt6CHce8WshuO+UW3dyyWzZj25sWFdkPEev0zNY3jo+NYok8/er3QVrtQxf5P2ki9c/jjHRg92qbpX3qstG6bFlDI2eSEAZNI55Ilh3/lkB9P5y4erqjo1AG1EWE8oKZ3L87Tg5u9KTceQIEpeHofbFU8oJJqYLDe8GLh4fkMbk7CZLYrhI+kqL2e+00ikGRqB3QpGaw/Ra5e3lijSFgYcUMdG5yobch4vcq3+4OsOdAkGB+9ssqOSyui8k4tXxuPKn2BmFgXuIstjSZ0jXd2pBOb2rRQ2kaOLseH3qnfs09EJwO6BsBH8HBQAZO/AMriXtjZRET7AysBZk9bwufLowPrFP1kR9ORwF8Ky30zwQxVdXowpCJdRbBnuZ5PXH8ohMuewddQjjN0pdY9p/ueFS4gN9t1pQte/I7wGfhkXbvrh6YFsog== 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)(36840700001)(46966006)(2616005)(8676002)(4326008)(26005)(7696005)(55016002)(16526019)(53546011)(7636003)(426003)(1076003)(54906003)(6666004)(83380400001)(316002)(86362001)(36906005)(508600001)(47076005)(5660300002)(356005)(336012)(8936002)(36756003)(6286002)(70586007)(70206006)(186003)(36860700001)(2906002)(6916009)(4001150100001)(966005)(82310400003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Nov 2021 06:34:48.8911 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a6e10277-7208-4578-7ed2-08d9a41431b6 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: DM6NAM11FT006.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB1612 Subject: [dpdk-stable] patch 'net/nfp: fix minimum descriptor sizes' 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/877a05209a26c5543d1bf9a2bf8cb023e5d59b94 Thanks. Xueming Li --- >From 877a05209a26c5543d1bf9a2bf8cb023e5d59b94 Mon Sep 17 00:00:00 2001 From: Heinrich Kuhn Date: Mon, 23 Aug 2021 09:59:21 +0200 Subject: [PATCH] net/nfp: fix minimum descriptor sizes Cc: Xueming Li [ upstream commit 96289f2b80e5921a3da54650f382b6944d9b39df ] The NFP4000/6000 supports a minimum of 256 Tx/Rx descriptors and not 64. Before this patch when a DPDK application configured < 256 Tx descriptors the hardware read/write pointers would be unmasked and not wrapped at the expected size of the ring. The PMD logic to determine the amount of free space in the Tx ring is incompatible with the unmasked hwqueue pointers and this will result in the PMD not updating the read pointer at all.The knock-on effect is that under high load the PMD will potentially re-use a Tx descriptor before the hw has had a chance to process that particular descriptor. This issue can manifest as a DMA error when the hardware tries to perform a DMA with info from a partially populated descriptor. Fixes: defb9a5dd156 ("nfp: introduce driver initialization") Signed-off-by: Heinrich Kuhn Signed-off-by: Simon Horman --- drivers/net/nfp/nfp_net_pmd.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/nfp/nfp_net_pmd.h b/drivers/net/nfp/nfp_net_pmd.h index 1295c5959e..444c1b3773 100644 --- a/drivers/net/nfp/nfp_net_pmd.h +++ b/drivers/net/nfp/nfp_net_pmd.h @@ -28,10 +28,10 @@ struct nfp_net_adapter; * DPDK uses uint16_t variables for these values */ #define NFP_NET_MAX_TX_DESC (32 * 1024) -#define NFP_NET_MIN_TX_DESC 64 +#define NFP_NET_MIN_TX_DESC 256 #define NFP_NET_MAX_RX_DESC (32 * 1024) -#define NFP_NET_MIN_RX_DESC 64 +#define NFP_NET_MIN_RX_DESC 256 /* Descriptor alignment */ #define NFP_ALIGN_RING_DESC 128 -- 2.33.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-10 14:17:03.014728008 +0800 +++ 0020-net-nfp-fix-minimum-descriptor-sizes.patch 2021-11-10 14:17:01.757413685 +0800 @@ -1 +1 @@ -From 96289f2b80e5921a3da54650f382b6944d9b39df Mon Sep 17 00:00:00 2001 +From 877a05209a26c5543d1bf9a2bf8cb023e5d59b94 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 96289f2b80e5921a3da54650f382b6944d9b39df ] @@ -19 +21,0 @@ -Cc: stable@dpdk.org @@ -24 +26 @@ - drivers/net/nfp/nfp_rxtx.h | 4 ++-- + drivers/net/nfp/nfp_net_pmd.h | 4 ++-- @@ -27,5 +29,5 @@ -diff --git a/drivers/net/nfp/nfp_rxtx.h b/drivers/net/nfp/nfp_rxtx.h -index d2d0f3f175..b0a8bf81b0 100644 ---- a/drivers/net/nfp/nfp_rxtx.h -+++ b/drivers/net/nfp/nfp_rxtx.h -@@ -30,10 +30,10 @@ +diff --git a/drivers/net/nfp/nfp_net_pmd.h b/drivers/net/nfp/nfp_net_pmd.h +index 1295c5959e..444c1b3773 100644 +--- a/drivers/net/nfp/nfp_net_pmd.h ++++ b/drivers/net/nfp/nfp_net_pmd.h +@@ -28,10 +28,10 @@ struct nfp_net_adapter;