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 EA42541D8D for ; Mon, 27 Feb 2023 08:13:03 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E525841151; Mon, 27 Feb 2023 08:13:03 +0100 (CET) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2061.outbound.protection.outlook.com [40.107.93.61]) by mails.dpdk.org (Postfix) with ESMTP id AAAD3410DC for ; Mon, 27 Feb 2023 08:13:02 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dz5A2fQXvPIFFg8JazSTMiSvxD3DqPHTXiKYodxdFmR3lV5Fp9dQWYTcJW8qQ5kInd8+S4Y4hmw26+XTq4410xvfnjFxrlkNqSun79ZPoycABbQiHsGOzRLF3xbXe6VZ2TTyuhIAhKH70h5Wzw71oB0wiGRpXxg3DtcJVrLm3LKV23SWtgPaZq57q+FQ/1SOzf82Zh4wgE87vY88lSbHnTH8rvaX1lEO5IOjx0KOfqsKYCjWi+Yb3Qo0SM0oN/Xl+lZ+cQ+JQY2rl5Ok6FRQkc6LocdvbUsOh6IVXJ6Cyj+zm9+5vQZ7SXRU6wo9pwx/gcfdTixzioW1VUsg6pLhBw== 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=gC5rsVNOMIC/VZSOYjp+bD7xIRrFTkFESkmcLW7zOjw=; b=JNPlKZCCTdl9MM5ywrAOSuD9V7TlKHpVfNyiR7GPa7bQdqI4UaQx8PjeUlopv365YYgNBcaYWFmIuZ3VunFpq40WUTYhHeK9AGwtrzVtwznE701Zxa06xd6Lf3EhYGxHYigw/mHSnRiodC++cpgO3hinpSuy7kaKqf7AQzuwB6wC5NIxd+snq6zxSIo/s5xaRGRUO6EDKOcxUFCj1jCEq1nEqX2Ncu1P36KI5SZj2MHA2Q0ysPEJPeaA1v4lQBNBDMt2yryVPKomnFe8LmwWy9tWGhEbsaIdGyDVG6r465sTY57hqXwV5aiPuWKoLueuAUWaE6P/r9poLk7CJ+aRtA== 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=gC5rsVNOMIC/VZSOYjp+bD7xIRrFTkFESkmcLW7zOjw=; b=fuO6a04vNNt2zVkjNVZ0LJiBxouXlS9MRd+9SyZWpEXAbOhyVzIgutO28PniliPNc6EHtducKRa56u66E+gQxY0aPRnewE1smZ0rOk0LyDIb06p8MPPh6zOcQ0DE40pU1O85Gb0U1NMr+7RWG44A8mQP/xlVlwMHVLWc95xsuJFvWUwYt69Zql44PXkbvPMbGQnHMdamxBdEVBp7G0/y9H83VC2/XkRUsnZ+2EruMlBTHj0+neZz6SXAzexPPc+Gqnq7Qnr9E/6gL4cxfyDMQ2eXhmjdvDHdbtGH3zeyDMRM1Az7DvQmgs8LZCm86qdPf/DD3Xg6bXEAzs4L5YnJKw== Received: from MN2PR20CA0009.namprd20.prod.outlook.com (2603:10b6:208:e8::22) by MW4PR12MB5642.namprd12.prod.outlook.com (2603:10b6:303:187::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.24; Mon, 27 Feb 2023 07:13:00 +0000 Received: from BL02EPF00010206.namprd05.prod.outlook.com (2603:10b6:208:e8:cafe::65) by MN2PR20CA0009.outlook.office365.com (2603:10b6:208:e8::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.29 via Frontend Transport; Mon, 27 Feb 2023 07:13:00 +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 BL02EPF00010206.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.6156.12 via Frontend Transport; Mon, 27 Feb 2023 07:12:59 +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.36; Sun, 26 Feb 2023 23:12:46 -0800 Received: from nvidia.com (10.126.230.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; Sun, 26 Feb 2023 23:12:44 -0800 From: Xueming Li To: Richard Donkin CC: Chaoyong He , dpdk stable Subject: patch 'net/nfp: fix max DMA length' has been queued to stable release 22.11.2 Date: Mon, 27 Feb 2023 15:00:16 +0800 Message-ID: <20230227070107.15664-108-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230227070107.15664-1-xuemingl@nvidia.com> References: <20230227062349.13764-1-xuemingl@nvidia.com> <20230227070107.15664-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.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: BL02EPF00010206:EE_|MW4PR12MB5642:EE_ X-MS-Office365-Filtering-Correlation-Id: 03e9403a-9b64-4fd6-66dd-08db18920ebd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4S5G6GLLDzY55Imf0Q7xR2vzj4mNBov6jyaaN6vkh9kshR/c6pdEVjV6MqfdWMZXCpcNWvgIoO4/5UpZyzaFrOPnDkoGZPeMsvpNuKXDEeeR/Zan0cvoDfx2V69daCRMVc2TRLmftccCOsvmVcqSpecsh3opISBIE+UNhjdDoGZvtbnuRoqZtX2QEY+tWuVH5PlqN7Y3uoMIpv3jgzPncyyTUVGk6E3Pan+KXUU8pA8m9TfZHc8wJMfLpWFhqvLbWm++0OG1Tr2/bddHS/OhuTW2Xc87zGkVanVRMdd63k0ABIEfgTi+ujG3l7+Gom7xCFps89W8TOMpYhIZ0qH6yefxpNe1qDv5f4DgCxl8R64HuNGnyYKrdCx68Hx31VVkZbW9P9Io20TiMF17m4V6gWYTfAIdPknEFYRZzlpxASJ/Bl5pTn/fDp4pghJqp/uAkodjIkUIIGA4uabFF1GnImFZa/4kt/tgSbXkRuksORIp9FmqTXJEZ1fKUewHQefB0Bt0yiJKjtEayDnaiasnslnusC4EKzwcuQGSaQ2lkdEqJ/3sn7Jo7YdVlb7zzUwWe0jAJ6Bvfd1D4bUxB8qTFeHMeWard4y4uu0apieXA8G6EUciBKa9pF2RKSNnGeoIxx9jFfy6/7nYpVeIYU7U/urvbWi7qBnVgHbSwx9i2hPvlrrA65/DMhKLL2Ym3IGSFC5gtvAb3ZOM4KAe/Rr+W/SYAat63XMzdho/S694WcYUvXDaP57CO+Bc9yDjfThWEg3aqR+VaAg5AYXUT3TIPL61Uy9eUsle0B8O6bvCfHo= 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:(13230025)(4636009)(376002)(396003)(346002)(39860400002)(136003)(451199018)(40470700004)(36840700001)(46966006)(8676002)(40460700003)(86362001)(478600001)(47076005)(336012)(426003)(36756003)(6286002)(83380400001)(16526019)(40480700001)(55016003)(6666004)(2616005)(41300700001)(53546011)(316002)(26005)(186003)(82740400003)(82310400005)(54906003)(70206006)(7696005)(1076003)(7636003)(70586007)(2906002)(4326008)(6916009)(36860700001)(966005)(5660300002)(8936002)(356005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Feb 2023 07:12:59.2455 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 03e9403a-9b64-4fd6-66dd-08db18920ebd 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: BL02EPF00010206.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR12MB5642 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.2 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/01/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=6c9834cd2add682187ee948a485cd0e70158815a Thanks. Xueming Li --- >From 6c9834cd2add682187ee948a485cd0e70158815a Mon Sep 17 00:00:00 2001 From: Richard Donkin Date: Fri, 3 Feb 2023 10:23:28 +0800 Subject: [PATCH] net/nfp: fix max DMA length Cc: Xueming Li [ upstream commit 4a44ca26db4f8492be4bda462adfd5d1b70e06c2 ] The DMA transfer length is allowed to be as large as NFDK_TX_MAX_DATA_PER_HEAD. The existing check would not allow a simple- type descriptor to be created for a packet of size NFDK_TX_MAX_DATA_PER_HEAD, but it would also not enable gather-type descriptors to be created correctly later. Change the limit of simple-type descriptors to include packets of size NFDK_TX_MAX_DATA_PER_HEAD. In practice this fixes traffic with packets of size 4096. Previously such packets would not be transmitted correctly. Fixes: c73dced48c8c ("net/nfp: add NFDk Tx") Signed-off-by: Richard Donkin Reviewed-by: Chaoyong He --- drivers/net/nfp/nfp_rxtx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/nfp/nfp_rxtx.c b/drivers/net/nfp/nfp_rxtx.c index e2cdb9e27e..9e20917b5e 100644 --- a/drivers/net/nfp/nfp_rxtx.c +++ b/drivers/net/nfp/nfp_rxtx.c @@ -1215,7 +1215,7 @@ nfp_net_nfdk_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pk if ((hw->cap & NFP_NET_CFG_CTRL_LSO_ANY) && (pkt->ol_flags & RTE_MBUF_F_TX_TCP_SEG)) { type = NFDK_DESC_TX_TYPE_TSO; - } else if (!pkt->next && dma_len < NFDK_TX_MAX_DATA_PER_HEAD) { + } else if (pkt->next == NULL && dma_len <= NFDK_TX_MAX_DATA_PER_HEAD) { type = NFDK_DESC_TX_TYPE_SIMPLE; } else { type = NFDK_DESC_TX_TYPE_GATHER; -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-02-27 14:08:44.365147900 +0800 +++ 0109-net-nfp-fix-max-DMA-length.patch 2023-02-27 14:08:40.859237000 +0800 @@ -1 +1 @@ -From 4a44ca26db4f8492be4bda462adfd5d1b70e06c2 Mon Sep 17 00:00:00 2001 +From 6c9834cd2add682187ee948a485cd0e70158815a Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 4a44ca26db4f8492be4bda462adfd5d1b70e06c2 ] @@ -19 +21,0 @@ -Cc: stable@dpdk.org @@ -28 +30 @@ -index 79a66b6e44..b3beb33109 100644 +index e2cdb9e27e..9e20917b5e 100644 @@ -31 +33 @@ -@@ -1476,7 +1476,7 @@ nfp_net_nfdk_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pk +@@ -1215,7 +1215,7 @@ nfp_net_nfdk_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pk @@ -35 +37 @@ -- } else if (pkt->next == NULL && dma_len < NFDK_TX_MAX_DATA_PER_HEAD) { +- } else if (!pkt->next && dma_len < NFDK_TX_MAX_DATA_PER_HEAD) {