From: Danylo Vodopianov <dvo-...@napatech.com>
Added eth_dev_close function to handle closing of Ethernet devices.
It releases managed RX/TX virtual queues.
Initialized scatter-gather queue system.
Defined constants and macros for hardware RX/TX descriptors and
packet buffer sizes.
Defined structures for RX and TX packet headers including
fields for packet length, descriptors, and color types.
Signed-off-by: Danylo Vodopianov <dvo-...@napatech.com>
---
drivers/net/ntnic/include/ntnic_dbs.h | 19 ++++
drivers/net/ntnic/include/ntnic_virt_queue.h | 22 +++++
drivers/net/ntnic/include/ntos_drv.h | 15 ++++
drivers/net/ntnic/nthw/nthw_drv.h | 1 +
drivers/net/ntnic/ntnic_ethdev.c | 67 ++++++++++++++
drivers/net/ntnic/ntnic_mod_reg.c | 5 ++
drivers/net/ntnic/ntnic_mod_reg.h | 93 ++++++++++++++++++++
7 files changed, 222 insertions(+)
create mode 100644 drivers/net/ntnic/include/ntnic_dbs.h
create mode 100644 drivers/net/ntnic/include/ntnic_virt_queue.h
diff --git a/drivers/net/ntnic/include/ntnic_dbs.h
b/drivers/net/ntnic/include/ntnic_dbs.h
new file mode 100644
index 0000000000..551c6ade43
--- /dev/null
+++ b/drivers/net/ntnic/include/ntnic_dbs.h
@@ -0,0 +1,19 @@
+/*
+ * SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2023 Napatech A/S
+ */
+
+#ifndef _NTNIC_DBS_H_
+#define _NTNIC_DBS_H_
+
+#include "nthw_fpga_model.h"
+
+/*
+ * Struct for implementation of memory bank shadows
+ */
+
+struct nthw_dbs_s;
+
+typedef struct nthw_dbs_s nthw_dbs_t;
+
+#endif /* _NTNIC_DBS_H_ */
diff --git a/drivers/net/ntnic/include/ntnic_virt_queue.h
b/drivers/net/ntnic/include/ntnic_virt_queue.h
new file mode 100644
index 0000000000..422ac3b950
--- /dev/null
+++ b/drivers/net/ntnic/include/ntnic_virt_queue.h
@@ -0,0 +1,22 @@
+/*
+ * SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2023 Napatech A/S
+ */
+
+#ifndef __NTOSS_VIRT_QUEUE_H__
+#define __NTOSS_VIRT_QUEUE_H__
+
+#include <stdint.h>
+#include <stdalign.h>
+
+#include <rte_memory.h>
+
+struct nthw_virt_queue;
+
+struct nthw_virtq_desc_buf;
+
+struct nthw_cvirtq_desc;
+
+struct nthw_received_packets;
+
+#endif /* __NTOSS_VIRT_QUEUE_H__ */
diff --git a/drivers/net/ntnic/include/ntos_drv.h
b/drivers/net/ntnic/include/ntos_drv.h
index a77e6a0247..191686a07a 100644
--- a/drivers/net/ntnic/include/ntos_drv.h
+++ b/drivers/net/ntnic/include/ntos_drv.h
@@ -27,12 +27,25 @@
#define MAX_QUEUES 125
/* Structs: */
+struct nthw_memory_descriptor {
+ void *virt_addr;
+ uint32_t len;
+};
+
+struct hwq_s {
+ int vf_num;
+ struct nthw_memory_descriptor virt_queues_ctrl;
+ struct nthw_memory_descriptor *pkt_buffers;
+};
+
struct __rte_cache_aligned ntnic_rx_queue {
struct flow_queue_id_s queue; /* queue info - user id and hw queue
index */
struct rte_mempool *mb_pool; /* mbuf memory pool */
uint16_t buf_size; /* Size of data area in mbuf */
int enabled; /* Enabling/disabling of this queue */
+ struct hwq_s hwq;
+ struct nthw_virt_queue *vq;
nt_meta_port_type_t type;
uint32_t port; /* Rx port for this queue */
enum fpga_info_profile profile; /* Inline / Capture */
@@ -41,6 +54,8 @@ struct __rte_cache_aligned ntnic_rx_queue {
struct __rte_cache_aligned ntnic_tx_queue {
struct flow_queue_id_s queue; /* queue info - user id and hw queue
index */
+ struct hwq_s hwq;
+ struct nthw_virt_queue *vq;
nt_meta_port_type_t type;
uint32_t port; /* Tx port for this queue */
diff --git a/drivers/net/ntnic/nthw/nthw_drv.h
b/drivers/net/ntnic/nthw/nthw_drv.h
index 41500f49dd..eaa2b19015 100644
--- a/drivers/net/ntnic/nthw/nthw_drv.h
+++ b/drivers/net/ntnic/nthw/nthw_drv.h
@@ -7,6 +7,7 @@
#define __NTHW_DRV_H__
#include "nthw_core.h"
+#include "ntnic_dbs.h"
typedef enum nt_meta_port_type_e {
PORT_TYPE_PHYSICAL,
diff --git a/drivers/net/ntnic/ntnic_ethdev.c b/drivers/net/ntnic/ntnic_ethdev.c
index 967e989575..79b5ae4d60 100644
--- a/drivers/net/ntnic/ntnic_ethdev.c
+++ b/drivers/net/ntnic/ntnic_ethdev.c
@@ -53,6 +53,8 @@ static const struct rte_pci_id nthw_pci_id_map[] = {
}, /* sentinel */
};
+static const struct sg_ops_s *sg_ops;
+
static rte_spinlock_t hwlock = RTE_SPINLOCK_INITIALIZER;
/*
@@ -183,6 +185,14 @@ eth_dev_infos_get(struct rte_eth_dev *eth_dev, struct
rte_eth_dev_info *dev_info
return 0;
}
+static void release_hw_virtio_queues(struct hwq_s *hwq)
+{
+ if (!hwq || hwq->vf_num == 0)
+ return;
+
+ hwq->vf_num = 0;
+}
+
static void eth_tx_queue_release(struct rte_eth_dev *eth_dev, uint16_t
queue_id)
{
(void)eth_dev;
@@ -474,6 +484,21 @@ eth_dev_close(struct rte_eth_dev *eth_dev)
struct pmd_internals *internals = (struct pmd_internals
*)eth_dev->data->dev_private;
struct drv_s *p_drv = internals->p_drv;
+ if (internals->type != PORT_TYPE_VIRTUAL) {
+ struct ntnic_rx_queue *rx_q = internals->rxq_scg;
+ struct ntnic_tx_queue *tx_q = internals->txq_scg;
+
+ uint q;
+
+ if (sg_ops != NULL) {
+ for (q = 0; q < internals->nb_rx_queues; q++)
+
sg_ops->nthw_release_mngd_rx_virt_queue(rx_q[q].vq);
+
+ for (q = 0; q < internals->nb_tx_queues; q++)
+
sg_ops->nthw_release_mngd_tx_virt_queue(tx_q[q].vq);
+ }
+ }
+
internals->p_drv = NULL;
if (p_drv) {
@@ -728,6 +753,28 @@ nthw_pci_dev_init(struct rte_pci_device *pci_dev)
return -1;
}
+ /* Initialize the queue system */
+ if (err == 0) {
+ sg_ops = get_sg_ops();
+
+ if (sg_ops != NULL) {
+ err = sg_ops->nthw_virt_queue_init(fpga_info);
+
+ if (err != 0) {
+ NT_LOG(ERR, NTNIC,
+ "%s: Cannot initialize scatter-gather
queues\n",
+
p_nt_drv->adapter_info.mp_adapter_id_str);
+
+ } else {
+ NT_LOG(DBG, NTNIC, "%s: Initialized
scatter-gather queues\n",
+
p_nt_drv->adapter_info.mp_adapter_id_str);
+ }
+
+ } else {
+ NT_LOG_DBGX(DBG, NTNIC, "SG module is not
initialized\n");
+ }
+ }
+
/* Start ctrl, monitor, stat thread only for primary process. */
if (err == 0) {
/* mp_adapter_id_str is initialized after
nt4ga_adapter_init(p_nt_drv) */
@@ -891,6 +938,26 @@ nthw_pci_dev_deinit(struct rte_eth_dev *eth_dev
__rte_unused)
ntdrv_4ga_t *p_ntdrv = &internals->p_drv->ntdrv;
fpga_info_t *fpga_info = &p_ntdrv->adapter_info.fpga_info;
const int n_phy_ports = fpga_info->n_phy_ports;
+
+ /* let running threads end Rx and Tx activity */
+ if (sg_ops != NULL) {
+ nt_os_wait_usec(1 * 1000 * 1000);
+
+ while (internals) {
+ for (i = internals->nb_tx_queues - 1; i >= 0; i--) {
+
sg_ops->nthw_release_mngd_tx_virt_queue(internals->txq_scg[i].vq);
+
release_hw_virtio_queues(&internals->txq_scg[i].hwq);
+ }
+
+ for (i = internals->nb_rx_queues - 1; i >= 0; i--) {
+
sg_ops->nthw_release_mngd_rx_virt_queue(internals->rxq_scg[i].vq);
+
release_hw_virtio_queues(&internals->rxq_scg[i].hwq);
+ }
+
+ internals = internals->next;
+ }
+ }
+
for (i = 0; i < n_phy_ports; i++) {
sprintf(name, "ntnic%d", i);
eth_dev = rte_eth_dev_allocated(name);
diff --git a/drivers/net/ntnic/ntnic_mod_reg.c
b/drivers/net/ntnic/ntnic_mod_reg.c
index ff9afbeb7c..8fe5193027 100644
--- a/drivers/net/ntnic/ntnic_mod_reg.c
+++ b/drivers/net/ntnic/ntnic_mod_reg.c
@@ -5,6 +5,11 @@
#include "ntnic_mod_reg.h"
+const struct sg_ops_s *get_sg_ops(void)
+{
+ return NULL;
+}
+
static struct link_ops_s *link_100g_ops;
void register_100g_link_ops(struct link_ops_s *ops)
diff --git a/drivers/net/ntnic/ntnic_mod_reg.h
b/drivers/net/ntnic/ntnic_mod_reg.h
index 602f5de77d..e9dff51935 100644
--- a/drivers/net/ntnic/ntnic_mod_reg.h
+++ b/drivers/net/ntnic/ntnic_mod_reg.h
@@ -13,6 +13,99 @@
#include "nthw_drv.h"
#include "nt4ga_adapter.h"
#include "ntnic_nthw_fpga_rst_nt200a0x.h"
+#include "ntnic_virt_queue.h"
+
+/* sg ops section */
+struct sg_ops_s {
+ /* Setup a virtQueue for a VM */
+ struct nthw_virt_queue *(*nthw_setup_rx_virt_queue)(nthw_dbs_t
*p_nthw_dbs,
+ uint32_t index,
+ uint16_t start_idx,
+ uint16_t start_ptr,
+ void *avail_struct_phys_addr,
+ void *used_struct_phys_addr,
+ void *desc_struct_phys_addr,
+ uint16_t queue_size,
+ uint32_t host_id,
+ uint32_t header,
+ uint32_t vq_type,
+ int irq_vector);
+ struct nthw_virt_queue *(*nthw_setup_tx_virt_queue)(nthw_dbs_t
*p_nthw_dbs,
+ uint32_t index,
+ uint16_t start_idx,
+ uint16_t start_ptr,
+ void *avail_struct_phys_addr,
+ void *used_struct_phys_addr,
+ void *desc_struct_phys_addr,
+ uint16_t queue_size,
+ uint32_t host_id,
+ uint32_t port,
+ uint32_t virtual_port,
+ uint32_t header,
+ uint32_t vq_type,
+ int irq_vector,
+ uint32_t in_order);
+ struct nthw_virt_queue *(*nthw_setup_mngd_rx_virt_queue)(nthw_dbs_t
*p_nthw_dbs,
+ uint32_t index,
+ uint32_t queue_size,
+ uint32_t host_id,
+ uint32_t header,
+ /*
+ * Memory that can be used
+ * for virtQueue structs
+ */
+ struct nthw_memory_descriptor *p_virt_struct_area,
+ /*
+ * Memory that can be used for packet
+ * buffers - Array must have queue_size
+ * entries
+ */
+ struct nthw_memory_descriptor *p_packet_buffers,
+ uint32_t vq_type,
+ int irq_vector);
+ int (*nthw_release_mngd_rx_virt_queue)(struct nthw_virt_queue *rxvq);
+ struct nthw_virt_queue *(*nthw_setup_mngd_tx_virt_queue)(nthw_dbs_t
*p_nthw_dbs,
+ uint32_t index,
+ uint32_t queue_size,
+ uint32_t host_id,
+ uint32_t port,
+ uint32_t virtual_port,
+ uint32_t header,
+ /*
+ * Memory that can be used
+ * for virtQueue structs
+ */
+ struct nthw_memory_descriptor *p_virt_struct_area,
+ /*
+ * Memory that can be used for packet
+ * buffers - Array must have queue_size
+ * entries
+ */
+ struct nthw_memory_descriptor *p_packet_buffers,
+ uint32_t vq_type,
+ int irq_vector,
+ uint32_t in_order);
+ int (*nthw_release_mngd_tx_virt_queue)(struct nthw_virt_queue *txvq);
+ /*
+ * These functions handles both Split and Packed including merged
buffers (jumbo)
+ */
+ uint16_t (*nthw_get_rx_packets)(struct nthw_virt_queue *rxvq,
+ uint16_t n,
+ struct nthw_received_packets *rp,
+ uint16_t *nb_pkts);
+ void (*nthw_release_rx_packets)(struct nthw_virt_queue *rxvq, uint16_t
n);
+ uint16_t (*nthw_get_tx_packets)(struct nthw_virt_queue *txvq,
+ uint16_t n,
+ uint16_t *first_idx,
+ struct nthw_cvirtq_desc *cvq,
+ struct nthw_memory_descriptor **p_virt_addr);
+ void (*nthw_release_tx_packets)(struct nthw_virt_queue *txvq,
+ uint16_t n,
+ uint16_t n_segs[]);
+ int (*nthw_virt_queue_init)(struct fpga_info_s *p_fpga_info);
+};
+
+const struct sg_ops_s *get_sg_ops(void);
struct link_ops_s {
int (*link_init)(struct adapter_info_s *p_adapter_info, nthw_fpga_t
*p_fpga);
--
2.45.0
