From: Chaoyong He <chaoyong.he@corigine.com>
To: dev@dpdk.org
Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com,
Chaoyong He <chaoyong.he@corigine.com>
Subject: [PATCH 09/10] net/nfp: add the xmit function of NFDk for PF representor
Date: Wed, 7 Jun 2023 09:57:08 +0800 [thread overview]
Message-ID: <20230607015709.336420-10-chaoyong.he@corigine.com> (raw)
In-Reply-To: <20230607015709.336420-1-chaoyong.he@corigine.com>
The only different logic between the NFDk xmit function of PF representor
and PF is if the logic about metadata exists. Refactor the NFDk xmit
function and use a parameter to distinguish them.
Signed-off-by: Chaoyong He <chaoyong.he@corigine.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@corigine.com>
---
drivers/net/nfp/flower/nfp_flower.c | 15 ++++++++++++++-
drivers/net/nfp/nfdk/nfp_nfdk.h | 4 ++++
drivers/net/nfp/nfdk/nfp_nfdk_dp.c | 17 +++++++++++++++--
3 files changed, 33 insertions(+), 3 deletions(-)
diff --git a/drivers/net/nfp/flower/nfp_flower.c b/drivers/net/nfp/flower/nfp_flower.c
index 3bc863b9f1..5b452da6eb 100644
--- a/drivers/net/nfp/flower/nfp_flower.c
+++ b/drivers/net/nfp/flower/nfp_flower.c
@@ -493,14 +493,27 @@ nfp_flower_pf_nfd3_xmit_pkts(void *tx_queue,
return nfp_net_nfd3_xmit_pkts_common(tx_queue, tx_pkts, nb_pkts, true);
}
+static uint16_t
+nfp_flower_pf_nfdk_xmit_pkts(void *tx_queue,
+ struct rte_mbuf **tx_pkts,
+ uint16_t nb_pkts)
+{
+ return nfp_net_nfdk_xmit_pkts_common(tx_queue, tx_pkts, nb_pkts, true);
+}
+
static void
nfp_flower_pf_xmit_pkts_register(struct nfp_app_fw_flower *app_fw_flower)
{
+ struct nfp_net_hw *hw;
struct nfp_flower_nfd_func *nfd_func;
+ hw = app_fw_flower->pf_hw;
nfd_func = &app_fw_flower->nfd_func;
- nfd_func->pf_xmit_t = nfp_flower_pf_nfd3_xmit_pkts;
+ if (hw->ver.extend == NFP_NET_CFG_VERSION_DP_NFD3)
+ nfd_func->pf_xmit_t = nfp_flower_pf_nfd3_xmit_pkts;
+ else
+ nfd_func->pf_xmit_t = nfp_flower_pf_nfdk_xmit_pkts;
}
uint16_t
diff --git a/drivers/net/nfp/nfdk/nfp_nfdk.h b/drivers/net/nfp/nfdk/nfp_nfdk.h
index 898454102d..66f020efb0 100644
--- a/drivers/net/nfp/nfdk/nfp_nfdk.h
+++ b/drivers/net/nfp/nfdk/nfp_nfdk.h
@@ -229,6 +229,10 @@ nfp_net_nfdk_tx_tso(struct nfp_net_txq *txq,
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,
+ struct rte_mbuf **tx_pkts,
+ uint16_t nb_pkts,
+ bool repr_flag);
uint16_t nfp_net_nfdk_xmit_pkts(void *tx_queue,
struct rte_mbuf **tx_pkts,
uint16_t nb_pkts);
diff --git a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c
index dbb15581c4..f66802211f 100644
--- a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c
+++ b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c
@@ -165,12 +165,20 @@ uint16_t
nfp_net_nfdk_xmit_pkts(void *tx_queue,
struct rte_mbuf **tx_pkts,
uint16_t nb_pkts)
+{
+ return nfp_net_nfdk_xmit_pkts_common(tx_queue, tx_pkts, nb_pkts, false);
+}
+
+uint16_t
+nfp_net_nfdk_xmit_pkts_common(void *tx_queue,
+ struct rte_mbuf **tx_pkts,
+ uint16_t nb_pkts,
+ bool repr_flag)
{
uint32_t buf_idx;
uint64_t dma_addr;
uint32_t free_descs;
uint32_t npkts = 0;
- uint64_t metadata = 0;
struct rte_mbuf *pkt;
struct nfp_net_hw *hw;
struct rte_mbuf **lmbuf;
@@ -203,6 +211,7 @@ nfp_net_nfdk_xmit_pkts(void *tx_queue,
uint32_t tmp_dlen;
uint32_t dlen_type;
uint32_t used_descs;
+ uint64_t metadata = 0;
pkt = *(tx_pkts + npkts);
nop_descs = nfp_net_nfdk_tx_maybe_close_block(txq, pkt);
@@ -219,7 +228,11 @@ nfp_net_nfdk_xmit_pkts(void *tx_queue,
RTE_MBUF_PREFETCH_TO_FREE(*lmbuf);
temp_pkt = pkt;
- nfp_net_nfdk_set_meta_data(pkt, txq, &metadata);
+
+ if (repr_flag)
+ metadata = NFDK_DESC_TX_CHAIN_META;
+ else
+ nfp_net_nfdk_set_meta_data(pkt, txq, &metadata);
if (unlikely(pkt->nb_segs > 1 &&
(hw->cap & NFP_NET_CFG_CTRL_GATHER) == 0)) {
--
2.39.1
next prev parent reply other threads:[~2023-06-07 1:58 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-07 1:56 [PATCH 00/10] support rte_flow for flower firmware with NFDk Chaoyong He
2023-06-07 1:57 ` [PATCH 01/10] net/nfp: fix the problem of rtsym Chaoyong He
2023-06-07 1:57 ` [PATCH 02/10] net/nfp: add a check function for the NFD version Chaoyong He
2023-06-07 1:57 ` [PATCH 03/10] net/nfp: refactor the insert metadata logic of NFD3 Chaoyong He
2023-06-07 1:57 ` [PATCH 04/10] net/nfp: add the insert metadata logic of NFDk Chaoyong He
2023-06-07 1:57 ` [PATCH 05/10] net/nfp: add a dispatch layer for Tx function of ctrl VNIC Chaoyong He
2023-06-07 1:57 ` [PATCH 06/10] net/nfp: add the xmit function of NFDk for " Chaoyong He
2023-06-07 1:57 ` [PATCH 07/10] net/nfp: add a dispatch layer for Tx function of representor Chaoyong He
2023-06-07 1:57 ` [PATCH 08/10] net/nfp: merge the xmit function of NFD3 Chaoyong He
2023-06-07 1:57 ` Chaoyong He [this message]
2023-06-07 1:57 ` [PATCH 10/10] net/nfp: merge the recv function Chaoyong He
2023-06-07 14:23 ` [PATCH 00/10] support rte_flow for flower firmware with NFDk Ferruh Yigit
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=20230607015709.336420-10-chaoyong.he@corigine.com \
--to=chaoyong.he@corigine.com \
--cc=dev@dpdk.org \
--cc=niklas.soderlund@corigine.com \
--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).