From: Chaoyong He <chaoyong.he@corigine.com>
To: dev@dpdk.org
Cc: oss-drivers@corigine.com, Chaoyong He <chaoyong.he@corigine.com>
Subject: [PATCH 03/13] net/nfp: improve modularazation of nfd3 module
Date: Wed, 20 Sep 2023 19:34:44 +0800 [thread overview]
Message-ID: <20230920113454.739356-4-chaoyong.he@corigine.com> (raw)
In-Reply-To: <20230920113454.739356-1-chaoyong.he@corigine.com>
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 <chaoyong.he@corigine.com>
---
drivers/net/nfp/nfd3/nfp_nfd3.h | 89 +--------------------------
drivers/net/nfp/nfd3/nfp_nfd3_dp.c | 96 ++++++++++++++++++++++++++++--
2 files changed, 92 insertions(+), 93 deletions(-)
diff --git a/drivers/net/nfp/nfd3/nfp_nfd3.h b/drivers/net/nfp/nfd3/nfp_nfd3.h
index 910e622fa2..7c56ca4908 100644
--- a/drivers/net/nfp/nfd3/nfp_nfd3.h
+++ b/drivers/net/nfp/nfd3/nfp_nfd3.h
@@ -6,20 +6,12 @@
#ifndef _NFP_NFD3_H_
#define _NFP_NFD3_H_
+#include "../nfp_rxtx.h"
+
/* TX descriptor format */
#define NFD3_DESC_TX_EOP RTE_BIT32(7)
#define NFD3_DESC_TX_OFFSET_MASK (0x7F) /* [0,6] */
-/* Flags in the host TX descriptor */
-#define NFD3_DESC_TX_CSUM RTE_BIT32(7)
-#define NFD3_DESC_TX_IP4_CSUM RTE_BIT32(6)
-#define NFD3_DESC_TX_TCP_CSUM RTE_BIT32(5)
-#define NFD3_DESC_TX_UDP_CSUM RTE_BIT32(4)
-#define NFD3_DESC_TX_VLAN RTE_BIT32(3)
-#define NFD3_DESC_TX_LSO RTE_BIT32(2)
-#define NFD3_DESC_TX_ENCAP RTE_BIT32(1)
-#define NFD3_DESC_TX_O_IP4_CSUM RTE_BIT32(0)
-
#define NFD3_TX_DESC_PER_PKT 1
struct nfp_net_nfd3_tx_desc {
@@ -76,83 +68,6 @@ nfp_net_nfd3_txq_full(struct nfp_net_txq *txq)
return (nfp_net_nfd3_free_tx_desc(txq) < txq->tx_free_thresh);
}
-/* nfp_net_nfd3_tx_tso() - 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) == 0)
- goto clean_txd;
-
- ol_flags = mb->ol_flags;
- if ((ol_flags & RTE_MBUF_F_TX_TCP_SEG) == 0)
- 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;
-
- if ((ol_flags & RTE_MBUF_F_TX_TUNNEL_MASK) != 0) {
- txd->l3_offset += mb->outer_l2_len + mb->outer_l3_len;
- txd->l4_offset += mb->outer_l2_len + mb->outer_l3_len;
- txd->lso_hdrlen += mb->outer_l2_len + mb->outer_l3_len;
- }
-
- txd->mss = rte_cpu_to_le_16(mb->tso_segsz);
- txd->flags = NFD3_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_nfd3_tx_cksum() - 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) == 0)
- return;
-
- ol_flags = mb->ol_flags;
-
- /* Set TCP csum offload if TSO enabled. */
- if ((ol_flags & RTE_MBUF_F_TX_TCP_SEG) != 0)
- txd->flags |= NFD3_DESC_TX_TCP_CSUM;
-
- /* IPv6 does not need checksum */
- if ((ol_flags & RTE_MBUF_F_TX_IP_CKSUM) != 0)
- txd->flags |= NFD3_DESC_TX_IP4_CSUM;
-
- if ((ol_flags & RTE_MBUF_F_TX_TUNNEL_MASK) != 0)
- txd->flags |= NFD3_DESC_TX_ENCAP;
-
- switch (ol_flags & RTE_MBUF_F_TX_L4_MASK) {
- case RTE_MBUF_F_TX_UDP_CKSUM:
- txd->flags |= NFD3_DESC_TX_UDP_CSUM;
- break;
- case RTE_MBUF_F_TX_TCP_CKSUM:
- txd->flags |= NFD3_DESC_TX_TCP_CSUM;
- break;
- }
-
- if ((ol_flags & (RTE_MBUF_F_TX_IP_CKSUM | RTE_MBUF_F_TX_L4_MASK)) != 0)
- txd->flags |= NFD3_DESC_TX_CSUM;
-}
-
uint32_t nfp_flower_nfd3_pkt_add_metadata(struct rte_mbuf *mbuf,
uint32_t port_id);
uint16_t nfp_net_nfd3_xmit_pkts_common(void *tx_queue,
diff --git a/drivers/net/nfp/nfd3/nfp_nfd3_dp.c b/drivers/net/nfp/nfd3/nfp_nfd3_dp.c
index 79e1e1041c..ab0747fc16 100644
--- a/drivers/net/nfp/nfd3/nfp_nfd3_dp.c
+++ b/drivers/net/nfp/nfd3/nfp_nfd3_dp.c
@@ -3,16 +3,100 @@
* All rights reserved.
*/
-#include <ethdev_driver.h>
+#include "nfp_nfd3.h"
+
#include <bus_pci_driver.h>
#include <rte_malloc.h>
-#include "../nfp_logs.h"
-#include "../nfp_common.h"
-#include "../nfp_rxtx.h"
#include "../flower/nfp_flower.h"
-#include "../flower/nfp_flower_cmsg.h"
-#include "nfp_nfd3.h"
+#include "../nfp_logs.h"
+
+/* Flags in the host TX descriptor */
+#define NFD3_DESC_TX_CSUM RTE_BIT32(7)
+#define NFD3_DESC_TX_IP4_CSUM RTE_BIT32(6)
+#define NFD3_DESC_TX_TCP_CSUM RTE_BIT32(5)
+#define NFD3_DESC_TX_UDP_CSUM RTE_BIT32(4)
+#define NFD3_DESC_TX_VLAN RTE_BIT32(3)
+#define NFD3_DESC_TX_LSO RTE_BIT32(2)
+#define NFD3_DESC_TX_ENCAP RTE_BIT32(1)
+#define NFD3_DESC_TX_O_IP4_CSUM RTE_BIT32(0)
+
+/* Set NFD3 TX descriptor for TSO */
+static 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) == 0)
+ goto clean_txd;
+
+ ol_flags = mb->ol_flags;
+ if ((ol_flags & RTE_MBUF_F_TX_TCP_SEG) == 0)
+ 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;
+
+ if ((ol_flags & RTE_MBUF_F_TX_TUNNEL_MASK) != 0) {
+ txd->l3_offset += mb->outer_l2_len + mb->outer_l3_len;
+ txd->l4_offset += mb->outer_l2_len + mb->outer_l3_len;
+ txd->lso_hdrlen += mb->outer_l2_len + mb->outer_l3_len;
+ }
+
+ txd->mss = rte_cpu_to_le_16(mb->tso_segsz);
+ txd->flags = NFD3_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 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) == 0)
+ return;
+
+ ol_flags = mb->ol_flags;
+
+ /* Set TCP csum offload if TSO enabled. */
+ if ((ol_flags & RTE_MBUF_F_TX_TCP_SEG) != 0)
+ txd->flags |= NFD3_DESC_TX_TCP_CSUM;
+
+ /* IPv6 does not need checksum */
+ if ((ol_flags & RTE_MBUF_F_TX_IP_CKSUM) != 0)
+ txd->flags |= NFD3_DESC_TX_IP4_CSUM;
+
+ if ((ol_flags & RTE_MBUF_F_TX_TUNNEL_MASK) != 0)
+ txd->flags |= NFD3_DESC_TX_ENCAP;
+
+ switch (ol_flags & RTE_MBUF_F_TX_L4_MASK) {
+ case RTE_MBUF_F_TX_UDP_CKSUM:
+ txd->flags |= NFD3_DESC_TX_UDP_CSUM;
+ break;
+ case RTE_MBUF_F_TX_TCP_CKSUM:
+ txd->flags |= NFD3_DESC_TX_TCP_CSUM;
+ break;
+ }
+
+ if ((ol_flags & (RTE_MBUF_F_TX_IP_CKSUM | RTE_MBUF_F_TX_L4_MASK)) != 0)
+ txd->flags |= NFD3_DESC_TX_CSUM;
+}
uint32_t
nfp_flower_nfd3_pkt_add_metadata(struct rte_mbuf *mbuf,
--
2.39.1
next prev parent reply other threads:[~2023-09-20 11:35 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-20 11:34 [PATCH 00/13] improve the modularization of NFP PMD Chaoyong He
2023-09-20 11:34 ` [PATCH 01/13] net/nfp: make sure header file is self-containing Chaoyong He
2023-09-20 11:34 ` [PATCH 02/13] net/nfp: improve modularazation of rxtx module Chaoyong He
2023-09-20 11:34 ` Chaoyong He [this message]
2023-09-20 11:34 ` [PATCH 04/13] net/nfp: improve modularazation of nfdk module Chaoyong He
2023-09-20 11:34 ` [PATCH 05/13] net/nfp: improve modularazation of common module Chaoyong He
2023-09-20 11:34 ` [PATCH 06/13] net/nfp: improve modularazation of flower module Chaoyong He
2023-09-20 11:34 ` [PATCH 07/13] net/nfp: improve modularazation of flower representor module Chaoyong He
2023-09-20 11:34 ` [PATCH 08/13] net/nfp: improve modularazation of flower ctrl module Chaoyong He
2023-09-20 11:34 ` [PATCH 09/13] net/nfp: improve modularazation of flower cmsg module Chaoyong He
2023-09-20 11:34 ` [PATCH 10/13] net/nfp: improve modularazation of flow module Chaoyong He
2023-09-20 11:34 ` [PATCH 11/13] net/nfp: improve modularazation of meter module Chaoyong He
2023-09-20 11:34 ` [PATCH 12/13] net/nfp: improve modularazation of CPP bridge module Chaoyong He
2023-09-20 11:34 ` [PATCH 13/13] net/nfp: cleanup the include statement of PMD Chaoyong He
2023-09-22 11:23 ` [PATCH 00/13] improve the modularization of NFP PMD Ferruh Yigit
2023-09-25 1:34 ` Chaoyong He
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230920113454.739356-4-chaoyong.he@corigine.com \
--to=chaoyong.he@corigine.com \
--cc=dev@dpdk.org \
--cc=oss-drivers@corigine.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).