From: Rahul Bhansali <rbhans...@marvell.com>
Store the pool buffer size in lookup memory to calculate
mbuf start address for reassembly case in fastpath.
Also, restructured lookup memory data per port.
Signed-off-by: Rahul Bhansali <rbhans...@marvell.com>
---
drivers/net/cnxk/cn20k_ethdev.c | 17 +++++++++
drivers/net/cnxk/cn20k_rxtx.h | 1 +
drivers/net/cnxk/cnxk_ethdev.h | 2 +
drivers/net/cnxk/cnxk_ethdev_dp.h | 29 ++++++++++++---
drivers/net/cnxk/cnxk_lookup.c | 61 +++++++++++++++++++++++++++----
5 files changed, 98 insertions(+), 12 deletions(-)
diff --git a/drivers/net/cnxk/cn20k_ethdev.c b/drivers/net/cnxk/cn20k_ethdev.c
index db8d08cb2a..740fdb7f76 100644
--- a/drivers/net/cnxk/cn20k_ethdev.c
+++ b/drivers/net/cnxk/cn20k_ethdev.c
@@ -319,6 +319,8 @@ cn20k_nix_rx_queue_setup(struct rte_eth_dev *eth_dev,
uint16_t qid, uint16_t nb_
/* Data offset from data to start of mbuf is first_skip */
rxq->data_off = rq->first_skip;
rxq->mbuf_initializer = cnxk_nix_rxq_mbuf_setup(dev);
+ rxq->mp_buf_sz = (mp->elt_size + mp->header_size + mp->trailer_size) &
0xFFFFFFFF;
+ rxq->mp_buf_sz |= (uint64_t)mp->header_size << 32;
/* Setup security related info */
if (dev->rx_offload_flags & NIX_RX_OFFLOAD_SECURITY_F) {
@@ -358,6 +360,18 @@ cn20k_nix_rx_queue_meta_aura_update(struct rte_eth_dev
*eth_dev)
cnxk_nix_lookup_mem_metapool_set(dev);
}
+static void
+cn20k_nix_rx_queue_bufsize_update(struct rte_eth_dev *eth_dev)
+{
+ struct cnxk_eth_dev *dev = cnxk_eth_pmd_priv(eth_dev);
+ struct cn20k_eth_rxq *rxq;
+
+ rxq = eth_dev->data->rx_queues[0];
+
+ /* Store bufsize in lookup mem */
+ cnxk_nix_lookup_mem_bufsize_set(dev, rxq->mp_buf_sz);
+}
+
static int
cn20k_nix_tx_queue_stop(struct rte_eth_dev *eth_dev, uint16_t qidx)
{
@@ -590,6 +604,9 @@ cn20k_nix_dev_start(struct rte_eth_dev *eth_dev)
if (roc_idev_nix_rx_inject_get(nix->port_id))
dev->rx_offload_flags |= NIX_RX_SEC_REASSEMBLY_F;
+ if (dev->rx_offload_flags & NIX_RX_REAS_F)
+ cn20k_nix_rx_queue_bufsize_update(eth_dev);
+
cn20k_eth_set_tx_function(eth_dev);
cn20k_eth_set_rx_function(eth_dev);
return 0;
diff --git a/drivers/net/cnxk/cn20k_rxtx.h b/drivers/net/cnxk/cn20k_rxtx.h
index e40edba69d..f23c16ec07 100644
--- a/drivers/net/cnxk/cn20k_rxtx.h
+++ b/drivers/net/cnxk/cn20k_rxtx.h
@@ -82,6 +82,7 @@ struct cn20k_eth_rxq {
uint64_t meta_aura;
uintptr_t meta_pool;
uint16_t rq;
+ uint64_t mp_buf_sz;
struct cnxk_timesync_info *tstamp;
} __plt_cache_aligned;
diff --git a/drivers/net/cnxk/cnxk_ethdev.h b/drivers/net/cnxk/cnxk_ethdev.h
index 9b85927f48..daf80be51b 100644
--- a/drivers/net/cnxk/cnxk_ethdev.h
+++ b/drivers/net/cnxk/cnxk_ethdev.h
@@ -727,6 +727,8 @@ int cnxk_nix_lookup_mem_sa_base_set(struct cnxk_eth_dev
*dev);
int cnxk_nix_lookup_mem_sa_base_clear(struct cnxk_eth_dev *dev);
int cnxk_nix_lookup_mem_metapool_set(struct cnxk_eth_dev *dev);
int cnxk_nix_lookup_mem_metapool_clear(struct cnxk_eth_dev *dev);
+int cnxk_nix_lookup_mem_bufsize_set(struct cnxk_eth_dev *dev, uint64_t size);
+int cnxk_nix_lookup_mem_bufsize_clear(struct cnxk_eth_dev *dev);
__rte_internal
int cnxk_nix_inb_mode_set(struct cnxk_eth_dev *dev, bool use_inl_dev);
__rte_internal
diff --git a/drivers/net/cnxk/cnxk_ethdev_dp.h
b/drivers/net/cnxk/cnxk_ethdev_dp.h
index 100d22e759..b5836b491e 100644
--- a/drivers/net/cnxk/cnxk_ethdev_dp.h
+++ b/drivers/net/cnxk/cnxk_ethdev_dp.h
@@ -35,8 +35,11 @@
#define ERRCODE_ERRLEN_WIDTH 12
#define ERR_ARRAY_SZ ((BIT(ERRCODE_ERRLEN_WIDTH)) * sizeof(uint32_t))
-#define SA_BASE_TBL_SZ (RTE_MAX_ETHPORTS * sizeof(uintptr_t))
-#define MEMPOOL_TBL_SZ (RTE_MAX_ETHPORTS * sizeof(uintptr_t))
+#define SA_BASE_OFFSET 8 /* offset in bytes */
+#define MEMPOOL_OFFSET 8 /* offset in bytes */
+#define BUFLEN_OFFSET 8 /* offset in bytes */
+#define LOOKUP_MEM_PORTDATA_SZ (SA_BASE_OFFSET + MEMPOOL_OFFSET +
BUFLEN_OFFSET)
+#define LOOKUP_MEM_PORTDATA_TOTAL_SZ (RTE_MAX_ETHPORTS *
LOOKUP_MEM_PORTDATA_SZ)
#define CNXK_NIX_UDP_TUN_BITMASK
\
((1ull << (RTE_MBUF_F_TX_TUNNEL_VXLAN >> 45)) |
\
@@ -174,20 +177,36 @@ static __rte_always_inline uintptr_t
cnxk_nix_sa_base_get(uint16_t port, const void *lookup_mem)
{
uintptr_t sa_base_tbl;
+ uint32_t offset;
sa_base_tbl = (uintptr_t)lookup_mem;
sa_base_tbl += PTYPE_ARRAY_SZ + ERR_ARRAY_SZ;
- return *((const uintptr_t *)sa_base_tbl + port);
+ offset = port * LOOKUP_MEM_PORTDATA_SZ;
+ return *((const uintptr_t *)sa_base_tbl + offset / 8);
}
static __rte_always_inline uintptr_t
cnxk_nix_inl_metapool_get(uint16_t port, const void *lookup_mem)
{
uintptr_t metapool_tbl;
+ uint32_t offset;
metapool_tbl = (uintptr_t)lookup_mem;
- metapool_tbl += PTYPE_ARRAY_SZ + ERR_ARRAY_SZ + SA_BASE_TBL_SZ;
- return *((const uintptr_t *)metapool_tbl + port);
+ metapool_tbl += PTYPE_ARRAY_SZ + ERR_ARRAY_SZ;
+ offset = (port * LOOKUP_MEM_PORTDATA_SZ) + SA_BASE_OFFSET;
+ return *((const uintptr_t *)metapool_tbl + offset / 8);
+}
+
+static __rte_always_inline uintptr_t
+cnxk_nix_inl_bufsize_get(uint16_t port, const void *lookup_mem)
+{
+ uintptr_t bufsz_tbl;
+ uint32_t offset;
+
+ bufsz_tbl = (uintptr_t)lookup_mem;
+ bufsz_tbl += PTYPE_ARRAY_SZ + ERR_ARRAY_SZ;
+ offset = (port * LOOKUP_MEM_PORTDATA_SZ) + SA_BASE_OFFSET +
MEMPOOL_OFFSET;
+ return *((const uintptr_t *)bufsz_tbl + offset / 8);
}
#endif /* __CNXK_ETHDEV_DP_H__ */
diff --git a/drivers/net/cnxk/cnxk_lookup.c b/drivers/net/cnxk/cnxk_lookup.c
index 1e8cc396b4..7af9cb111e 100644
--- a/drivers/net/cnxk/cnxk_lookup.c
+++ b/drivers/net/cnxk/cnxk_lookup.c
@@ -7,7 +7,8 @@
#include "cnxk_ethdev.h"
-#define LOOKUP_ARRAY_SZ (PTYPE_ARRAY_SZ + ERR_ARRAY_SZ + SA_BASE_TBL_SZ +
MEMPOOL_TBL_SZ)
+#define LOOKUP_ARRAY_SZ (PTYPE_ARRAY_SZ + ERR_ARRAY_SZ +
LOOKUP_MEM_PORTDATA_TOTAL_SZ)
+
const uint32_t *
cnxk_nix_supported_ptypes_get(struct rte_eth_dev *eth_dev,
size_t *no_of_elements)
@@ -336,6 +337,7 @@ cnxk_nix_lookup_mem_sa_base_set(struct cnxk_eth_dev *dev)
uint16_t port = dev->eth_dev->data->port_id;
uintptr_t sa_base_tbl;
uintptr_t sa_base;
+ uint32_t offset;
uint8_t sa_w;
if (!lookup_mem)
@@ -351,7 +353,8 @@ cnxk_nix_lookup_mem_sa_base_set(struct cnxk_eth_dev *dev)
/* Set SA Base in lookup mem */
sa_base_tbl = (uintptr_t)lookup_mem;
sa_base_tbl += PTYPE_ARRAY_SZ + ERR_ARRAY_SZ;
- *((uintptr_t *)sa_base_tbl + port) = sa_base | sa_w;
+ offset = port * LOOKUP_MEM_PORTDATA_SZ;
+ *((uintptr_t *)sa_base_tbl + offset / 8) = sa_base | sa_w;
return 0;
}
@@ -361,6 +364,7 @@ cnxk_nix_lookup_mem_sa_base_clear(struct cnxk_eth_dev *dev)
void *lookup_mem = cnxk_nix_fastpath_lookup_mem_get();
uint16_t port = dev->eth_dev->data->port_id;
uintptr_t sa_base_tbl;
+ uint32_t offset;
if (!lookup_mem)
return -EIO;
@@ -368,7 +372,8 @@ cnxk_nix_lookup_mem_sa_base_clear(struct cnxk_eth_dev *dev)
/* Set SA Base in lookup mem */
sa_base_tbl = (uintptr_t)lookup_mem;
sa_base_tbl += PTYPE_ARRAY_SZ + ERR_ARRAY_SZ;
- *((uintptr_t *)sa_base_tbl + port) = 0;
+ offset = port * LOOKUP_MEM_PORTDATA_SZ;
+ *((uintptr_t *)sa_base_tbl + offset / 8) = 0;
return 0;
}
@@ -378,14 +383,16 @@ cnxk_nix_lookup_mem_metapool_set(struct cnxk_eth_dev *dev)
void *lookup_mem = cnxk_nix_fastpath_lookup_mem_get();
uint16_t port = dev->eth_dev->data->port_id;
uintptr_t mp_tbl;
+ uint32_t offset;
if (!lookup_mem)
return -EIO;
/* Set Mempool in lookup mem */
mp_tbl = (uintptr_t)lookup_mem;
- mp_tbl += PTYPE_ARRAY_SZ + ERR_ARRAY_SZ + SA_BASE_TBL_SZ;
- *((uintptr_t *)mp_tbl + port) = dev->nix.meta_mempool;
+ mp_tbl += PTYPE_ARRAY_SZ + ERR_ARRAY_SZ;
+ offset = (port * LOOKUP_MEM_PORTDATA_SZ) + SA_BASE_OFFSET;
+ *((uintptr_t *)mp_tbl + offset / 8) = dev->nix.meta_mempool;
return 0;
}
@@ -395,13 +402,53 @@ cnxk_nix_lookup_mem_metapool_clear(struct cnxk_eth_dev
*dev)
void *lookup_mem = cnxk_nix_fastpath_lookup_mem_get();
uint16_t port = dev->eth_dev->data->port_id;
uintptr_t mp_tbl;
+ uint32_t offset;
if (!lookup_mem)
return -EIO;
/* Clear Mempool in lookup mem */
mp_tbl = (uintptr_t)lookup_mem;
- mp_tbl += PTYPE_ARRAY_SZ + ERR_ARRAY_SZ + SA_BASE_TBL_SZ;
- *((uintptr_t *)mp_tbl + port) = dev->nix.meta_mempool;
+ mp_tbl += PTYPE_ARRAY_SZ + ERR_ARRAY_SZ;
+ offset = (port * LOOKUP_MEM_PORTDATA_SZ) + SA_BASE_OFFSET;
+ *((uintptr_t *)mp_tbl + offset / 8) = dev->nix.meta_mempool;
+ return 0;
+}
+
+int
+cnxk_nix_lookup_mem_bufsize_set(struct cnxk_eth_dev *dev, uint64_t size)
+{
+ void *lookup_mem = cnxk_nix_fastpath_lookup_mem_get();
+ uint16_t port = dev->eth_dev->data->port_id;
+ uintptr_t mp_tbl;
+ uint32_t offset;
+
+ if (!lookup_mem)
+ return -EIO;
+
+ /* Set bufsize in lookup mem */
+ mp_tbl = (uintptr_t)lookup_mem;
+ mp_tbl += PTYPE_ARRAY_SZ + ERR_ARRAY_SZ;
+ offset = (port * LOOKUP_MEM_PORTDATA_SZ) + SA_BASE_OFFSET +
MEMPOOL_OFFSET;
+ *((uintptr_t *)mp_tbl + offset / 8) = size;
+ return 0;
+}
+
+int
+cnxk_nix_lookup_mem_bufsize_clear(struct cnxk_eth_dev *dev)
+{
+ void *lookup_mem = cnxk_nix_fastpath_lookup_mem_get();
+ uint16_t port = dev->eth_dev->data->port_id;
+ uintptr_t mp_tbl;
+ uint32_t offset;
+
+ if (!lookup_mem)
+ return -EIO;
+
+ /* Clear bufsize in lookup mem */
+ mp_tbl = (uintptr_t)lookup_mem;
+ mp_tbl += PTYPE_ARRAY_SZ + ERR_ARRAY_SZ;
+ offset = (port * LOOKUP_MEM_PORTDATA_SZ) + SA_BASE_OFFSET +
MEMPOOL_OFFSET;
+ *((uintptr_t *)mp_tbl + offset / 8) = 0;
return 0;
}
--
2.34.1
