From patchwork Wed Sep 20 11:34:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 131714 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 60450425EF; Wed, 20 Sep 2023 13:35:45 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1804F427DD; Wed, 20 Sep 2023 13:35:30 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2112.outbound.protection.outlook.com [40.107.92.112]) by mails.dpdk.org (Postfix) with ESMTP id BAB0A40E7C for ; Wed, 20 Sep 2023 13:35:28 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IW/1jWnthSMfSpZuNn71Odtguw4onQYIulzm1gA6miqYBkgFbSK65CaBra2IrR9c7cQKe3Mo+AG7V1RrHTPvKa8sCvOXhZ0Xv7CIR0+8DDG/ikgSDi2W/gYaHfW78SjaTfkC2i5g3p5CAn2jt0z1hwsZSXXEHL5PVC0TXHhJmbbJxujCHxsgtuACqu1ouG97ioXnHtJx/WeXQk+12fH+9ygGZoprlXDBR4eDw7K698/s74GLuziCCmVdi2XGVwMPI1Xm7VAA6aLmP79302W52L2WB/R6xpon6oROYb/5IOCATA1eZvBldpfp8pTU/KyykVzhCuNy0GnYijTQKtxDqA== 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=gxnwO3vZkMFYLN3IEkVrewnIONnA6z4ZUsQtI1LQg9M=; b=WNhCZQbRHcibpOIp34aqEVyYZwg6CaorcNQS7sXqyMsf+dXkFgDRkgcZ2lkAuCL8UDLZYXlTGaTFSbToCdEtEMRzS39hwAYv1bV9VbqbtvXKY9bpteQDZGE07qmiuRscsG1mp1D+BA8LM+ILMPqaPAkon0cWKKVQv0vkXGAfMQiAR17PUGxNGbINE1zPf4yezNKSKq2KLah2v0dsXAjhxWRM3u2xHEQLdfKWDCDoZ4/mMl8jRScCm7CaXnEGsKgmSITKqa0P0VXUSSRG64M6hTU4p/MKI0jmUYuA1kRZ5vTa5LRMkJzzc8HzqXEXGREmhBMHW7gjDvcqYB8dAm6vLA== 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=gxnwO3vZkMFYLN3IEkVrewnIONnA6z4ZUsQtI1LQg9M=; b=Mh7wjsDzuyoNCTZCAUcJMXw6XsKxi9A9r3EAK3mMIesRPZ0yzPfsGA8eDUe6l6IVWmaaow/ewInJlWDzS0e7w4P5ImQEYbTkQaWdUi/BDSMq6BfJG73xmdO0O7Rlom+uziqziiZ+UrYP5coys5UdxbQCmpOy6LpG18BP9yibUoU= 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 MN2PR13MB4039.namprd13.prod.outlook.com (2603:10b6:208:269::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.28; Wed, 20 Sep 2023 11:35:25 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::7a1c:2887:348a:84bd]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::7a1c:2887:348a:84bd%6]) with mapi id 15.20.6792.026; Wed, 20 Sep 2023 11:35:25 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He Subject: [PATCH 04/13] net/nfp: improve modularazation of nfdk module Date: Wed, 20 Sep 2023 19:34:45 +0800 Message-Id: <20230920113454.739356-5-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230920113454.739356-1-chaoyong.he@corigine.com> References: <20230920113454.739356-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SL2P216CA0113.KORP216.PROD.OUTLOOK.COM (2603:1096:101::10) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|MN2PR13MB4039:EE_ X-MS-Office365-Filtering-Correlation-Id: 45497d23-ea3b-40f2-9374-08dbb9cdaeda X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: R4lFPWJS1XOoK1QRxR/hdU85iDXrOm2QcYKt5A07Mb9/YqizJpE3E5ureKfhSY05SgEgDTv6WIBPl+3tP5gN5ti9P2rGF+0JnlB8NLKP80xxDlFXYT/BYOsUs1JpPBQuadiU2dP+UF1/BW9szofhZd742iTEWT2qnmGmX6Fw+Y5KLChQR5bHiVGi8TEP9eZsesuOeV6IylKzAKZZJpG2ogFgSFkYKDSgGldsWbtx6cgxWZl7NdfTkTsDQQyF36WHh5QMpTDnfZP5/Y5SsNNxsoPJbqEV2a1Gn/BfVqjvB37FB3jWjL0np9bP3/RfnjM7o//tot4KTxNBqQMReyKAK9yQSmR5gxq92F8XlSAXLywsthTmoHLsOX/zcsKNQsFmAHU2DTC4EUGlkjMXIcIdUbbGke2KvF9w2BEs/FhRb5rMDOUGBkO0qTod4Jym44KDdK1lHje2ZFw5JNoL9ottuY+ttGtS2+o4soD3JcV0XUzjY8nYEHBKTsRZW2PEHTx/w59sHx788VDkTjyfMn/Ak3ZvJm+XVWXCvzi9Qd+N0/+pCvAgA302ze/6S5sgbrgmnlyE3gN6J2vU3XwtN9mLHjv3ILIdvXnXTIFSTDm46vfxZMfa7E7NPCAM9bJXIpgtHG13mh8ca1AUpHQD7XhYVZwqWIpGRdc0Zf4/YR/9Vq8= 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)(376002)(346002)(396003)(366004)(136003)(39830400003)(186009)(1800799009)(451199024)(6666004)(6512007)(52116002)(6506007)(6486002)(86362001)(41300700001)(66476007)(6916009)(66946007)(66556008)(316002)(478600001)(38100700002)(38350700002)(107886003)(8676002)(1076003)(8936002)(4326008)(36756003)(26005)(5660300002)(44832011)(83380400001)(2616005)(2906002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: lmw6ugSb6VbPyO4NUHBYTrqmfFt3+D4b+2J2ZYjvo+0fbhkByn/0HSv2o8LDrbsLgndb/coUjxNtkmF3S7IESNiqm3pl5F7UU4Nx+smpmzI7qbRSX+6uFJRi34MEpP1FIxL95v/kCZWqjjkZ7IXKgNCeOXwGBnd5p63MJxGyoOzomWgj0zXUCCmv0pLwcfmWshZW2n5mNeLv3hIDaeiGzh5LY9JSXBrxjD3lwZ8StHgFbvu2sMkM6CmgP49CEwUrAXJgYbVrKtJ5v0vyI09ZpB/kHgplRdFL6UIZ4B8uWMLKfBeIOdxYIVt1zwgjI6p2plz0C7c21MlOrR2Rs0SUQVzUcSTOTlEr05xI8EY6Qq9OIfDfj7hKAgLbdKKr1h3weJRZCxe5qgsvVOfbJQCiGAa/MrGLrmgWjBqKdmigV9Gw9iQ/xI64LLnyCOEg2NmB/UPHZcgy+mj1DbjenpADUd2CgqDcEZEJCF2+ipJyiEqTL1MQELQvAkFeL6AX0mvibCr/Jlxt4fI7/RRFCT2NgGj0JAAkq5WhE84MNGgKdHEcflZUVhvfq/KGX4m9QgWcSqjsBpA4TG63ESdnWD2TSJQ5tczHUx0uYl8YypbA/2ErdsF+ajotNc/xneWCPwLk7Mp4Imirpne4mch0X3JjKbdZerrIjhBu3nFYQNh6Kli6GgzGGdKPLASovSnxZqN61+yjLP6zbx0h1rG3iIsYRi3vdEpIYi3qMhkpG3E3qO36GGyFFNlmVMqIrc6z2AjHmobAZ1R63NDqqyTUA6YwUwnzoT7V3kjmQ6cnpWK+FrGNpEkbYJsa2k48Lay3d1k9wXnRCcdBV6rLDSl4LB4Gmn7dbeyf/qRG5T5ElkDxKF96PAW+JNog3xvz/Qb4GCLqpUOc+sEa3TnHSB4ciSL5vDHdZcoogtpmXa+Ts7CVwjOipmHuUFcSPyFLB7+cAQhbQOkaRdbvJppELuw/htOZm7GSr68zo99+VmZyb1WzI5mZraq+brcLnHk5WZM0WSL0AKzZU729Prvvu8SPC6pRbsYnmb5Wrpl1U08pt9jSf1ju73Y5Pb+s8hFNGonc1tlPG5tYBvv9yEzo4NQRlV0JdLw5a/zJiqtMxj2O/7qUovoBB+gWWiGV9bMnI3CCFMOxrYq5NP1hEqpVGUqmFoaDGXOxxWFtMKxmbHbPakBJ3jP1AsQUppgxu1WQCsLm4mclO+/JfWryc1SnnHubD79QSer4fG5cmPwoIoPQqI0/MxFJFPpoawmcSfsRPB33wHulEjTcsaKMVXmjOjiVBFq35j3b1x2F2qREXxFbJC9vHG/ekWvNkOzoeTJTkE0A0U4CXDqCF9cJM/QMS37CdIl4r6x1IOVl1VE+AYPpiqU0N+VD/K88b+GacmVrPAPolN7TFyYPCfy1hfazVRy879iG5jsChg/4FK4rbpuP6VWvgcPTOketnIEeNEKDF1kyxIHHU40j0Aksy8BpONFoU7rkaXRuzLp/AcdVvrloa1xmrYSn33qldWea4GlcLuFHa7tM9RUpracmsg0eQVxBG2B/zoVhqyJyN4SnvhZsfGdPrX5EKqAqkeQZD43cja4U2XU5An5+61VMY4xLo4I5Lw7Hlg== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 45497d23-ea3b-40f2-9374-08dbb9cdaeda X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Sep 2023 11:35:25.8194 (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: xAmOrqRy28uCbWodjwfJoE2lT+kfEhz8kgP07udypDz1Wjs+iNwyik0CLtUNKlVLOCeCH0SuhOGrJzay5T8GSU1za2lXrSkz7+miq7lf1wg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR13MB4039 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 Make the header file self-containing by adding the correct include statement. Try to keep the API small by move the logic which need not expose from header file to source file verbatim. Also remove the unneeded header file include statement of source file. Signed-off-by: Chaoyong He --- drivers/net/nfp/nfdk/nfp_nfdk.h | 71 +------------------------- drivers/net/nfp/nfdk/nfp_nfdk_dp.c | 82 ++++++++++++++++++++++++++---- 2 files changed, 75 insertions(+), 78 deletions(-) diff --git a/drivers/net/nfp/nfdk/nfp_nfdk.h b/drivers/net/nfp/nfdk/nfp_nfdk.h index 66f020efb0..75ecb361ee 100644 --- a/drivers/net/nfp/nfdk/nfp_nfdk.h +++ b/drivers/net/nfp/nfdk/nfp_nfdk.h @@ -6,8 +6,9 @@ #ifndef _NFP_NFDK_H_ #define _NFP_NFDK_H_ +#include "../nfp_rxtx.h" + #define NFDK_TX_DESC_PER_SIMPLE_PKT 2 -#define NFDK_TX_DESC_GATHER_MAX 17 #define NFDK_TX_MAX_DATA_PER_HEAD 0x00001000 /* 4K */ #define NFDK_TX_MAX_DATA_PER_DESC 0x00004000 /* 16K */ @@ -16,7 +17,6 @@ /* The mask of 'dma_len_xx' of address descriptor */ #define NFDK_DESC_TX_DMA_LEN_HEAD 0x0FFF /* [0,11] */ #define NFDK_DESC_TX_DMA_LEN 0x3FFF /* [0,13] */ -#define NFDK_DESC_TX_TYPE_HEAD 0xF000 /* [12,15] */ /* The mask of upper 4 bit of first address descriptor */ #define NFDK_DESC_TX_TYPE_HEAD 0xF000 /* [12,15] */ @@ -160,73 +160,6 @@ nfp_net_nfdk_txq_full(struct nfp_net_txq *txq) return (nfp_net_nfdk_free_tx_desc(txq) < txq->tx_free_thresh); } -/* nfp_net_nfdk_tx_cksum() - Set TX CSUM offload flags in TX descriptor of nfdk */ -static inline uint64_t -nfp_net_nfdk_tx_cksum(struct nfp_net_txq *txq, - struct rte_mbuf *mb, - uint64_t flags) -{ - uint64_t ol_flags; - struct nfp_net_hw *hw = txq->hw; - - if ((hw->cap & NFP_NET_CFG_CTRL_TXCSUM) == 0) - return flags; - - ol_flags = mb->ol_flags; - - /* Set TCP csum offload if TSO enabled. */ - if ((ol_flags & RTE_MBUF_F_TX_TCP_SEG) != 0) - flags |= NFDK_DESC_TX_L4_CSUM; - - if ((ol_flags & RTE_MBUF_F_TX_TUNNEL_MASK) != 0) - flags |= NFDK_DESC_TX_ENCAP; - - /* IPv6 does not need checksum */ - if ((ol_flags & RTE_MBUF_F_TX_IP_CKSUM) != 0) - flags |= NFDK_DESC_TX_L3_CSUM; - - if ((ol_flags & RTE_MBUF_F_TX_L4_MASK) != 0) - flags |= NFDK_DESC_TX_L4_CSUM; - - return flags; -} - -/* nfp_net_nfdk_tx_tso() - Set TX descriptor for TSO of nfdk */ -static inline uint64_t -nfp_net_nfdk_tx_tso(struct nfp_net_txq *txq, - struct rte_mbuf *mb) -{ - uint8_t outer_len; - uint64_t ol_flags; - struct nfp_net_nfdk_tx_desc txd; - struct nfp_net_hw *hw = txq->hw; - - txd.raw = 0; - - if ((hw->cap & NFP_NET_CFG_CTRL_LSO_ANY) == 0) - return txd.raw; - - ol_flags = mb->ol_flags; - if ((ol_flags & RTE_MBUF_F_TX_TCP_SEG) == 0) - return txd.raw; - - txd.l3_offset = mb->l2_len; - txd.l4_offset = mb->l2_len + mb->l3_len; - txd.lso_meta_res = 0; - txd.mss = rte_cpu_to_le_16(mb->tso_segsz); - txd.lso_hdrlen = mb->l2_len + mb->l3_len + mb->l4_len; - txd.lso_totsegs = (mb->pkt_len + mb->tso_segsz) / mb->tso_segsz; - - if ((ol_flags & RTE_MBUF_F_TX_TUNNEL_MASK) != 0) { - outer_len = mb->outer_l2_len + mb->outer_l3_len; - txd.l3_offset += outer_len; - txd.l4_offset += outer_len; - txd.lso_hdrlen += outer_len; - } - - return txd.raw; -} - uint32_t nfp_flower_nfdk_pkt_add_metadata(struct rte_mbuf *mbuf, uint32_t port_id); uint16_t nfp_net_nfdk_xmit_pkts_common(void *tx_queue, diff --git a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c index 97002eed23..a85734f121 100644 --- a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c +++ b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c @@ -3,19 +3,83 @@ * All rights reserved. */ -#include +#include "nfp_nfdk.h" + #include #include -#include "../nfp_logs.h" -#include "../nfp_common.h" -#include "../nfp_rxtx.h" -#include "../nfpcore/nfp_mip.h" -#include "../nfpcore/nfp_platform.h" -#include "../nfpcore/nfp_rtsym.h" #include "../flower/nfp_flower.h" -#include "../flower/nfp_flower_cmsg.h" -#include "nfp_nfdk.h" +#include "../nfpcore/nfp_platform.h" +#include "../nfp_logs.h" + +#define NFDK_TX_DESC_GATHER_MAX 17 + +/* Set TX CSUM offload flags in TX descriptor of nfdk */ +static uint64_t +nfp_net_nfdk_tx_cksum(struct nfp_net_txq *txq, + struct rte_mbuf *mb, + uint64_t flags) +{ + uint64_t ol_flags; + struct nfp_net_hw *hw = txq->hw; + + if ((hw->cap & NFP_NET_CFG_CTRL_TXCSUM) == 0) + return flags; + + ol_flags = mb->ol_flags; + + /* Set TCP csum offload if TSO enabled. */ + if ((ol_flags & RTE_MBUF_F_TX_TCP_SEG) != 0) + flags |= NFDK_DESC_TX_L4_CSUM; + + if ((ol_flags & RTE_MBUF_F_TX_TUNNEL_MASK) != 0) + flags |= NFDK_DESC_TX_ENCAP; + + /* IPv6 does not need checksum */ + if ((ol_flags & RTE_MBUF_F_TX_IP_CKSUM) != 0) + flags |= NFDK_DESC_TX_L3_CSUM; + + if ((ol_flags & RTE_MBUF_F_TX_L4_MASK) != 0) + flags |= NFDK_DESC_TX_L4_CSUM; + + return flags; +} + +/* Set TX descriptor for TSO of nfdk */ +static uint64_t +nfp_net_nfdk_tx_tso(struct nfp_net_txq *txq, + struct rte_mbuf *mb) +{ + uint8_t outer_len; + uint64_t ol_flags; + struct nfp_net_nfdk_tx_desc txd; + struct nfp_net_hw *hw = txq->hw; + + txd.raw = 0; + + if ((hw->cap & NFP_NET_CFG_CTRL_LSO_ANY) == 0) + return txd.raw; + + ol_flags = mb->ol_flags; + if ((ol_flags & RTE_MBUF_F_TX_TCP_SEG) == 0) + return txd.raw; + + txd.l3_offset = mb->l2_len; + txd.l4_offset = mb->l2_len + mb->l3_len; + txd.lso_meta_res = 0; + txd.mss = rte_cpu_to_le_16(mb->tso_segsz); + txd.lso_hdrlen = mb->l2_len + mb->l3_len + mb->l4_len; + txd.lso_totsegs = (mb->pkt_len + mb->tso_segsz) / mb->tso_segsz; + + if ((ol_flags & RTE_MBUF_F_TX_TUNNEL_MASK) != 0) { + outer_len = mb->outer_l2_len + mb->outer_l3_len; + txd.l3_offset += outer_len; + txd.l4_offset += outer_len; + txd.lso_hdrlen += outer_len; + } + + return txd.raw; +} uint32_t nfp_flower_nfdk_pkt_add_metadata(struct rte_mbuf *mbuf,