From patchwork Tue Oct 10 06:06:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 132451 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id A018042348; Tue, 10 Oct 2023 08:07:19 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6DAC04027B; Tue, 10 Oct 2023 08:07:19 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2120.outbound.protection.outlook.com [40.107.223.120]) by mails.dpdk.org (Postfix) with ESMTP id BF81C40278; Tue, 10 Oct 2023 08:07:18 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Jf1sqT1kn844X+s7VNhqJp5w9JcyoHHqsYEsYJe2IFsoNp49X2E9bXVlnWHzlPmoAs3pAbq8bYkvCoPBoTaSEMEx5pfcQ19vkOud2L5zv9yh0jtLi+9uN94OydkBdybaW1bRQXC4skZMtNiZJ1vXYqwMDdf/7Ea6zI7+wrhE7trHbPFCqDyC819P60wZ1znOHhUeTTX1O5LcosmTAWHS2c7tbnRBQ2wCWlccoIGrMOjlsjZhT88V/sdklr5lzi+WAnOap/EXtyGrLiqvrVoG2V4WLUz7EOWUWaatoqPZGbdAXUeVDzu3K+Pw+s5oJxbc+Q8Fg3QGwnRocEOPATUUZQ== 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=NWf51z4f1EPOyuc51fx3SE+KDhDuSVvcs6ePyiwuqdo=; b=BT1XSlcxB5XyUJgg7zYTiT5zyWT/s8I6kn31uCibcw9oXe5GLXvKo8toiJ62ssibezdpsoiUtZjJuhMvYgfHZw8xtC2iF2pV04gYqQb40qtqspVmhJWyTMQdNk+6aYCEu2YiQjR2C2ejhoxQKeXPo+3iwU0mz2OzemCqIov2PXGi0GsEMGqvyDB6cSzd6dDODwJkCLiFdeifyCfDNeYEQoYLhx34DJqHW2sIM30YOzzxbYT2Jt/tkxOF26YOO3a/LqtyI4wYYxPmGxP9WCKqeH74KXxGCeQOQeJlNem+R4Ley6hcil/W1Dr4n3J+gspiD+5tU1h39KVIcSWHiHCKbQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com; dkim=pass header.d=corigine.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=NWf51z4f1EPOyuc51fx3SE+KDhDuSVvcs6ePyiwuqdo=; b=IHsTLxnLehZFiV8zWgJY8S6xJXSrKyUc3WeZF6BOFMOSlFSPCvOU9NmqUmjR7blNG6DdfPq8UTczmiBhcxWssUFeotuLkrYEP0A/ZkITtx2bBKU5d6q2NREWMILUyJm8Q1IZ5xegEZS5L8vuQAu5hkiWxb/Mkc4qqAUkqVRgpYY= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) by SA1PR13MB4959.namprd13.prod.outlook.com (2603:10b6:806:18b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6863.38; Tue, 10 Oct 2023 06:07:17 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::2d5:f7d6:ecde:c93a]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::2d5:f7d6:ecde:c93a%4]) with mapi id 15.20.6863.032; Tue, 10 Oct 2023 06:07:17 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Long Wu , chaoyong.he@corigine.com, stable@dpdk.org Subject: [PATCH] net/nfp: fix jumbo packet descriptors for NFDk Date: Tue, 10 Oct 2023 14:06:52 +0800 Message-Id: <20231010060652.205791-1-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 X-ClientProxiedBy: PH0P220CA0030.NAMP220.PROD.OUTLOOK.COM (2603:10b6:510:d3::30) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|SA1PR13MB4959:EE_ X-MS-Office365-Filtering-Correlation-Id: 435453a1-073b-49f9-9539-08dbc95727a4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ydJTMeezqFneVPw8JZXRj7vIqmBJP37g07z3jkOwF/b0jC501Lizbz7gudnJJNe5Uv77r6sQTsDwrqups9xsTNs+bmnkIo0PZoYS8f9EQn2VHW18gtR5IHTv9Dqwo9paH13IsI5bm7p7twc+XEB6oUQ0bi9UCiCxNVz8b3NMnPzmmB7AvKN0YeUwWxXOYla2mu/siafB8HqyFyWkk2H20b2tuU8UDdt12prKeSmZc16t5dwLM40zUNmmjDBtR5//42uxIowteyuD/fwH6J3sN+5Y9okDthumyM22KiFqghYsYUh4qB6mQuzZ6hNMNti3cgwj/nELqBUllr16qTDd1Tospuj9F6YsNXDm1cOU8KoccYFYQOWhIRdqD5UtuzH82izg9gklUHiaiuLDkfmKfZEFRU4cdormTpQk7anSpUDGwpYWmHnTLcJOUFfZmvbT7ULgy5RcilJhyG6QHKuhX1TyeXp8xg70VE2Q7JSQi85488x5hgqa+APxy647kFx54AMSzaeoL95XIfMEUDGvguxzXjg3y5gxR3bRMq6w9/zRCo95SMtnDLEYs4lXxe3XvOT4/zMJdM9k00fQPW/Ulc2m8/Stw8l67hVlffRsTVDz4qXgmBBQjc6r9qPwah5vLBqyohP+rrmMUEBWfgV0zlkyw0sC0CrxN3iEgGS2zbE= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(396003)(376002)(366004)(39830400003)(346002)(136003)(230922051799003)(1800799009)(186009)(64100799003)(451199024)(52116002)(1076003)(6512007)(36756003)(86362001)(38350700002)(38100700002)(26005)(44832011)(2906002)(83380400001)(6486002)(6666004)(2616005)(6506007)(478600001)(6916009)(8936002)(8676002)(4326008)(450100002)(41300700001)(316002)(5660300002)(66476007)(66946007)(66556008); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: o38zy+gvdDBukImCH7yJ1sRdujnz+iA1d0vz1noXmjzlEAXSyCrHbn+be63+B4TJnZuxr+DMaPn0zF/CTa/5IKkWgCLIohALptTbNolW3pPypDtpsKag/Aqd+PkEod7UTm965poh8YNnZjx+Lf9QjVswDCTpMOAPIifY5uoK8+SyS2OkUwT+EGencKbQzoP2NtrfPyY9ejg5/i6rUCHFSV1APQ2Re4c/waygLSOPEESahl94NaR9Y3iwhEitgzB6r3UpzH9hjaEDYm2JkLdTFvV0rj9QPGUKe6pQ8eZ5/otoQ+yi0k9uozNZeQqskmK1lwHdIZfwRot6qyhJjw5N7LBQ40mco3Ymh8LHEj6XUuqSUnzeHlcivud/dh3y1yWOdoOLr6upaMzb3hWINojLrccF6aiJ4Tfk5fUEZDr4aWIbdJVW4G4rTgEdG9v4BcrpzBHamfvQX7zKBBKb/15KywEDS/AjYW6wTxfSVlQ6A8AfoyUFfJInI3JPEB52y+PB0/Ouuc3F9McuI/NMpGrVKK+Ae28pgfv/BOLg5Q8bm/VdPv83AGb65Gjws2bE4eRBSO+z3G8HxiyPdlwUAMaRUlt4u5gxY+dg5B0cwCcK8GldCEoktpevbEKo2VD1L+qWohprjjaLsf0NvSMIN4vBbnNqRj4v+vv0YvNCX09g8uUpolxvHE68rS5FxYtHpO/iokf1g8xtSczgfabsTTHaOePWSK9nk2jzS+hebdMSVLIi76FykCe2M6fMyGZaszNtxTIEgIQIHSDB0QNeTXVm2S3aqw1wdPCnOAQOVVnvKNiUBBv8nR+TUNnuZifCJwU06E5Az/cyfuwSFc5gDcHJuSWkvy4jmf0GOsFjoUyt7UVolgdZu+KSFc3n71iBJ3MKvjSLFNcRbNeSYWvtXVb5qHDdrYZry1hLM+hVnoTMxIdtnYWRuD5ZaUtlX3Rv5os5lApY6C7538D5kwFbX7ny+R8rdEGX+RwwKgVL8qQbsoCJ9G2lOZqcW8F+ZFZitdtF4bTBHKgjKMpLI9+hByc3ndWnpBENi2KcCVrOx5GPtR6mpYfPKmP/bBjg4pEmGcfZKBIWwRUfxJBsYzDQOvVaunET2Vlsm9OrtK38NwaQcIYZYcpaMrMDSq5SGRlblZObhJ/alauH2XdSsnxdzEoh0eq0n5J288Hx+cNg8MuQ1mhqBDTlVNXwfEED49h47gRa+XCKmeEbX+W2MBj8+mU26jZ8Malr7DnFmbVdJB5vHCzgFU81QQxIv0IiSTWyqcjcKVCh0Qenz4eOD59hULISI11V/YEiIKilnYAMd+s1VLskGKpxSvMWfcRtq5B50wui1Hu51RAcTM+4GIauBhtAgTiagBjIr/LYYNXAcBUGYcH+AkJQ7SR6cSOB0UtwoSHBT3ck87ygP36X5c0j2gITeRT+k/YXM0jkgxaLmISNORc/GCKkJhJdvHqOB65a5TiyMGmx6P61qGwKayAjtDtlU7kVj6SDcO7eO/izV8xr8U2ybd1C06eM2xMYjjmks28BVVzUn9QD2UDUsDiAf8JwXf/t0AhQyGbAVDVYCmoW5EDnHb98C4ZTImgWXGfqZNw/YR6BeGTqQOLlPnUrp40m4A== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 435453a1-073b-49f9-9539-08dbc95727a4 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Oct 2023 06:07:17.0359 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: xWYd6y13Fzf8gicDaIL18PTBAkEmfTLcFoP0nCARNEvXpt+jRS928fE+5gwS7Rih32wv9wZo1sRInG8nT+UeNAHNFhInaBdy62KTOnLR8X4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR13MB4959 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org From: Long Wu When sending a jumbo packet on NFDk the packet must be split between multiple descriptors. The first descriptor contains the packet header and is limited to NFDK_DESC_TX_DMA_LEN_HEAD bytes. If the packet is large, one or more payload descriptors, without a packet header, and a size limit of NFDK_DESC_TX_DMA_LEN bytes are appended. When adjusting the coding style for the for NFDk datapath an error was made and the total packet size was modified when creating the first descriptor. This resulted in no payload descriptors being created and the jumbo packets where truncated. Fix this by not modifying the total packet length when constructing the first descriptor, allowing one or more payload descriptors to be created. Fixes: d7f6d9b21ffa ("net/nfp: adjust coding style for NFDk") Cc: chaoyong.he@corigine.com Cc: stable@dpdk.org Signed-off-by: Long Wu Reviewed-by: Chaoyong He --- drivers/net/nfp/nfdk/nfp_nfdk_dp.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c index d4bd5edb0a..3f8230f89c 100644 --- a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c +++ b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c @@ -354,8 +354,10 @@ nfp_net_nfdk_xmit_pkts_common(void *tx_queue, * than packet head len. */ if (dma_len > NFDK_DESC_TX_DMA_LEN_HEAD) - dma_len = NFDK_DESC_TX_DMA_LEN_HEAD; - dlen_type = dma_len | (NFDK_DESC_TX_TYPE_HEAD & (type << 12)); + tmp_dlen = NFDK_DESC_TX_DMA_LEN_HEAD; + else + tmp_dlen = dma_len; + dlen_type = tmp_dlen | (NFDK_DESC_TX_TYPE_HEAD & (type << 12)); ktxds->dma_len_type = rte_cpu_to_le_16(dlen_type); dma_addr = rte_mbuf_data_iova(pkt); ktxds->dma_addr_hi = rte_cpu_to_le_16(dma_addr >> 32); @@ -366,7 +368,6 @@ nfp_net_nfdk_xmit_pkts_common(void *tx_queue, * Preserve the original dlen_type, this way below the EOP logic * can use dlen_type. */ - tmp_dlen = dlen_type & NFDK_DESC_TX_DMA_LEN_HEAD; dma_len -= tmp_dlen; dma_addr += tmp_dlen + 1;