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 0BEE1A0093; Fri, 1 Jul 2022 04:22:26 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5E48E42B9F; Fri, 1 Jul 2022 04:21:29 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2126.outbound.protection.outlook.com [40.107.244.126]) by mails.dpdk.org (Postfix) with ESMTP id 49E9742B8F for ; Fri, 1 Jul 2022 04:21:28 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=J/7QLEHnfwVtAb9UXHnbE7nTWD+YicOIjomYFP5PAN/79din0bP5QuZTzK2gV9AnmwXXyLfmc/Q3WnDvfdFY/9tHdM5WWJgf8G2M1rLUxSb6bp9ZLGGoCUn7gFh3Zz3/+Cy2X3T+bbhnvDpko39leJgv/ODH8OgLecgF3QK2usDWxXaaMkqvRxPzndjavDhsdm1uo9vBiqna0PQGHsU8RHg5I+WcikmxScla2SIOaJmZbwGBtjYEFTlOL9tTdsZKuhTRUGoLUEDqWCf0hn3HMzWaVPY0iles6ZE86jre9Yr3YAomTT93VeUouOczqa2pvWdo+xX6m0uFFm2NejpFSA== 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=RLih/exeeLcgDytXAfmMlOu3aV521w+DOOxrwU9CsuM=; b=cxCw9sknOtFBLUFXO35p9F35YwG7dgFKhKXCTejBFmry5KTbUaoRqK8stwDtbFVo3UuPKbK/WqDUx/QnXJpOJKXxfomjEfnw1zoHUWZsQdZPBRhpY7vArEaoyeHtA0kibat+Nn9Rr0rLBkGQLyOObBuk6R9VzWo3gsT4f7a528b/wjpksB+9lWbXS3WtPiosNxHlyFTMcfZS4Br3C68U2C6VWphagPVe39bsaQp0bDjiqSPPkBYK5DYduopEOhvdPJ5Fpz49VV1IWVz4zzYRB0sHkMEqAPEBn6SmNV2a12GN53bZ7f4RpIUSagCsOWjUjyfbl8V1asTVMyb0Ag/VwA== 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=RLih/exeeLcgDytXAfmMlOu3aV521w+DOOxrwU9CsuM=; b=AJiEWocfR3vVLrT/8Jb56HI+EbpgPlnNdKk+hKVYcMXV3DI1dP/Z1064HdR7IUuV2m6WgwNmxuE+jaYNheeOXFobtfHfCWS9P4eKEy8MvZ0bH/TJWQKg3dmolSue2371LVugLowkKcOWMZf8z45/Fn+Ocbd8t6b90BOeDfYk/Hw= 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 CY4PR13MB1381.namprd13.prod.outlook.com (2603:10b6:903:a0::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5395.14; Fri, 1 Jul 2022 02:21:25 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::5d9e:9ce5:51d1:2021]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::5d9e:9ce5:51d1:2021%9]) with mapi id 15.20.5395.014; Fri, 1 Jul 2022 02:21:25 +0000 From: Chaoyong He To: dev@dpdk.org Cc: niklas.soderlund@corigine.com, Chaoyong He , Heinrich Kuhn Subject: [PATCH v4 11/12] net/nfp: move rxtx function to header file Date: Fri, 1 Jul 2022 10:20:16 +0800 Message-Id: <1656642017-8992-12-git-send-email-chaoyong.he@corigine.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1656642017-8992-1-git-send-email-chaoyong.he@corigine.com> References: <1656642017-8992-1-git-send-email-chaoyong.he@corigine.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-ClientProxiedBy: SG2PR02CA0079.apcprd02.prod.outlook.com (2603:1096:4:90::19) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 49e7cc2c-328d-4c04-dda5-08da5b0865c2 X-MS-TrafficTypeDiagnostic: CY4PR13MB1381:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: b3oDgU1T6AoH8jTdPrHL+RFF/GZlso3eOwNhduATas4AW5ZX/hmek4tNOFwOAX17tKD/UoUF0+lJ+HEffgqYf6/+J9IIaIaV29RvVKkNXAzQHYYotMmsFMWRaQQCqyiDGLGIjsCeLpZSsz8u7mbedfl8dxp9wKzSy79qxqEo+PMUFynEL+lkzNdYfK+uczxOpb9KO+mlbQG60P7pF1BCrOfi8yASLhfItZ44Kr7kwu9On5YkSzwq6NjdoZU9JjWjPFhXh+5pTAAolFtJ3nxzh+5y/moS/EI2CdJoSe+pU6/QPB3s8vjPkGT/YLf63BaAkH6eyTrjoBPGSOhdJofE8IX02ENXpHo4Ro3rIb0rghfBuxYZmrcGREikyJ0QhuWS5nETLgAGSt145ILUMYa6mnfcxxOE3/FTmg+j6UPM5QgkJBIzR5ZRqCPuW8Iz3f/yiGD8Be/P4QOnRmTVY96dV5273WPobaHviPp20WqpZ9epXoRC7qXCkxnv2gEX6EiiK1h00WRx/1zSV1YZm1iCLFbKtimjSg4TZgIiiIfYDx9nT9WpDJXfAH/DRkRd9X0vUt1yR2AY6jAHucMKKO0JfQBafXtODmE/oeyMAg0aJkW57j+huvrY2StUTNFUtSTHp0MjRgnKgqIAWFNQbtRV8I5IXXXYV0OwqtjLyfZ70fGxG/J7DuerIA2Wh0VA0bVrW2bWSoKiTtxW7/OwUNgZ+XedcBGVyLax49KM5fMuUN8TxLn6Hcj4jpuFQvLfAKWNIAnxsMKO+1li3qPy8NdAF4cDXQgkX/O4WJSmit7qaNVeQbQwo+NdQT7h78cmrvtA 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:(13230016)(4636009)(376002)(346002)(136003)(39840400004)(396003)(366004)(2616005)(6486002)(8936002)(2906002)(478600001)(5660300002)(186003)(86362001)(107886003)(41300700001)(44832011)(83380400001)(6506007)(6666004)(8676002)(66476007)(66556008)(38100700002)(38350700002)(66946007)(316002)(36756003)(54906003)(4326008)(6916009)(6512007)(26005)(52116002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?S2poN1JDeTRKaFQ3eFN6ekpuOTRBdnFjdFdlQUtabnJwb3I3Vk0wMTgzbEZU?= =?utf-8?B?YmF1dVNDaE45ZmFuRzVOT3RjOExNOHZPbHhpNVlkVnQ1R0swcVd5L0tHME9k?= =?utf-8?B?b2tSWkx2TCtRRmtabEQzVjlqUnZDdGxuQXVIVlloSGRmaHJBbHBjeWphaEh3?= =?utf-8?B?ZzRFUXVQUVZDNDNNRjh6RlhMUytPcVJuZDV2VnBZOUNlbjFLVkZHUkFIU0pL?= =?utf-8?B?dVNKYTVDL1M0dEdGdVdGa2RFUW9sc1p3MWRaQm1Ja0RQTktvcFdHczd1S2JR?= =?utf-8?B?SnFaUk1pZGw2czVXN2RKNTFWYlNpR2E0dXUzL3NGQm1xdTFRVFllNmY1dTFZ?= =?utf-8?B?RDNCQXBybTY1bzBUNXVIclYyMUVHS2tTUCt1M1pwc1FzL1FqWkkrb1lxSXdr?= =?utf-8?B?THBxZDkzb1l2a1p6VzZBempvK2NDclVVdWVUdUxSbGs2VUpSL1pDQkFtR3RT?= =?utf-8?B?MWJucHpYdFJHSzVmU0tnNUkwQ0E4dlNCeXhsZmZvNzgzV080bkpjak94MnFl?= =?utf-8?B?SmpFNFdwS2ZxeWxNd094MERwUEhvdE1nMktXdkR6VGtmcmlQYmE3UzhFY3dN?= =?utf-8?B?RkdkSWd1cEpwYXdSYlU2eGUvR2U2KzMvVi9PZlVuR1JCTVpjSDQwa0grWlg3?= =?utf-8?B?SjhFNjl3bW11d01nT2g5NFIrRWdwd2Nmc0YraG42U1VMazREcUdOQXNpd2J5?= =?utf-8?B?U1p6TmhjQTl0ZHc3VEZmNEN3SDJwZXlJNmJkWTUwYURqUHM1VURLakpObWQ1?= =?utf-8?B?djZScWV3OTNJaHczdjJtRmlNU0RTOVR5YnhyR1BpeWZKaVdZS3JUeEJad1ox?= =?utf-8?B?RjZBd1ErWEs4bktIaE1GNkhXVHd4b3grQ3JoSEw1eE85QkFwRkx6TnBaMTMv?= =?utf-8?B?RENKaE1kZjBZblRZZHQ4V2dvZkNhcHdZL0xsWmVDS2FUcHA5OU0vU1V6Rytr?= =?utf-8?B?WDd2bzlCOWJLMWlIblFqR3hneHhJL0ZVV0F6ZFd0SDRJSkFaU1o3VkdmSk9N?= =?utf-8?B?by9kV0haU1hVelRlVkdzVWFDQWdSVGptWG5tZjMyYlJXekhVa2RRR1JXNUYz?= =?utf-8?B?UnJydUhsNFZQWDFPbnhQcTFuWjdkM1JPRzRqZUtTblprTkVUQlBtd0JlOW8y?= =?utf-8?B?VzdaN25hS2RhNVltcnlnbmJYQk9ib0w4elRWTGhRYk1EY3cwdkl1aVplZTF6?= =?utf-8?B?STVZbHlRTS9hQ0tnaDMxS056d2l5aTh4ZU9TREVsV0FtbXNTQTl2QTEyYlpk?= =?utf-8?B?YnRwQUtDcnA5K1FqOXdaVVd0eVF5YzlDMnpRWWFZZHROU0lEbTZaSFpTRmZ3?= =?utf-8?B?QmxUcHVDc21vazdmalNOQktmSzFBams2b3ZBT0xDb3E4L08zdmYweE9ycWlW?= =?utf-8?B?MkdJY1FReGVlVWZtR0tuSkFxeTZOVEZXV0t0UDFJS1YzNTdVR1F0MDdZUk5H?= =?utf-8?B?WDk5NEwvY0FpVlVWNlF2TGZDRUxIT0VQeVpWZ1RHWWVyazNPaHZKNEMxdXBr?= =?utf-8?B?aDcxQms5U1FkQnBrNForUUlYTDZ4RGdCYzJ3K3VLalkxcjMrdGpmdmRzSUpj?= =?utf-8?B?dXRKRGxuQnVmUmxVa3FkZ1Bza2JFUUo3dlhGYXRISU1VQzdjampsOTRja0tR?= =?utf-8?B?dG95bDRIbGw5b3AycHlzT2t1LzMwUnVRN3M5czEwTDJrTm84T0hrZXIyZzg5?= =?utf-8?B?UDZxMmVFem43eVZBNG9Fck8rQVg1eFpUMEVLekNwYi9ydkhJL1QydFRkMEdM?= =?utf-8?B?bDZKdjlMOEFYc2RPYVpWaTQwbE00MFlLNW9IbGorSXJBbERFRlYvcThueVQy?= =?utf-8?B?M0hUVnJmWTVmbGZ4RG8velQzYWJXVG81SzVjeE9Eb3ZQUEQyUGFJZFk5MjVm?= =?utf-8?B?RTBYaEdPUlVtZzVrWmN0d2FuMG9CT1ZUTFFlc0JKRkVDWWhlSnlsOVg2RWFt?= =?utf-8?B?SisvNTd6d2MyNjlwVmNPS0VTYldrU3Y1TjRlMGlYVlZveE96ZU93QUZCYnBh?= =?utf-8?B?aTBKajBQdUFyTUZIUk1Lb0tRMlUwa1g2V1g4bFZJQXUxVWhVdCs5NkZJZDhy?= =?utf-8?B?dWJjSGhFbE5XTWxqdGJkVGRCaXFFYkNlajJ1OVErUG8waXZlUjg5L3NkdkdL?= =?utf-8?B?SVc0UEZxTjhOTGlVVkU3MDNDbmFaVzVPU20vTlo3ZFNOZ05HNm91VXcvd2pU?= =?utf-8?B?Y1E9PQ==?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 49e7cc2c-328d-4c04-dda5-08da5b0865c2 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jul 2022 02:21:25.4293 (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: GWySK0+AkKyD+LIoBsLgyiuC+fl3xyPdShOYhEDrgf0IihPHrBBDJd69N3ZK3unrj6GJ7Ip8FGxw/HyEg+1h8t3F88i7AKAN58a/bocyJUg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR13MB1381 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 Flower makes use of the same Rx and Tx checksum logic as the normal PMD. Expose it so that flower can make use of it. Signed-off-by: Chaoyong He Signed-off-by: Heinrich Kuhn Reviewed-by: Niklas Söderlund --- drivers/net/nfp/nfp_common.c | 2 +- drivers/net/nfp/nfp_ethdev.c | 2 +- drivers/net/nfp/nfp_ethdev_vf.c | 2 +- drivers/net/nfp/nfp_rxtx.c | 91 +---------------------------------------- drivers/net/nfp/nfp_rxtx.h | 90 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 94 insertions(+), 93 deletions(-) diff --git a/drivers/net/nfp/nfp_common.c b/drivers/net/nfp/nfp_common.c index 0e55f0c..e86929c 100644 --- a/drivers/net/nfp/nfp_common.c +++ b/drivers/net/nfp/nfp_common.c @@ -38,9 +38,9 @@ #include "nfpcore/nfp_nsp.h" #include "nfp_common.h" +#include "nfp_ctrl.h" #include "nfp_rxtx.h" #include "nfp_logs.h" -#include "nfp_ctrl.h" #include "nfp_cpp_bridge.h" #include diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c index 4ab89db..a647f66 100644 --- a/drivers/net/nfp/nfp_ethdev.c +++ b/drivers/net/nfp/nfp_ethdev.c @@ -33,9 +33,9 @@ #include "nfpcore/nfp_nsp.h" #include "nfp_common.h" +#include "nfp_ctrl.h" #include "nfp_rxtx.h" #include "nfp_logs.h" -#include "nfp_ctrl.h" #include "nfp_cpp_bridge.h" #include "flower/nfp_flower.h" diff --git a/drivers/net/nfp/nfp_ethdev_vf.c b/drivers/net/nfp/nfp_ethdev_vf.c index d304d78..ceaf618 100644 --- a/drivers/net/nfp/nfp_ethdev_vf.c +++ b/drivers/net/nfp/nfp_ethdev_vf.c @@ -19,9 +19,9 @@ #include "nfpcore/nfp_rtsym.h" #include "nfp_common.h" +#include "nfp_ctrl.h" #include "nfp_rxtx.h" #include "nfp_logs.h" -#include "nfp_ctrl.h" static void nfp_netvf_read_mac(struct nfp_net_hw *hw) diff --git a/drivers/net/nfp/nfp_rxtx.c b/drivers/net/nfp/nfp_rxtx.c index cdcf5c2..7a6757c 100644 --- a/drivers/net/nfp/nfp_rxtx.c +++ b/drivers/net/nfp/nfp_rxtx.c @@ -17,9 +17,9 @@ #include #include "nfp_common.h" +#include "nfp_ctrl.h" #include "nfp_rxtx.h" #include "nfp_logs.h" -#include "nfp_ctrl.h" #include "nfpcore/nfp_mip.h" #include "nfpcore/nfp_rtsym.h" #include "nfpcore/nfp-common/nfp_platform.h" @@ -208,34 +208,6 @@ } } -/* nfp_net_rx_cksum - set mbuf checksum flags based on RX descriptor flags */ -static inline void -nfp_net_rx_cksum(struct nfp_net_rxq *rxq, struct nfp_net_rx_desc *rxd, - struct rte_mbuf *mb) -{ - struct nfp_net_hw *hw = rxq->hw; - - if (!(hw->ctrl & NFP_NET_CFG_CTRL_RXCSUM)) - return; - - /* If IPv4 and IP checksum error, fail */ - if (unlikely((rxd->rxd.flags & PCIE_DESC_RX_IP4_CSUM) && - !(rxd->rxd.flags & PCIE_DESC_RX_IP4_CSUM_OK))) - mb->ol_flags |= RTE_MBUF_F_RX_IP_CKSUM_BAD; - else - mb->ol_flags |= RTE_MBUF_F_RX_IP_CKSUM_GOOD; - - /* If neither UDP nor TCP return */ - if (!(rxd->rxd.flags & PCIE_DESC_RX_TCP_CSUM) && - !(rxd->rxd.flags & PCIE_DESC_RX_UDP_CSUM)) - return; - - if (likely(rxd->rxd.flags & PCIE_DESC_RX_L4_CSUM_OK)) - mb->ol_flags |= RTE_MBUF_F_RX_L4_CKSUM_GOOD; - else - mb->ol_flags |= RTE_MBUF_F_RX_L4_CKSUM_BAD; -} - /* * RX path design: * @@ -768,67 +740,6 @@ return 0; } -/* nfp_net_tx_tso - Set TX descriptor for TSO */ -static inline void -nfp_net_nfd3_tx_tso(struct nfp_net_txq *txq, struct nfp_net_nfd3_tx_desc *txd, - struct rte_mbuf *mb) -{ - uint64_t ol_flags; - struct nfp_net_hw *hw = txq->hw; - - if (!(hw->cap & NFP_NET_CFG_CTRL_LSO_ANY)) - goto clean_txd; - - ol_flags = mb->ol_flags; - - if (!(ol_flags & RTE_MBUF_F_TX_TCP_SEG)) - goto clean_txd; - - txd->l3_offset = mb->l2_len; - txd->l4_offset = mb->l2_len + mb->l3_len; - txd->lso_hdrlen = mb->l2_len + mb->l3_len + mb->l4_len; - txd->mss = rte_cpu_to_le_16(mb->tso_segsz); - txd->flags = PCIE_DESC_TX_LSO; - return; - -clean_txd: - txd->flags = 0; - txd->l3_offset = 0; - txd->l4_offset = 0; - txd->lso_hdrlen = 0; - txd->mss = 0; -} - -/* nfp_net_tx_cksum - Set TX CSUM offload flags in TX descriptor */ -static inline void -nfp_net_nfd3_tx_cksum(struct nfp_net_txq *txq, struct nfp_net_nfd3_tx_desc *txd, - struct rte_mbuf *mb) -{ - uint64_t ol_flags; - struct nfp_net_hw *hw = txq->hw; - - if (!(hw->cap & NFP_NET_CFG_CTRL_TXCSUM)) - return; - - ol_flags = mb->ol_flags; - - /* IPv6 does not need checksum */ - if (ol_flags & RTE_MBUF_F_TX_IP_CKSUM) - txd->flags |= PCIE_DESC_TX_IP4_CSUM; - - switch (ol_flags & RTE_MBUF_F_TX_L4_MASK) { - case RTE_MBUF_F_TX_UDP_CKSUM: - txd->flags |= PCIE_DESC_TX_UDP_CSUM; - break; - case RTE_MBUF_F_TX_TCP_CKSUM: - txd->flags |= PCIE_DESC_TX_TCP_CSUM; - break; - } - - if (ol_flags & (RTE_MBUF_F_TX_IP_CKSUM | RTE_MBUF_F_TX_L4_MASK)) - txd->flags |= PCIE_DESC_TX_CSUM; -} - uint16_t nfp_net_nfd3_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) { diff --git a/drivers/net/nfp/nfp_rxtx.h b/drivers/net/nfp/nfp_rxtx.h index a30171f..cd70bdd 100644 --- a/drivers/net/nfp/nfp_rxtx.h +++ b/drivers/net/nfp/nfp_rxtx.h @@ -360,6 +360,96 @@ struct nfp_net_rxq { return (nfp_net_nfd3_free_tx_desc(txq) < txq->tx_free_thresh); } +/* set mbuf checksum flags based on RX descriptor flags */ +static inline void +nfp_net_rx_cksum(struct nfp_net_rxq *rxq, struct nfp_net_rx_desc *rxd, + struct rte_mbuf *mb) +{ + struct nfp_net_hw *hw = rxq->hw; + + if (!(hw->ctrl & NFP_NET_CFG_CTRL_RXCSUM)) + return; + + /* If IPv4 and IP checksum error, fail */ + if (unlikely((rxd->rxd.flags & PCIE_DESC_RX_IP4_CSUM) && + !(rxd->rxd.flags & PCIE_DESC_RX_IP4_CSUM_OK))) + mb->ol_flags |= RTE_MBUF_F_RX_IP_CKSUM_BAD; + else + mb->ol_flags |= RTE_MBUF_F_RX_IP_CKSUM_GOOD; + + /* If neither UDP nor TCP return */ + if (!(rxd->rxd.flags & PCIE_DESC_RX_TCP_CSUM) && + !(rxd->rxd.flags & PCIE_DESC_RX_UDP_CSUM)) + return; + + if (likely(rxd->rxd.flags & PCIE_DESC_RX_L4_CSUM_OK)) + mb->ol_flags |= RTE_MBUF_F_RX_L4_CKSUM_GOOD; + else + mb->ol_flags |= RTE_MBUF_F_RX_L4_CKSUM_BAD; +} + +/* Set NFD3 TX descriptor for TSO */ +static inline void +nfp_net_nfd3_tx_tso(struct nfp_net_txq *txq, + struct nfp_net_nfd3_tx_desc *txd, + struct rte_mbuf *mb) +{ + uint64_t ol_flags; + struct nfp_net_hw *hw = txq->hw; + + if (!(hw->cap & NFP_NET_CFG_CTRL_LSO_ANY)) + goto clean_txd; + + ol_flags = mb->ol_flags; + + if (!(ol_flags & RTE_MBUF_F_TX_TCP_SEG)) + goto clean_txd; + + txd->l3_offset = mb->l2_len; + txd->l4_offset = mb->l2_len + mb->l3_len; + txd->lso_hdrlen = mb->l2_len + mb->l3_len + mb->l4_len; + txd->mss = rte_cpu_to_le_16(mb->tso_segsz); + txd->flags = PCIE_DESC_TX_LSO; + return; + +clean_txd: + txd->flags = 0; + txd->l3_offset = 0; + txd->l4_offset = 0; + txd->lso_hdrlen = 0; + txd->mss = 0; +} + +/* Set TX CSUM offload flags in NFD3 TX descriptor */ +static inline void +nfp_net_nfd3_tx_cksum(struct nfp_net_txq *txq, struct nfp_net_nfd3_tx_desc *txd, + struct rte_mbuf *mb) +{ + uint64_t ol_flags; + struct nfp_net_hw *hw = txq->hw; + + if (!(hw->cap & NFP_NET_CFG_CTRL_TXCSUM)) + return; + + ol_flags = mb->ol_flags; + + /* IPv6 does not need checksum */ + if (ol_flags & RTE_MBUF_F_TX_IP_CKSUM) + txd->flags |= PCIE_DESC_TX_IP4_CSUM; + + switch (ol_flags & RTE_MBUF_F_TX_L4_MASK) { + case RTE_MBUF_F_TX_UDP_CKSUM: + txd->flags |= PCIE_DESC_TX_UDP_CSUM; + break; + case RTE_MBUF_F_TX_TCP_CKSUM: + txd->flags |= PCIE_DESC_TX_TCP_CSUM; + break; + } + + if (ol_flags & (RTE_MBUF_F_TX_IP_CKSUM | RTE_MBUF_F_TX_L4_MASK)) + txd->flags |= PCIE_DESC_TX_CSUM; +} + int nfp_net_rx_freelist_setup(struct rte_eth_dev *dev); uint32_t nfp_net_rx_queue_count(void *rx_queue); uint16_t nfp_net_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, -- 1.8.3.1