Skip to contentSkip to conversation

vmxnet3 version V5 and V6

PATCH In review Pankaj Gupta 4 participants 37 messages May 3, 2022 – May 24, 2022

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover vmxnet3 version V5 and V6

Pankaj Gupta (8):
vmxnet3: Added V5 support
vmxnet3: implement reta query and reta update
vmxnet3: add rx queue usage count utility
vmxnet3: add get hw version api
vmxnet3, version 6
vmxnet3: set reta size
vmxnet3: Set packet for fragmented packet
vmxnet3: Fix merge error in initialization for rxDataRing feature

 drivers/net/vmxnet3/base/vmxnet3_defs.h | 135 ++++++----
 drivers/net/vmxnet3/vmxnet3_ethdev.c    | 329 +++++++++++++++++++-----
 drivers/net/vmxnet3/vmxnet3_ethdev.h    |  15 +-
 drivers/net/vmxnet3/vmxnet3_rxtx.c      |  49 +++-
 4 files changed, 416 insertions(+), 112 deletions(-)
Signature · 1 line
2.17.1
#1 lore raw

PATCH 1/8 vmxnet3: Added V5 support

Add VMXNET3 v5 support

Tested, using testpmd, for different hardware version on ESXi 7.0 Update 2.

---
 drivers/net/vmxnet3/vmxnet3_ethdev.c | 7 +++++--
 drivers/net/vmxnet3/vmxnet3_ethdev.h | 2 ++
 2 files changed, 7 insertions(+), 2 deletions(-)
drivers/net/vmxnet3/vmxnet3_ethdev.c +5 -2
index d1ef1cad08..a7e1e5fef5 100644
@@ -316,9 +316,12 @@ eth_vmxnet3_dev_init(struct rte_eth_dev *eth_dev)
 
 	/* Check h/w version compatibility with driver. */
 	ver = VMXNET3_READ_BAR1_REG(hw, VMXNET3_REG_VRRS);
-	PMD_INIT_LOG(DEBUG, "Hardware version : %d", ver);
 
-	if (ver & (1 << VMXNET3_REV_4)) {
+	if (ver & (1 << VMXNET3_REV_5)) {
+		VMXNET3_WRITE_BAR1_REG(hw, VMXNET3_REG_VRRS,
+				       1 << VMXNET3_REV_5);
+		hw->version = VMXNET3_REV_5 + 1;
+	} else if (ver & (1 << VMXNET3_REV_4)) {
 		VMXNET3_WRITE_BAR1_REG(hw, VMXNET3_REG_VRRS,
 				       1 << VMXNET3_REV_4);
 		hw->version = VMXNET3_REV_4 + 1;
drivers/net/vmxnet3/vmxnet3_ethdev.h +2 -0
index ef858ac951..7ec3b2e1f0 100644
@@ -124,11 +124,13 @@ struct vmxnet3_hw {
 	UPT1_RxStats          snapshot_rx_stats[VMXNET3_MAX_RX_QUEUES];
 };
 
+#define VMXNET3_REV_5		4		/* Vmxnet3 Rev. 5 */
 #define VMXNET3_REV_4		3		/* Vmxnet3 Rev. 4 */
 #define VMXNET3_REV_3		2		/* Vmxnet3 Rev. 3 */
 #define VMXNET3_REV_2		1		/* Vmxnet3 Rev. 2 */
 #define VMXNET3_REV_1		0		/* Vmxnet3 Rev. 1 */
 
+#define VMXNET3_VERSION_GE_5(hw) ((hw)->version >= VMXNET3_REV_5 + 1)
 #define VMXNET3_VERSION_GE_4(hw) ((hw)->version >= VMXNET3_REV_4 + 1)
 #define VMXNET3_VERSION_GE_3(hw) ((hw)->version >= VMXNET3_REV_3 + 1)
 #define VMXNET3_VERSION_GE_2(hw) ((hw)->version >= VMXNET3_REV_2 + 1)
Signature · 1 line
2.17.1
#2 lore raw

PATCH 2/8 vmxnet3: implement reta query and reta update

In reply to Pankaj Gupta

Added reta query and reta update support for VMXNET3

Tested, using testpmd, for different hardware version on ESXi 7.0 Update 2.

---
 drivers/net/vmxnet3/vmxnet3_ethdev.c | 67 ++++++++++++++++++++++++++++
 1 file changed, 67 insertions(+)
drivers/net/vmxnet3/vmxnet3_ethdev.c +67 -0
index a7e1e5fef5..eb65499cf2 100644
@@ -95,6 +95,14 @@ static int vmxnet3_mac_addr_set(struct rte_eth_dev *dev,
 				 struct rte_ether_addr *mac_addr);
 static void vmxnet3_process_events(struct rte_eth_dev *dev);
 static void vmxnet3_interrupt_handler(void *param);
+static int
+vmxnet3_rss_reta_update(struct rte_eth_dev *dev,
+			struct rte_eth_rss_reta_entry64 *reta_conf,
+			uint16_t reta_size);
+static int
+vmxnet3_rss_reta_query(struct rte_eth_dev *dev,
+		       struct rte_eth_rss_reta_entry64 *reta_conf,
+		       uint16_t reta_size);
 static int vmxnet3_dev_rx_queue_intr_enable(struct rte_eth_dev *dev,
 						uint16_t queue_id);
 static int vmxnet3_dev_rx_queue_intr_disable(struct rte_eth_dev *dev,
@@ -137,6 +145,8 @@ static const struct eth_dev_ops vmxnet3_eth_dev_ops = {
 	.tx_queue_release     = vmxnet3_dev_tx_queue_release,
 	.rx_queue_intr_enable = vmxnet3_dev_rx_queue_intr_enable,
 	.rx_queue_intr_disable = vmxnet3_dev_rx_queue_intr_disable,
+	.reta_update          = vmxnet3_rss_reta_update,
+	.reta_query           = vmxnet3_rss_reta_query,
 };
 
 struct vmxnet3_xstats_name_off {
@@ -1696,3 +1706,60 @@ RTE_PMD_REGISTER_PCI_TABLE(net_vmxnet3, pci_id_vmxnet3_map);
 RTE_PMD_REGISTER_KMOD_DEP(net_vmxnet3, "* igb_uio | uio_pci_generic | vfio-pci");
 RTE_LOG_REGISTER_SUFFIX(vmxnet3_logtype_init, init, NOTICE);
 RTE_LOG_REGISTER_SUFFIX(vmxnet3_logtype_driver, driver, NOTICE);
+
+static int
+vmxnet3_rss_reta_update(struct rte_eth_dev *dev,
+			struct rte_eth_rss_reta_entry64 *reta_conf,
+			uint16_t reta_size)
+{
+	int i, idx, shift;
+	struct vmxnet3_hw *hw = dev->data->dev_private;
+	struct VMXNET3_RSSConf *dev_rss_conf = hw->rss_conf;
+
+	if (reta_size != dev_rss_conf->indTableSize) {
+		PMD_DRV_LOG(ERR,
+			"The size of hash lookup table configured (%d) doesn't match "
+			"the supported number (%d)",
+			reta_size, dev_rss_conf->indTableSize);
+		return -EINVAL;
+	}
+
+	for (i = 0; i < reta_size; i++) {
+		idx = i / RTE_ETH_RETA_GROUP_SIZE;
+		shift = i % RTE_ETH_RETA_GROUP_SIZE;
+		if (reta_conf[idx].mask & (1ULL << shift))
+			dev_rss_conf->indTable[i] = (uint8_t)reta_conf[idx].reta[shift];
+	}
+
+	VMXNET3_WRITE_BAR1_REG(hw, VMXNET3_REG_CMD,
+				VMXNET3_CMD_UPDATE_RSSIDT);
+
+	return 0;
+}
+
+static int
+vmxnet3_rss_reta_query(struct rte_eth_dev *dev,
+		       struct rte_eth_rss_reta_entry64 *reta_conf,
+		       uint16_t reta_size)
+{
+	int i, idx, shift;
+	struct vmxnet3_hw *hw = dev->data->dev_private;
+	struct VMXNET3_RSSConf *dev_rss_conf = hw->rss_conf;
+
+	if (reta_size != dev_rss_conf->indTableSize) {
+		PMD_DRV_LOG(ERR,
+			"Size of requested hash lookup table (%d) doesn't "
+			"match the configured size (%d)",
+			reta_size, dev_rss_conf->indTableSize);
+		return -EINVAL;
+	}
+
+	for (i = 0; i < reta_size; i++) {
+		idx = i / RTE_ETH_RETA_GROUP_SIZE;
+		shift = i % RTE_ETH_RETA_GROUP_SIZE;
+		if (reta_conf[idx].mask & (1ULL << shift))
+			reta_conf[idx].reta[shift] = dev_rss_conf->indTable[i];
+	}
+
+	return 0;
+}
Signature · 1 line
2.17.1
#3 lore raw

Re: [PATCH 2/8] vmxnet3: implement reta query and reta update

Quoted 53 lines · Pankaj Gupta

Added reta query and reta update support for VMXNET3

Tested, using testpmd, for different hardware version on ESXi 7.0 Update 2.

---
  drivers/net/vmxnet3/vmxnet3_ethdev.c | 67 ++++++++++++++++++++++++++++
  1 file changed, 67 insertions(+)
drivers/net/vmxnet3/vmxnet3_ethdev.c +22 -0
index a7e1e5fef5..eb65499cf2 100644
@@ -95,6 +95,14 @@ static int vmxnet3_mac_addr_set(struct rte_eth_dev *dev,
  				 struct rte_ether_addr *mac_addr);
  static void vmxnet3_process_events(struct rte_eth_dev *dev);
  static void vmxnet3_interrupt_handler(void *param);
+static int
+vmxnet3_rss_reta_update(struct rte_eth_dev *dev,
+			struct rte_eth_rss_reta_entry64 *reta_conf,
+			uint16_t reta_size);
+static int
+vmxnet3_rss_reta_query(struct rte_eth_dev *dev,
+		       struct rte_eth_rss_reta_entry64 *reta_conf,
+		       uint16_t reta_size);
  static int vmxnet3_dev_rx_queue_intr_enable(struct rte_eth_dev *dev,
  						uint16_t queue_id);
  static int vmxnet3_dev_rx_queue_intr_disable(struct rte_eth_dev *dev,
@@ -137,6 +145,8 @@ static const struct eth_dev_ops vmxnet3_eth_dev_ops = {
  	.tx_queue_release     = vmxnet3_dev_tx_queue_release,
  	.rx_queue_intr_enable = vmxnet3_dev_rx_queue_intr_enable,
  	.rx_queue_intr_disable = vmxnet3_dev_rx_queue_intr_disable,
+	.reta_update          = vmxnet3_rss_reta_update,
+	.reta_query           = vmxnet3_rss_reta_query,
  };
 
  struct vmxnet3_xstats_name_off {
@@ -1696,3 +1706,60 @@ RTE_PMD_REGISTER_PCI_TABLE(net_vmxnet3, pci_id_vmxnet3_map);
  RTE_PMD_REGISTER_KMOD_DEP(net_vmxnet3, "* igb_uio | uio_pci_generic | vfio-pci");
  RTE_LOG_REGISTER_SUFFIX(vmxnet3_logtype_init, init, NOTICE);
  RTE_LOG_REGISTER_SUFFIX(vmxnet3_logtype_driver, driver, NOTICE);
+
+static int
+vmxnet3_rss_reta_update(struct rte_eth_dev *dev,
+			struct rte_eth_rss_reta_entry64 *reta_conf,
+			uint16_t reta_size)
+{
+	int i, idx, shift;
+	struct vmxnet3_hw *hw = dev->data->dev_private;
+	struct VMXNET3_RSSConf *dev_rss_conf = hw->rss_conf;
+
+	if (reta_size != dev_rss_conf->indTableSize) {
+		PMD_DRV_LOG(ERR,

drivers/net/vmxnet3/vmxnet3_ethdev.c RTE_PMD_REGISTER_PCI_TABLE(net_vmxnet3, pci_id_vmxnet3_map); · line 1730

Quoted 10 lines
drivers/net/vmxnet3/vmxnet3_ethdev.c +10 -0
+			"The size of hash lookup table configured (%d) doesn't match "
+			"the supported number (%d)",
+			reta_size, dev_rss_conf->indTableSize);
+		return -EINVAL;
+	}
+
+	for (i = 0; i < reta_size; i++) {
+		idx = i / RTE_ETH_RETA_GROUP_SIZE;
+		shift = i % RTE_ETH_RETA_GROUP_SIZE;
+		if (reta_conf[idx].mask & (1ULL << shift))

Please, use RTE_BIT64(shift)

drivers/net/vmxnet3/vmxnet3_ethdev.c RTE_PMD_REGISTER_PCI_TABLE(net_vmxnet3, pci_id_vmxnet3_map); · line 1731

Quoted 1 line
drivers/net/vmxnet3/vmxnet3_ethdev.c +1 -0
+			dev_rss_conf->indTable[i] = (uint8_t)reta_conf[idx].reta[shift];

Not a problem, but as I understand explicit type cast is not required.

Quoted 19 lines
drivers/net/vmxnet3/vmxnet3_ethdev.c +19 -0
+	}
+
+	VMXNET3_WRITE_BAR1_REG(hw, VMXNET3_REG_CMD,
+				VMXNET3_CMD_UPDATE_RSSIDT);
+
+	return 0;
+}
+
+static int
+vmxnet3_rss_reta_query(struct rte_eth_dev *dev,
+		       struct rte_eth_rss_reta_entry64 *reta_conf,
+		       uint16_t reta_size)
+{
+	int i, idx, shift;
+	struct vmxnet3_hw *hw = dev->data->dev_private;
+	struct VMXNET3_RSSConf *dev_rss_conf = hw->rss_conf;
+
+	if (reta_size != dev_rss_conf->indTableSize) {
+		PMD_DRV_LOG(ERR,

drivers/net/vmxnet3/vmxnet3_ethdev.c RTE_PMD_REGISTER_PCI_TABLE(net_vmxnet3, pci_id_vmxnet3_map); · line 1760

Quoted 10 lines
drivers/net/vmxnet3/vmxnet3_ethdev.c +10 -0
+			"Size of requested hash lookup table (%d) doesn't "
+			"match the configured size (%d)",
+			reta_size, dev_rss_conf->indTableSize);
+		return -EINVAL;
+	}
+
+	for (i = 0; i < reta_size; i++) {
+		idx = i / RTE_ETH_RETA_GROUP_SIZE;
+		shift = i % RTE_ETH_RETA_GROUP_SIZE;
+		if (reta_conf[idx].mask & (1ULL << shift))

Use RTE_BIT64(shift)

Quoted 5 lines
drivers/net/vmxnet3/vmxnet3_ethdev.c +5 -0
+			reta_conf[idx].reta[shift] = dev_rss_conf->indTable[i];
+	}
+
+	return 0;
+}
#4 lore raw

PATCH 3/8 vmxnet3: add rx queue usage count utility

In reply to Pankaj Gupta

Count the number of entries in the rx queue for debugging.

Tested, using testpmd, for different hardware version on ESXi 7.0 Update 2

---
 drivers/net/vmxnet3/vmxnet3_ethdev.c |  1 +
 drivers/net/vmxnet3/vmxnet3_ethdev.h |  3 +++
 drivers/net/vmxnet3/vmxnet3_rxtx.c   | 30 ++++++++++++++++++++++++++++
 3 files changed, 34 insertions(+)
drivers/net/vmxnet3/vmxnet3_ethdev.c +1 -0
index eb65499cf2..a76796716b 100644
@@ -294,6 +294,7 @@ eth_vmxnet3_dev_init(struct rte_eth_dev *eth_dev)
 	eth_dev->rx_pkt_burst = &vmxnet3_recv_pkts;
 	eth_dev->tx_pkt_burst = &vmxnet3_xmit_pkts;
 	eth_dev->tx_pkt_prepare = vmxnet3_prep_pkts;
+	eth_dev->rx_queue_count = vmxnet3_dev_rx_queue_count,
 	pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);
 
 	/* extra mbuf field is required to guess MSS */
drivers/net/vmxnet3/vmxnet3_ethdev.h +3 -0
index 7ec3b2e1f0..ceaeb66392 100644
@@ -193,6 +193,9 @@ int  vmxnet3_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id,
 				uint16_t nb_rx_desc, unsigned int socket_id,
 				const struct rte_eth_rxconf *rx_conf,
 				struct rte_mempool *mb_pool);
+
+uint32_t vmxnet3_dev_rx_queue_count(void *rx_queue);
+
 int  vmxnet3_dev_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id,
 				uint16_t nb_tx_desc, unsigned int socket_id,
 				const struct rte_eth_txconf *tx_conf);
drivers/net/vmxnet3/vmxnet3_rxtx.c +30 -0
index d745064bc4..e15b377d8c 100644
@@ -1019,6 +1019,36 @@ vmxnet3_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
 	return nb_rx;
 }
 
+uint32_t
+vmxnet3_dev_rx_queue_count(void *rx_queue)
+{
+	const vmxnet3_rx_queue_t *rxq;
+	const Vmxnet3_RxCompDesc *rcd;
+	uint32_t idx, nb_rxd = 0;
+	uint8_t gen;
+
+	rxq = rx_queue;
+	if (unlikely(rxq->stopped)) {
+		PMD_RX_LOG(DEBUG, "Rx queue is stopped.");
+		return 0;
+	}
+
+	gen = rxq->comp_ring.gen;
+	idx = rxq->comp_ring.next2proc;
+	rcd = &rxq->comp_ring.base[idx].rcd;
+	while (rcd->gen == gen) {
+		if (rcd->eop)
+			++nb_rxd;
+		if (++idx == rxq->comp_ring.size) {
+			idx = 0;
+			gen ^= 1;
+		}
+		rcd = &rxq->comp_ring.base[idx].rcd;
+	}
+
+	return nb_rxd;
+}
+
 int
 vmxnet3_dev_tx_queue_setup(struct rte_eth_dev *dev,
 			   uint16_t queue_idx,
Signature · 1 line
2.17.1
#5 lore raw

Re: [PATCH 3/8] vmxnet3: add rx queue usage count utility

rx -> Rx

in summary in accordance with spelling in DPDK

Quoted 1 line · Pankaj Gupta

Count the number of entries in the rx queue for debugging.

rx -> Rx

As I understand debugging is not the only purpose of the API.

Quoted 15 lines

Tested, using testpmd, for different hardware version on ESXi 7.0 Update 2

---
  drivers/net/vmxnet3/vmxnet3_ethdev.c |  1 +
  drivers/net/vmxnet3/vmxnet3_ethdev.h |  3 +++
  drivers/net/vmxnet3/vmxnet3_rxtx.c   | 30 ++++++++++++++++++++++++++++
  3 files changed, 34 insertions(+)
drivers/net/vmxnet3/vmxnet3_ethdev.c +0 -0
index eb65499cf2..a76796716b 100644

drivers/net/vmxnet3/vmxnet3_ethdev.c eth_vmxnet3_dev_init(struct rte_eth_dev *eth_dev) · line 297

Quoted 4 lines
drivers/net/vmxnet3/vmxnet3_ethdev.c +1 -0
@@ -294,6 +294,7 @@ eth_vmxnet3_dev_init(struct rte_eth_dev *eth_dev)
  	eth_dev->rx_pkt_burst = &vmxnet3_recv_pkts;
  	eth_dev->tx_pkt_burst = &vmxnet3_xmit_pkts;
  	eth_dev->tx_pkt_prepare = vmxnet3_prep_pkts;
+	eth_dev->rx_queue_count = vmxnet3_dev_rx_queue_count,

Please, put it just after rx_pkt_burst to preserve the same order as in structure.

Quoted 3 lines
drivers/net/vmxnet3/vmxnet3_ethdev.c +0 -0
  	pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);
 
  	/* extra mbuf field is required to guess MSS */

[snip]

#6 lore raw

RE: [PATCH 3/8] vmxnet3: add rx queue usage count utility

Quoted 5 lines

From: Andrew Rybchenko [mailto:[email protected]]
Sent: Wednesday, 4 May 2022 16.28

rx -> Rx

Quoted 8 lines

in summary in accordance with spelling in DPDK

Quoted 1 line · Pankaj Gupta

Count the number of entries in the rx queue for debugging.

rx -> Rx

As I understand debugging is not the only purpose of the API.

Correct. E.g. our appliance uses it in the production data plane, not just for debugging. We only need the function to return an approximate number, though.

Quoted 32 lines
Quoted 3 lines

Tested, using testpmd, for different hardware version on ESXi 7.0

Update 2

Quoted 6 lines
---
  drivers/net/vmxnet3/vmxnet3_ethdev.c |  1 +
  drivers/net/vmxnet3/vmxnet3_ethdev.h |  3 +++
  drivers/net/vmxnet3/vmxnet3_rxtx.c   | 30

++++++++++++++++++++++++++++

Review

Quoted 3 lines
  3 files changed, 34 insertions(+)
(quoted diff) +0 -0

b/drivers/net/vmxnet3/vmxnet3_ethdev.c

drivers/net/vmxnet3/vmxnet3_ethdev.c eth_vmxnet3_dev_init(struct rte_eth_dev *eth_dev) · line 297

Quoted 8 lines

index eb65499cf2..a76796716b 100644

drivers/net/vmxnet3/vmxnet3_ethdev.c +1 -0
@@ -294,6 +294,7 @@ eth_vmxnet3_dev_init(struct rte_eth_dev *eth_dev)
  	eth_dev->rx_pkt_burst = &vmxnet3_recv_pkts;
  	eth_dev->tx_pkt_burst = &vmxnet3_xmit_pkts;
  	eth_dev->tx_pkt_prepare = vmxnet3_prep_pkts;
+	eth_dev->rx_queue_count = vmxnet3_dev_rx_queue_count,

Please, put it just after rx_pkt_burst to preserve the same order as in structure.

Quoted 3 lines
drivers/net/vmxnet3/vmxnet3_ethdev.c +0 -0
  	pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);
 
  	/* extra mbuf field is required to guess MSS */

[snip]

#7 lore raw

Re: [PATCH 3/8] vmxnet3: add rx queue usage count utility

In reply to Andrew Rybchenko

Hi Andrew,
Please refer struct rte_eth_dev. Following assignment already preserve the order in struct rte_eth_dev

drivers/net/vmxnet3/vmxnet3_ethdev.c eth_vmxnet3_dev_init(struct rte_eth_dev *eth_dev) · line 297

Quoted 9 lines
drivers/net/vmxnet3/vmxnet3_ethdev.c +1 -0
index eb65499cf2..a76796716b 100644
@@ -294,6 +294,7 @@ eth_vmxnet3_dev_init(struct rte_eth_dev *eth_dev)
      eth_dev->rx_pkt_burst = &vmxnet3_recv_pkts;
      eth_dev->tx_pkt_burst = &vmxnet3_xmit_pkts;
      eth_dev->tx_pkt_prepare = vmxnet3_prep_pkts;
+     eth_dev->rx_queue_count = vmxnet3_dev_rx_queue_count,

Please, put it just after rx_pkt_burst to preserve the same order as in structure.

/**
* @internal
* The generic data structure associated with each Ethernet device. *
* Pointers to burst-oriented packet receive and transmit functions are
* located at the beginning of the structure, along with the pointer to
* where all the data elements for the particular device are stored in shared
* memory. This split allows the function pointer and driver data to be per-
* process, while the actual configuration data for the device is shared. */

struct rte_eth_dev {
    eth_rx_burst_t rx_pkt_burst; /**< Pointer to PMD receive function */
    eth_tx_burst_t tx_pkt_burst; /**< Pointer to PMD transmit function */

    /** Pointer to PMD transmit prepare function */
    eth_tx_prep_t tx_pkt_prepare;
    /** Get the number of used Rx descriptors */
    eth_rx_queue_count_t rx_queue_count;
    /** Check the status of a Rx descriptor */
    eth_rx_descriptor_status_t rx_descriptor_status;
    /** Check the status of a Tx descriptor */
    eth_tx_descriptor_status_t tx_descriptor_status;

    /**
     * Device data that is shared between primary and secondary processes
     */
    struct rte_eth_dev_data *data;
    void *process_private; /**< Pointer to per-process device data */
    const struct eth_dev_ops *dev_ops; /**< Functions exported by PMD */
    struct rte_device *device; /**< Backing device */

struct rte_intr_handle *intr_handle; /**< Device interrupt handle */

    /** User application callbacks for NIC interrupts */
    struct rte_eth_dev_cb_list link_intr_cbs;
    /**
     * User-supplied functions called from rx_burst to post-process
     * received packets before passing them to the user
     */
    struct rte_eth_rxtx_callback *post_rx_burst_cbs[RTE_MAX_QUEUES_PER_PORT];
    /**
     * User-supplied functions called from tx_burst to pre-process
     * received packets before passing them to the driver for transmission
     */
    struct rte_eth_rxtx_callback *pre_tx_burst_cbs[RTE_MAX_QUEUES_PER_PORT];

    enum rte_eth_dev_state state; /**< Flag indicating the port state */
    void *security_ctx; /**< Context for security ops */
} __rte_cache_aligned;

Thanks,
Pankaj

From: Andrew Rybchenko <[email protected]>
Date: Wednesday, May 4, 2022 at 7:27 AM
To: Pankaj Gupta <[email protected]>, Jochen Behrens <[email protected]>, Yong Wang <[email protected]>
Cc: [email protected] <[email protected]>
Subject: Re: [PATCH 3/8] vmxnet3: add rx queue usage count utility
⚠ External Email

rx -> Rx

in summary in accordance with spelling in DPDK

Quoted 1 line · Pankaj Gupta

Count the number of entries in the rx queue for debugging.

rx -> Rx

As I understand debugging is not the only purpose of the API.

Quoted 15 lines

Tested, using testpmd, for different hardware version on ESXi 7.0 Update 2

---
  drivers/net/vmxnet3/vmxnet3_ethdev.c |  1 +
  drivers/net/vmxnet3/vmxnet3_ethdev.h |  3 +++
  drivers/net/vmxnet3/vmxnet3_rxtx.c   | 30 ++++++++++++++++++++++++++++
  3 files changed, 34 insertions(+)
drivers/net/vmxnet3/vmxnet3_ethdev.c +0 -0
index eb65499cf2..a76796716b 100644

drivers/net/vmxnet3/vmxnet3_ethdev.c eth_vmxnet3_dev_init(struct rte_eth_dev *eth_dev) · line 297

Quoted 4 lines
drivers/net/vmxnet3/vmxnet3_ethdev.c +1 -0
@@ -294,6 +294,7 @@ eth_vmxnet3_dev_init(struct rte_eth_dev *eth_dev)
      eth_dev->rx_pkt_burst = &vmxnet3_recv_pkts;
      eth_dev->tx_pkt_burst = &vmxnet3_xmit_pkts;
      eth_dev->tx_pkt_prepare = vmxnet3_prep_pkts;
+     eth_dev->rx_queue_count = vmxnet3_dev_rx_queue_count,

Please, put it just after rx_pkt_burst to preserve the same order as in structure.

drivers/net/vmxnet3/vmxnet3_ethdev.c eth_vmxnet3_dev_init(struct rte_eth_dev *eth_dev) · line 300

Quoted 3 lines
drivers/net/vmxnet3/vmxnet3_ethdev.c +0 -0
      pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);
 
      /* extra mbuf field is required to guess MSS */

[snip]

________________________________

⚠ External Email: This email originated from outside of the organization. Do not click links or open attachments unless you recognize the sender.

#8 lore raw

PATCH 4/8 vmxnet3: add get hw version api

In reply to Pankaj Gupta

Implement fw_version_get API for vmxnet3

Tested, using testpmd, for different hardware version on ESXi 7.0 Update 2.

---
 drivers/net/vmxnet3/vmxnet3_ethdev.c | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
drivers/net/vmxnet3/vmxnet3_ethdev.c +21 -0
index a76796716b..f77399f145 100644
@@ -103,6 +103,10 @@ static int
 vmxnet3_rss_reta_query(struct rte_eth_dev *dev,
 		       struct rte_eth_rss_reta_entry64 *reta_conf,
 		       uint16_t reta_size);
+static int
+vmxnet3_hw_ver_get(struct rte_eth_dev *dev,
+		   char *fw_version, size_t fw_size);
+
 static int vmxnet3_dev_rx_queue_intr_enable(struct rte_eth_dev *dev,
 						uint16_t queue_id);
 static int vmxnet3_dev_rx_queue_intr_disable(struct rte_eth_dev *dev,
@@ -147,6 +151,7 @@ static const struct eth_dev_ops vmxnet3_eth_dev_ops = {
 	.rx_queue_intr_disable = vmxnet3_dev_rx_queue_intr_disable,
 	.reta_update          = vmxnet3_rss_reta_update,
 	.reta_query           = vmxnet3_rss_reta_query,
+	.fw_version_get       = vmxnet3_hw_ver_get,
 };
 
 struct vmxnet3_xstats_name_off {
@@ -1764,3 +1769,19 @@ vmxnet3_rss_reta_query(struct rte_eth_dev *dev,
 
 	return 0;
 }
+
+static int
+vmxnet3_hw_ver_get(struct rte_eth_dev *dev,
+		   char *fw_version, size_t fw_size)
+{
+	int ret;
+	struct vmxnet3_hw *hw = dev->data->dev_private;
+
+	ret = snprintf(fw_version, fw_size, "v%d", hw->version);
+
+	ret += 1; /* add the size of '\0' */
+	if (fw_size < (uint32_t)ret)
+		return ret;
+	else
+		return 0;
+}
Signature · 1 line
2.17.1
#9 lore raw

Re: [PATCH 4/8] vmxnet3: add get hw version api

hw -> HW

However, the API says that it is a firmware version get

Consier:
net/vmxnet3: report HW version on FW version get

Quoted 1 line · Pankaj Gupta

Implement fw_version_get API for vmxnet3

fw -> FW

"for vmxnet3" is a duplicate, since summary already says so.

Quoted 25 lines

Tested, using testpmd, for different hardware version on ESXi 7.0 Update 2.

---
  drivers/net/vmxnet3/vmxnet3_ethdev.c | 21 +++++++++++++++++++++
  1 file changed, 21 insertions(+)
drivers/net/vmxnet3/vmxnet3_ethdev.c +4 -0
index a76796716b..f77399f145 100644
@@ -103,6 +103,10 @@ static int
  vmxnet3_rss_reta_query(struct rte_eth_dev *dev,
  		       struct rte_eth_rss_reta_entry64 *reta_conf,
  		       uint16_t reta_size);
+static int
+vmxnet3_hw_ver_get(struct rte_eth_dev *dev,
+		   char *fw_version, size_t fw_size);
+
  static int vmxnet3_dev_rx_queue_intr_enable(struct rte_eth_dev *dev,
  						uint16_t queue_id);
  static int vmxnet3_dev_rx_queue_intr_disable(struct rte_eth_dev *dev,

drivers/net/vmxnet3/vmxnet3_ethdev.c static const struct eth_dev_ops vmxnet3_eth_dev_ops = { · line 154

Quoted 4 lines
drivers/net/vmxnet3/vmxnet3_ethdev.c +1 -0
@@ -147,6 +151,7 @@ static const struct eth_dev_ops vmxnet3_eth_dev_ops = {
  	.rx_queue_intr_disable = vmxnet3_dev_rx_queue_intr_disable,
  	.reta_update          = vmxnet3_rss_reta_update,
  	.reta_query           = vmxnet3_rss_reta_query,
+	.fw_version_get       = vmxnet3_hw_ver_get,

In general, addition order does not matter and it is recommended to follow order in eth_dev_ops here (and where functions are declared, and where functions are defined).

Quoted 23 lines
drivers/net/vmxnet3/vmxnet3_ethdev.c +16 -0
  };
 
  struct vmxnet3_xstats_name_off {
@@ -1764,3 +1769,19 @@ vmxnet3_rss_reta_query(struct rte_eth_dev *dev,
 
  	return 0;
  }
+
+static int
+vmxnet3_hw_ver_get(struct rte_eth_dev *dev,
+		   char *fw_version, size_t fw_size)
+{
+	int ret;
+	struct vmxnet3_hw *hw = dev->data->dev_private;
+
+	ret = snprintf(fw_version, fw_size, "v%d", hw->version);
+
+	ret += 1; /* add the size of '\0' */
+	if (fw_size < (uint32_t)ret)
+		return ret;
+	else
+		return 0;
+}
#10 lore raw

PATCH 5/8 vmxnet3, version 6

In reply to Pankaj Gupta

vmxnet3 version 6 supports some new features, including but not limited to:
- Increased max MTU up to 9190
- Increased max number of queues, both for RX and TX
- Removes power-of-two limitations
- Extended interrupt structures, required implementation for additional number of queues

Tested, using testpmd, for different hardware version on ESXi 7.0 Update 2.

---
 drivers/net/vmxnet3/base/vmxnet3_defs.h | 135 +++++++++-----
 drivers/net/vmxnet3/vmxnet3_ethdev.c    | 223 +++++++++++++++++-------
 drivers/net/vmxnet3/vmxnet3_ethdev.h    |  10 +-
 drivers/net/vmxnet3/vmxnet3_rxtx.c      |   2 +-
 4 files changed, 260 insertions(+), 110 deletions(-)
drivers/net/vmxnet3/base/vmxnet3_defs.h +91 -44
index 8d62b3e116..ceac5d64db 100644
@@ -72,38 +72,42 @@
 #endif
 
 typedef enum {
-   VMXNET3_CMD_FIRST_SET = 0xCAFE0000,
-   VMXNET3_CMD_ACTIVATE_DEV = VMXNET3_CMD_FIRST_SET,
-   VMXNET3_CMD_QUIESCE_DEV,
-   VMXNET3_CMD_RESET_DEV,
-   VMXNET3_CMD_UPDATE_RX_MODE,
-   VMXNET3_CMD_UPDATE_MAC_FILTERS,
-   VMXNET3_CMD_UPDATE_VLAN_FILTERS,
-   VMXNET3_CMD_UPDATE_RSSIDT,
-   VMXNET3_CMD_UPDATE_IML,
-   VMXNET3_CMD_UPDATE_PMCFG,
-   VMXNET3_CMD_UPDATE_FEATURE,
-   VMXNET3_CMD_STOP_EMULATION,
-   VMXNET3_CMD_LOAD_PLUGIN,
-   VMXNET3_CMD_ACTIVATE_VF,
-   VMXNET3_CMD_RESERVED3,
-   VMXNET3_CMD_RESERVED4,
-   VMXNET3_CMD_REGISTER_MEMREGS,
-   VMXNET3_CMD_SET_RSS_FIELDS,
-
-   VMXNET3_CMD_FIRST_GET = 0xF00D0000,
-   VMXNET3_CMD_GET_QUEUE_STATUS = VMXNET3_CMD_FIRST_GET,
-   VMXNET3_CMD_GET_STATS,
-   VMXNET3_CMD_GET_LINK,
-   VMXNET3_CMD_GET_PERM_MAC_LO,
-   VMXNET3_CMD_GET_PERM_MAC_HI,
-   VMXNET3_CMD_GET_DID_LO,
-   VMXNET3_CMD_GET_DID_HI,
-   VMXNET3_CMD_GET_DEV_EXTRA_INFO,
-   VMXNET3_CMD_GET_CONF_INTR,
-   VMXNET3_CMD_GET_ADAPTIVE_RING_INFO,
-   VMXNET3_CMD_GET_TXDATA_DESC_SIZE,
-   VMXNET3_CMD_RESERVED5,
+	VMXNET3_CMD_FIRST_SET = 0xCAFE0000,
+	VMXNET3_CMD_ACTIVATE_DEV = VMXNET3_CMD_FIRST_SET,
+	VMXNET3_CMD_QUIESCE_DEV,
+	VMXNET3_CMD_RESET_DEV,
+	VMXNET3_CMD_UPDATE_RX_MODE,
+	VMXNET3_CMD_UPDATE_MAC_FILTERS,
+	VMXNET3_CMD_UPDATE_VLAN_FILTERS,
+	VMXNET3_CMD_UPDATE_RSSIDT,
+	VMXNET3_CMD_UPDATE_IML,
+	VMXNET3_CMD_UPDATE_PMCFG,
+	VMXNET3_CMD_UPDATE_FEATURE,
+	VMXNET3_CMD_STOP_EMULATION,
+	VMXNET3_CMD_LOAD_PLUGIN,
+	VMXNET3_CMD_ACTIVATE_VF,
+	VMXNET3_CMD_RESERVED3,
+	VMXNET3_CMD_RESERVED4,
+	VMXNET3_CMD_REGISTER_MEMREGS,
+	VMXNET3_CMD_SET_RSS_FIELDS,
+
+	VMXNET3_CMD_FIRST_GET = 0xF00D0000,
+	VMXNET3_CMD_GET_QUEUE_STATUS = VMXNET3_CMD_FIRST_GET,
+	VMXNET3_CMD_GET_STATS,
+	VMXNET3_CMD_GET_LINK,
+	VMXNET3_CMD_GET_PERM_MAC_LO,
+	VMXNET3_CMD_GET_PERM_MAC_HI,
+	VMXNET3_CMD_GET_DID_LO,
+	VMXNET3_CMD_GET_DID_HI,
+	VMXNET3_CMD_GET_DEV_EXTRA_INFO,
+	VMXNET3_CMD_GET_CONF_INTR,
+	VMXNET3_CMD_GET_ADAPTIVE_RING_INFO,
+	VMXNET3_CMD_GET_TXDATA_DESC_SIZE,
+	VMXNET3_CMD_RESERVED5,
+	VMXNET3_CMD_RESERVED6,
+	VMXNET3_CMD_RESERVED7,
+	VMXNET3_CMD_RESERVED8,
+	VMXNET3_CMD_GET_MAX_QUEUES_CONF,
 } Vmxnet3_Cmd;
 
 /* Adaptive Ring Info Flags */
@@ -571,6 +575,24 @@ enum vmxnet3_intr_type {
 /* addition 1 for events */
 #define VMXNET3_MAX_INTRS      25
 
+/* Version 6 and later will use below macros */
+#define VMXNET3_EXT_MAX_TX_QUEUES  32
+#define VMXNET3_EXT_MAX_RX_QUEUES  32
+
+/* Version-dependent MAX RX/TX queues macro */
+#define MAX_RX_QUEUES \
+	(VMXNET3_VERSION_GE_6(hw) ? \
+	VMXNET3_EXT_MAX_RX_QUEUES : \
+	VMXNET3_MAX_RX_QUEUES)
+#define MAX_TX_QUEUES \
+	(VMXNET3_VERSION_GE_6(hw) ? \
+	VMXNET3_EXT_MAX_TX_QUEUES : \
+	VMXNET3_MAX_TX_QUEUES)
+
+/* addition 1 for events */
+#define VMXNET3_EXT_MAX_INTRS      65
+#define VMXNET3_FIRST_SET_INTRS    64
+
 /* value of intrCtrl */
 #define VMXNET3_IC_DISABLE_ALL  0x1   /* bit 0 */
 
@@ -587,6 +609,21 @@ struct Vmxnet3_IntrConf {
 #include "vmware_pack_end.h"
 Vmxnet3_IntrConf;
 
+typedef
+#include "vmware_pack_begin.h"
+struct Vmxnet3_IntrConfExt {
+	uint8    autoMask;
+	uint8    numIntrs;      /* # of interrupts */
+	uint8    eventIntrIdx;
+	uint8    reserved;
+	__le32   intrCtrl;
+	__le32   reserved1;
+	uint8    modLevels[VMXNET3_EXT_MAX_INTRS]; /* moderation level for each intr */
+	uint8    reserved2[3];
+}
+#include "vmware_pack_end.h"
+Vmxnet3_IntrConfExt;
+
 /* one bit per VLAN ID, the size is in the units of uint32 */
 #define VMXNET3_VFT_SIZE  (4096 / (sizeof(uint32) * 8))
 
@@ -692,6 +729,15 @@ struct Vmxnet3_DSDevRead {
 #include "vmware_pack_end.h"
 Vmxnet3_DSDevRead;
 
+typedef
+#include "vmware_pack_begin.h"
+struct Vmxnet3_DSDevReadExt {
+	/* read-only region for device, read by dev in response to a SET cmd */
+	struct Vmxnet3_IntrConfExt    intrConfExt;
+}
+#include "vmware_pack_end.h"
+Vmxnet3_DSDevReadExt;
+
 typedef
 #include "vmware_pack_begin.h"
 struct Vmxnet3_TxQueueDesc {
@@ -778,18 +824,18 @@ Vmxnet3_CmdInfo;
 typedef
 #include "vmware_pack_begin.h"
 struct Vmxnet3_DriverShared {
-   __le32               magic;
-   __le32               pad; /* make devRead start at 64-bit boundaries */
-   Vmxnet3_DSDevRead    devRead;
-   __le32               ecr;
-   __le32               reserved;
-
-   union {
-      __le32            reserved1[4];
-      Vmxnet3_CmdInfo   cmdInfo; /* only valid in the context of executing the
-				  * relevant command
-				  */
-   } cu;
+	__le32               magic;
+	__le32               size;    /* size of DriverShared */
+	Vmxnet3_DSDevRead    devRead;
+	__le32               ecr;
+	__le32               reserved;
+
+	union {
+		__le32			reserved1[4];
+		/* only valid in the context of executing the relevant command */
+		Vmxnet3_CmdInfo	cmdInfo;
+	} cu;
+	struct Vmxnet3_DSDevReadExt   devReadExt;
 }
 #include "vmware_pack_end.h"
 Vmxnet3_DriverShared;
@@ -821,6 +867,7 @@ do {\
    ((vfTable[vid >> 5] & (1 << (vid & 31))) != 0)
 
 #define VMXNET3_MAX_MTU     9000
+#define VMXNET3_V6_MAX_MTU  9190
 #define VMXNET3_MIN_MTU     60
 
 #define VMXNET3_LINK_UP         (10000 << 16 | 1)    // 10 Gbps, up
drivers/net/vmxnet3/vmxnet3_ethdev.c +162 -61

342 lines not on this page · raw message

drivers/net/vmxnet3/vmxnet3_ethdev.h +6 -4
index ceaeb66392..5a303717b1 100644
@@ -70,7 +70,7 @@ struct vmxnet3_intr {
 	enum vmxnet3_intr_type      type; /* MSI-X, MSI, or INTx? */
 	uint8_t num_intrs;                /* # of intr vectors */
 	uint8_t event_intr_idx;           /* idx of the intr vector for event */
-	uint8_t mod_levels[VMXNET3_MAX_MSIX_VECT]; /* moderation level */
+	uint8_t mod_levels[VMXNET3_EXT_MAX_INTRS]; /* moderation level */
 	bool lsc_only;                    /* no Rx queue interrupt */
 };
 
@@ -108,6 +108,7 @@ struct vmxnet3_hw {
 	uint64_t              queueDescPA;
 	uint16_t              queue_desc_len;
 	uint16_t              mtu;
+	bool                  queuesExtEnabled;
 
 	VMXNET3_RSSConf       *rss_conf;
 	uint64_t              rss_confPA;
@@ -117,19 +118,20 @@ struct vmxnet3_hw {
 	Vmxnet3_MemRegs	      *memRegs;
 	uint64_t	      memRegsPA;
 #define VMXNET3_VFT_TABLE_SIZE     (VMXNET3_VFT_SIZE * sizeof(uint32_t))
-	UPT1_TxStats	      saved_tx_stats[VMXNET3_MAX_TX_QUEUES];
-	UPT1_RxStats	      saved_rx_stats[VMXNET3_MAX_RX_QUEUES];
-
+	UPT1_TxStats	      saved_tx_stats[VMXNET3_EXT_MAX_TX_QUEUES];
+	UPT1_RxStats	      saved_rx_stats[VMXNET3_EXT_MAX_RX_QUEUES];
 	UPT1_TxStats          snapshot_tx_stats[VMXNET3_MAX_TX_QUEUES];
 	UPT1_RxStats          snapshot_rx_stats[VMXNET3_MAX_RX_QUEUES];
 };
 
+#define VMXNET3_REV_6		5		/* Vmxnet3 Rev. 6 */
 #define VMXNET3_REV_5		4		/* Vmxnet3 Rev. 5 */
 #define VMXNET3_REV_4		3		/* Vmxnet3 Rev. 4 */
 #define VMXNET3_REV_3		2		/* Vmxnet3 Rev. 3 */
 #define VMXNET3_REV_2		1		/* Vmxnet3 Rev. 2 */
 #define VMXNET3_REV_1		0		/* Vmxnet3 Rev. 1 */
 
+#define VMXNET3_VERSION_GE_6(hw) ((hw)->version >= VMXNET3_REV_6 + 1)
 #define VMXNET3_VERSION_GE_5(hw) ((hw)->version >= VMXNET3_REV_5 + 1)
 #define VMXNET3_VERSION_GE_4(hw) ((hw)->version >= VMXNET3_REV_4 + 1)
 #define VMXNET3_VERSION_GE_3(hw) ((hw)->version >= VMXNET3_REV_3 + 1)
drivers/net/vmxnet3/vmxnet3_rxtx.c +1 -1
index e15b377d8c..a6665fbf70 100644
@@ -1400,7 +1400,7 @@ vmxnet3_rss_configure(struct rte_eth_dev *dev)
 	/* loading hashKeySize */
 	dev_rss_conf->hashKeySize = VMXNET3_RSS_MAX_KEY_SIZE;
 	/* loading indTableSize: Must not exceed VMXNET3_RSS_MAX_IND_TABLE_SIZE (128)*/
-	dev_rss_conf->indTableSize = (uint16_t)(hw->num_rx_queues * 4);
+	dev_rss_conf->indTableSize = (uint16_t)(MAX_RX_QUEUES * 4);
 
 	if (port_rss_conf->rss_key == NULL) {
 		/* Default hash key */
Signature · 1 line
2.17.1
#11 lore raw

Re: [PATCH 5/8] vmxnet3, version 6

Summary should say what is done. Consider:

net/vmxnet3: support virtual HW version 6

Quoted 4 lines · Pankaj Gupta

vmxnet3 version 6 supports some new features, including but not limited to:
- Increased max MTU up to 9190
- Increased max number of queues, both for RX and TX

RX -> Rx, TX -> Tx in accordnace with recommended spelling

Quoted 3 lines

- Removes power-of-two limitations
- Extended interrupt structures, required implementation for additional number of queues

Please, be consistent in tense used above, "increased" vs "removes".

Quoted 77 lines

Tested, using testpmd, for different hardware version on ESXi 7.0 Update 2.

---
  drivers/net/vmxnet3/base/vmxnet3_defs.h | 135 +++++++++-----
  drivers/net/vmxnet3/vmxnet3_ethdev.c    | 223 +++++++++++++++++-------
  drivers/net/vmxnet3/vmxnet3_ethdev.h    |  10 +-
  drivers/net/vmxnet3/vmxnet3_rxtx.c      |   2 +-
  4 files changed, 260 insertions(+), 110 deletions(-)
drivers/net/vmxnet3/base/vmxnet3_defs.h +26 -32
index 8d62b3e116..ceac5d64db 100644
@@ -72,38 +72,42 @@
  #endif
 
  typedef enum {
-   VMXNET3_CMD_FIRST_SET = 0xCAFE0000,
-   VMXNET3_CMD_ACTIVATE_DEV = VMXNET3_CMD_FIRST_SET,
-   VMXNET3_CMD_QUIESCE_DEV,
-   VMXNET3_CMD_RESET_DEV,
-   VMXNET3_CMD_UPDATE_RX_MODE,
-   VMXNET3_CMD_UPDATE_MAC_FILTERS,
-   VMXNET3_CMD_UPDATE_VLAN_FILTERS,
-   VMXNET3_CMD_UPDATE_RSSIDT,
-   VMXNET3_CMD_UPDATE_IML,
-   VMXNET3_CMD_UPDATE_PMCFG,
-   VMXNET3_CMD_UPDATE_FEATURE,
-   VMXNET3_CMD_STOP_EMULATION,
-   VMXNET3_CMD_LOAD_PLUGIN,
-   VMXNET3_CMD_ACTIVATE_VF,
-   VMXNET3_CMD_RESERVED3,
-   VMXNET3_CMD_RESERVED4,
-   VMXNET3_CMD_REGISTER_MEMREGS,
-   VMXNET3_CMD_SET_RSS_FIELDS,
-
-   VMXNET3_CMD_FIRST_GET = 0xF00D0000,
-   VMXNET3_CMD_GET_QUEUE_STATUS = VMXNET3_CMD_FIRST_GET,
-   VMXNET3_CMD_GET_STATS,
-   VMXNET3_CMD_GET_LINK,
-   VMXNET3_CMD_GET_PERM_MAC_LO,
-   VMXNET3_CMD_GET_PERM_MAC_HI,
-   VMXNET3_CMD_GET_DID_LO,
-   VMXNET3_CMD_GET_DID_HI,
-   VMXNET3_CMD_GET_DEV_EXTRA_INFO,
-   VMXNET3_CMD_GET_CONF_INTR,
-   VMXNET3_CMD_GET_ADAPTIVE_RING_INFO,
-   VMXNET3_CMD_GET_TXDATA_DESC_SIZE,
-   VMXNET3_CMD_RESERVED5,
+	VMXNET3_CMD_FIRST_SET = 0xCAFE0000,
+	VMXNET3_CMD_ACTIVATE_DEV = VMXNET3_CMD_FIRST_SET,
+	VMXNET3_CMD_QUIESCE_DEV,
+	VMXNET3_CMD_RESET_DEV,
+	VMXNET3_CMD_UPDATE_RX_MODE,
+	VMXNET3_CMD_UPDATE_MAC_FILTERS,
+	VMXNET3_CMD_UPDATE_VLAN_FILTERS,
+	VMXNET3_CMD_UPDATE_RSSIDT,
+	VMXNET3_CMD_UPDATE_IML,
+	VMXNET3_CMD_UPDATE_PMCFG,
+	VMXNET3_CMD_UPDATE_FEATURE,
+	VMXNET3_CMD_STOP_EMULATION,
+	VMXNET3_CMD_LOAD_PLUGIN,
+	VMXNET3_CMD_ACTIVATE_VF,
+	VMXNET3_CMD_RESERVED3,
+	VMXNET3_CMD_RESERVED4,
+	VMXNET3_CMD_REGISTER_MEMREGS,
+	VMXNET3_CMD_SET_RSS_FIELDS,
+
+	VMXNET3_CMD_FIRST_GET = 0xF00D0000,
+	VMXNET3_CMD_GET_QUEUE_STATUS = VMXNET3_CMD_FIRST_GET,
+	VMXNET3_CMD_GET_STATS,
+	VMXNET3_CMD_GET_LINK,
+	VMXNET3_CMD_GET_PERM_MAC_LO,
+	VMXNET3_CMD_GET_PERM_MAC_HI,
+	VMXNET3_CMD_GET_DID_LO,

drivers/net/vmxnet3/base/vmxnet3_defs.h line 110

Quoted 10 lines
drivers/net/vmxnet3/base/vmxnet3_defs.h +10 -0
+	VMXNET3_CMD_GET_DID_HI,
+	VMXNET3_CMD_GET_DEV_EXTRA_INFO,
+	VMXNET3_CMD_GET_CONF_INTR,
+	VMXNET3_CMD_GET_ADAPTIVE_RING_INFO,
+	VMXNET3_CMD_GET_TXDATA_DESC_SIZE,
+	VMXNET3_CMD_RESERVED5,
+	VMXNET3_CMD_RESERVED6,
+	VMXNET3_CMD_RESERVED7,
+	VMXNET3_CMD_RESERVED8,
+	VMXNET3_CMD_GET_MAX_QUEUES_CONF,

It is hard to find what is really done above. If you wnat to fix an alignment, please, do it in a separate prepatch without any real changes.

Quoted 4 lines
drivers/net/vmxnet3/base/vmxnet3_defs.h +0 -0
  } Vmxnet3_Cmd;
 
  /* Adaptive Ring Info Flags */

drivers/net/vmxnet3/base/vmxnet3_defs.h enum vmxnet3_intr_type { · line 584

Quoted 10 lines
drivers/net/vmxnet3/base/vmxnet3_defs.h +7 -0
@@ -571,6 +575,24 @@ enum vmxnet3_intr_type {
  /* addition 1 for events */
  #define VMXNET3_MAX_INTRS      25
 
+/* Version 6 and later will use below macros */
+#define VMXNET3_EXT_MAX_TX_QUEUES  32
+#define VMXNET3_EXT_MAX_RX_QUEUES  32
+
+/* Version-dependent MAX RX/TX queues macro */
+#define MAX_RX_QUEUES \
+	(VMXNET3_VERSION_GE_6(hw) ? \

I think it is beter to pass 'hw' argument explicintly. Otherwise it looks inconsistent and confusing.

drivers/net/vmxnet3/base/vmxnet3_defs.h enum vmxnet3_intr_type { · line 588

Quoted 4 lines
drivers/net/vmxnet3/base/vmxnet3_defs.h +4 -0
+	VMXNET3_EXT_MAX_RX_QUEUES : \
+	VMXNET3_MAX_RX_QUEUES)
+#define MAX_TX_QUEUES \
+	(VMXNET3_VERSION_GE_6(hw) ? \

same here

Quoted 3 lines
drivers/net/vmxnet3/base/vmxnet3_defs.h +3 -0
+	VMXNET3_EXT_MAX_TX_QUEUES : \
+	VMXNET3_MAX_TX_QUEUES)
+

[snip]

#12 lore raw

PATCH 6/8 vmxnet3: set reta size

In reply to Pankaj Gupta

Currently the driver assumes that the size of the reta table is four times the number of rx queues at multiple places. However, it sets it to four times the maximum number of queues (4 * 32 = 128) when it first initializes the device. Change the other uses to use the stored value, not the assumed default.

---
 drivers/net/vmxnet3/vmxnet3_ethdev.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/net/vmxnet3/vmxnet3_ethdev.c +6 -1
index f65b3d3113..9955f121f6 100644
@@ -1483,7 +1483,12 @@ vmxnet3_dev_info_get(struct rte_eth_dev *dev,
 	dev_info->rx_queue_offload_capa = 0;
 	dev_info->tx_offload_capa = VMXNET3_TX_OFFLOAD_CAP;
 	dev_info->tx_queue_offload_capa = 0;
-
+	if (hw->rss_conf) {
+		dev_info->reta_size = hw->rss_conf->indTableSize;
+	} else {
+		/* RSS not configured */
+		dev_info->reta_size = 0;
+	}
 	return 0;
 }
 
Signature · 1 line
2.17.1
#13 lore raw

Re: [PATCH 6/8] vmxnet3: set reta size

Consider:

net/vmxnet3: advertise RETA size in device info

Quoted 1 line · Pankaj Gupta

Currently the driver assumes that the size of the reta table is

reta -> RETA (see devtools/words-case.txt)

Quoted 1 line

four times the number of rx queues at multiple places. However,

rx -> Rx

Quoted 14 lines

it sets it to four times the maximum number of queues (4 * 32 = 128) when it first initializes the device. Change the other uses to use the stored value, not the assumed default.

---
  drivers/net/vmxnet3/vmxnet3_ethdev.c | 7 ++++++-
  1 file changed, 6 insertions(+), 1 deletion(-)
drivers/net/vmxnet3/vmxnet3_ethdev.c +0 -0
index f65b3d3113..9955f121f6 100644

drivers/net/vmxnet3/vmxnet3_ethdev.c vmxnet3_dev_info_get(struct rte_eth_dev *dev, · line 1486

Quoted 5 lines
drivers/net/vmxnet3/vmxnet3_ethdev.c +1 -1
@@ -1483,7 +1483,12 @@ vmxnet3_dev_info_get(struct rte_eth_dev *dev,
  	dev_info->rx_queue_offload_capa = 0;
  	dev_info->tx_offload_capa = VMXNET3_TX_OFFLOAD_CAP;
  	dev_info->tx_queue_offload_capa = 0;
-
+	if (hw->rss_conf) {

Compare with NULL explicitly as DPDK coding style says.

Quoted 8 lines
drivers/net/vmxnet3/vmxnet3_ethdev.c +5 -0
+		dev_info->reta_size = hw->rss_conf->indTableSize;
+	} else {
+		/* RSS not configured */
+		dev_info->reta_size = 0;
+	}
  	return 0;
  }
 
#14 lore raw

PATCH 7/8 vmxnet3: Set packet for fragmented packet

In reply to Pankaj Gupta

The packet type is set even if it is a fragmented packet

Tested, using testpmd, for different hardware versions on ESXi 7.0 Update 2.

---
 drivers/net/vmxnet3/vmxnet3_rxtx.c | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
drivers/net/vmxnet3/vmxnet3_rxtx.c +17 -0
index a6665fbf70..5e177400c0 100644
@@ -759,6 +759,23 @@ vmxnet3_rx_offload(struct vmxnet3_hw *hw, const Vmxnet3_RxCompDesc *rcd,
 		/* Check packet type, checksum errors, etc. */
 		if (rcd->cnc) {
 			ol_flags |= RTE_MBUF_F_RX_L4_CKSUM_UNKNOWN;
+
+			if (rcd->v4) {
+				packet_type |= RTE_PTYPE_L3_IPV4_EXT_UNKNOWN;
+				if (rcd->tcp)
+					packet_type |= RTE_PTYPE_L4_TCP;
+				else if (rcd->udp)
+					packet_type |= RTE_PTYPE_L4_UDP;
+			} else if (rcd->v6) {
+				packet_type |= RTE_PTYPE_L3_IPV6_EXT_UNKNOWN;
+				if (rcd->tcp)
+					packet_type |= RTE_PTYPE_L4_TCP;
+				else if (rcd->udp)
+					packet_type |= RTE_PTYPE_L4_UDP;
+			} else {
+				packet_type |= RTE_PTYPE_UNKNOWN;
+			}
+
 		} else {
 			if (rcd->v4) {
 				packet_type |= RTE_PTYPE_L3_IPV4_EXT_UNKNOWN;
Signature · 1 line
2.17.1
#15 lore raw

Re: [PATCH 7/8] vmxnet3: Set packet for fragmented packet

Quoted 1 line · Pankaj Gupta

The packet type is set even if it is a fragmented packet

I'm wondering if is really IPv4/IPv6 fragmented packets or just scattered on Rx across many Rx buffers.
I'm asking since fragmented sounds weird with TCP, since TCP spec forbids fragmentation.

Quoted 37 lines

Tested, using testpmd, for different hardware versions on ESXi 7.0 Update 2.

---
  drivers/net/vmxnet3/vmxnet3_rxtx.c | 17 +++++++++++++++++
  1 file changed, 17 insertions(+)
drivers/net/vmxnet3/vmxnet3_rxtx.c +17 -0
index a6665fbf70..5e177400c0 100644
@@ -759,6 +759,23 @@ vmxnet3_rx_offload(struct vmxnet3_hw *hw, const Vmxnet3_RxCompDesc *rcd,
  		/* Check packet type, checksum errors, etc. */
  		if (rcd->cnc) {
  			ol_flags |= RTE_MBUF_F_RX_L4_CKSUM_UNKNOWN;
+
+			if (rcd->v4) {
+				packet_type |= RTE_PTYPE_L3_IPV4_EXT_UNKNOWN;
+				if (rcd->tcp)
+					packet_type |= RTE_PTYPE_L4_TCP;
+				else if (rcd->udp)
+					packet_type |= RTE_PTYPE_L4_UDP;
+			} else if (rcd->v6) {
+				packet_type |= RTE_PTYPE_L3_IPV6_EXT_UNKNOWN;
+				if (rcd->tcp)
+					packet_type |= RTE_PTYPE_L4_TCP;
+				else if (rcd->udp)
+					packet_type |= RTE_PTYPE_L4_UDP;
+			} else {
+				packet_type |= RTE_PTYPE_UNKNOWN;
+			}
+
  		} else {
  			if (rcd->v4) {
  				packet_type |= RTE_PTYPE_L3_IPV4_EXT_UNKNOWN;
#16 lore raw

Re: [PATCH 7/8] vmxnet3: Set packet for fragmented packet

Hi Andrew,
Packet type was not set for fragmented packets so we are trying to set it in all possible scenarios.

I believe TCP packets can be fragmented.

Thanks,
Pankaj

From: Andrew Rybchenko <[email protected]>
Date: Wednesday, May 4, 2022 at 8:08 AM
To: Pankaj Gupta <[email protected]>, Jochen Behrens <[email protected]>, Yong Wang <[email protected]>
Cc: [email protected] <[email protected]>
Subject: Re: [PATCH 7/8] vmxnet3: Set packet for fragmented packet
⚠ External Email

Quoted 1 line · Pankaj Gupta

The packet type is set even if it is a fragmented packet

I'm wondering if is really IPv4/IPv6 fragmented packets or just scattered on Rx across many Rx buffers.
I'm asking since fragmented sounds weird with TCP, since TCP spec forbids fragmentation.

Quoted 27 lines

Tested, using testpmd, for different hardware versions on ESXi 7.0 Update 2.

---
  drivers/net/vmxnet3/vmxnet3_rxtx.c | 17 +++++++++++++++++
  1 file changed, 17 insertions(+)
drivers/net/vmxnet3/vmxnet3_rxtx.c +10 -0
index a6665fbf70..5e177400c0 100644
@@ -759,6 +759,23 @@ vmxnet3_rx_offload(struct vmxnet3_hw *hw, const Vmxnet3_RxCompDesc *rcd,
              /* Check packet type, checksum errors, etc. */
              if (rcd->cnc) {
                      ol_flags |= RTE_MBUF_F_RX_L4_CKSUM_UNKNOWN;
+
+                     if (rcd->v4) {
+                             packet_type |= RTE_PTYPE_L3_IPV4_EXT_UNKNOWN;
+                             if (rcd->tcp)
+                                     packet_type |= RTE_PTYPE_L4_TCP;
+                             else if (rcd->udp)
+                                     packet_type |= RTE_PTYPE_L4_UDP;
+                     } else if (rcd->v6) {
+                             packet_type |= RTE_PTYPE_L3_IPV6_EXT_UNKNOWN;
+                             if (rcd->tcp)

drivers/net/vmxnet3/vmxnet3_rxtx.c vmxnet3_rx_offload(struct vmxnet3_hw *hw, const Vmxnet3_RxCompDesc *rcd, · line 781

Quoted 10 lines
drivers/net/vmxnet3/vmxnet3_rxtx.c +7 -0
+                                     packet_type |= RTE_PTYPE_L4_TCP;
+                             else if (rcd->udp)
+                                     packet_type |= RTE_PTYPE_L4_UDP;
+                     } else {
+                             packet_type |= RTE_PTYPE_UNKNOWN;
+                     }
+
              } else {
                      if (rcd->v4) {
                              packet_type |= RTE_PTYPE_L3_IPV4_EXT_UNKNOWN;

________________________________

⚠ External Email: This email originated from outside of the organization. Do not click links or open attachments unless you recognize the sender.

#17 lore raw

Re: [PATCH 7/8] vmxnet3: Set packet for fragmented packet

Hi Pankaj,

Quoted 7 lines · Pankaj Gupta

Hi Andrew,

Packet type was not set for fragmented packets so we are trying to set it in all possible scenarios.

I believe TCP packets can be fragmented.

Theoretically it is possible, yes. OK, my main goal was to check that we are really talking about L3 fragmentation, not scattering on Rx and I've got the answer.

Thanks,
Andrew.

Quoted 69 lines

Thanks,

Pankaj

*From: *Andrew Rybchenko <[email protected]>
*Date: *Wednesday, May 4, 2022 at 8:08 AM
*To: *Pankaj Gupta <[email protected]>, Jochen Behrens <[email protected]>, Yong Wang <[email protected]> *Cc: *[email protected] <[email protected]>
*Subject: *Re: [PATCH 7/8] vmxnet3: Set packet for fragmented packet

⚠External Email

Quoted 1 line · Pankaj Gupta

The packet type is set even if it is a fragmented packet

I'm wondering if is really IPv4/IPv6 fragmented packets or just scattered on Rx across many Rx buffers.
I'm asking since fragmented sounds weird with TCP, since TCP spec forbids fragmentation.

Review

Quoted 10 lines

Tested, using testpmd, for different hardware versions on ESXi 7.0 Update 2.

---
   drivers/net/vmxnet3/vmxnet3_rxtx.c | 17 +++++++++++++++++

   1 file changed, 17 insertions(+)
(quoted diff) +0 -0

b/drivers/net/vmxnet3/vmxnet3_rxtx.c

drivers/net/vmxnet3/vmxnet3_rxtx.c vmxnet3_rx_offload(struct vmxnet3_hw *hw, const

Quoted 4 lines

index a6665fbf70..5e177400c0 100644

drivers/net/vmxnet3/vmxnet3_rxtx.c +0 -0
@@ -759,6 +759,23 @@ vmxnet3_rx_offload(struct vmxnet3_hw *hw, const 

Vmxnet3_RxCompDesc *rcd,

drivers/net/vmxnet3/vmxnet3_rxtx.c vmxnet3_rx_offload(struct vmxnet3_hw *hw, const Vmxnet3_RxCompDesc *rcd,

Quoted 6 lines
drivers/net/vmxnet3/vmxnet3_rxtx.c +3 -0
                /* Check packet type, checksum errors, etc. */
                if (rcd->cnc) {
                        ol_flags |= RTE_MBUF_F_RX_L4_CKSUM_UNKNOWN;
+
+                     if (rcd->v4) {
+                             packet_type |= 

RTE_PTYPE_L3_IPV4_EXT_UNKNOWN;

drivers/net/vmxnet3/vmxnet3_rxtx.c vmxnet3_rx_offload(struct vmxnet3_hw *hw, const Vmxnet3_RxCompDesc *rcd,

Quoted 6 lines
drivers/net/vmxnet3/vmxnet3_rxtx.c +6 -0
+                             if (rcd->tcp)
+                                     packet_type |= RTE_PTYPE_L4_TCP;
+                             else if (rcd->udp)
+                                     packet_type |= RTE_PTYPE_L4_UDP;
+                     } else if (rcd->v6) {
+                             packet_type |= 

RTE_PTYPE_L3_IPV6_EXT_UNKNOWN;

Quoted 11 lines
drivers/net/vmxnet3/vmxnet3_rxtx.c +8 -0
+                             if (rcd->tcp)
+                                     packet_type |= RTE_PTYPE_L4_TCP;
+                             else if (rcd->udp)
+                                     packet_type |= RTE_PTYPE_L4_UDP;
+                     } else {
+                             packet_type |= RTE_PTYPE_UNKNOWN;
+                     }
+
                } else {
                        if (rcd->v4) {

                               packet_type |=

RTE_PTYPE_L3_IPV4_EXT_UNKNOWN;

________________________________

⚠External Email: This email originated from outside of the organization. Do not click links or open attachments unless you recognize the sender.

#18 lore raw

PATCH 8/8 vmxnet3: Fix merge error in initialization for rxDataRing feature

In reply to Pankaj Gupta

Fix merge error in initialization for rxDataRing feature.

Tested, using testpmd, for different hardware version on ESXi 7.0 Update 2.

---
 drivers/net/vmxnet3/vmxnet3_ethdev.c | 5 +++++
 1 file changed, 5 insertions(+)
drivers/net/vmxnet3/vmxnet3_ethdev.c +5 -0
index 9955f121f6..6ced76ae2a 100644
@@ -876,6 +876,11 @@ vmxnet3_setup_driver_shared(struct rte_eth_dev *dev)
 		rqd->conf.rxRingSize[1]   = rxq->cmd_ring[1].size;
 		rqd->conf.compRingSize    = rxq->comp_ring.size;
 
+		if (VMXNET3_VERSION_GE_3(hw)) {
+			rqd->conf.rxDataRingBasePA = rxq->data_ring.basePA;
+			rqd->conf.rxDataRingDescSize = rxq->data_desc_size;
+		}
+
 		if (hw->intr.lsc_only)
 			rqd->conf.intrIdx = 1;
 		else
Signature · 1 line
2.17.1
#19 lore raw

Re: [PATCH 8/8] vmxnet3: Fix merge error in initialization for rxDataRing feature

Quoted 1 line · Pankaj Gupta

Fix merge error in initialization for rxDataRing feature.

Is it a bug fix? If so, it requires corresponding "Fixes:" tag and Cc to [email protected] in order to be backported to stable releases.

Quoted 24 lines

Tested, using testpmd, for different hardware version on ESXi 7.0 Update 2.

---
  drivers/net/vmxnet3/vmxnet3_ethdev.c | 5 +++++
  1 file changed, 5 insertions(+)
drivers/net/vmxnet3/vmxnet3_ethdev.c +5 -0
index 9955f121f6..6ced76ae2a 100644
@@ -876,6 +876,11 @@ vmxnet3_setup_driver_shared(struct rte_eth_dev *dev)
  		rqd->conf.rxRingSize[1]   = rxq->cmd_ring[1].size;
  		rqd->conf.compRingSize    = rxq->comp_ring.size;
 
+		if (VMXNET3_VERSION_GE_3(hw)) {
+			rqd->conf.rxDataRingBasePA = rxq->data_ring.basePA;
+			rqd->conf.rxDataRingDescSize = rxq->data_desc_size;
+		}
+
  		if (hw->intr.lsc_only)
  			rqd->conf.intrIdx = 1;
  		else
#20 lore raw

Re: [PATCH 8/8] vmxnet3: Fix merge error in initialization for rxDataRing feature

Hi Andrew,
Changes done in this patch was accidentally removed in commit 046f1161956777e3afb13504acbe8df2ec3a383c. This was noticed later and we are trying to address this here.

Thanks,
Pankaj

From: Andrew Rybchenko <[email protected]>
Date: Wednesday, May 4, 2022 at 8:09 AM
To: Pankaj Gupta <[email protected]>, Jochen Behrens <[email protected]>, Yong Wang <[email protected]>
Cc: [email protected] <[email protected]>
Subject: Re: [PATCH 8/8] vmxnet3: Fix merge error in initialization for rxDataRing feature ⚠ External Email

Quoted 1 line · Pankaj Gupta

Fix merge error in initialization for rxDataRing feature.

Is it a bug fix? If so, it requires corresponding "Fixes:" tag and Cc to [email protected] in order to be backported to stable releases.

Quoted 14 lines

Tested, using testpmd, for different hardware version on ESXi 7.0 Update 2.

---
  drivers/net/vmxnet3/vmxnet3_ethdev.c | 5 +++++
  1 file changed, 5 insertions(+)
drivers/net/vmxnet3/vmxnet3_ethdev.c +0 -0
index 9955f121f6..6ced76ae2a 100644
@@ -876,6 +876,11 @@ vmxnet3_setup_driver_shared(struct rte_eth_dev *dev)
              rqd->conf.rxRingSize[1]   = rxq->cmd_ring[1].size;

drivers/net/vmxnet3/vmxnet3_ethdev.c vmxnet3_setup_driver_shared(struct rte_eth_dev *dev) · line 886

Quoted 10 lines
drivers/net/vmxnet3/vmxnet3_ethdev.c +5 -0
              rqd->conf.compRingSize    = rxq->comp_ring.size;
 
+             if (VMXNET3_VERSION_GE_3(hw)) {
+                     rqd->conf.rxDataRingBasePA = rxq->data_ring.basePA;
+                     rqd->conf.rxDataRingDescSize = rxq->data_desc_size;
+             }
+
              if (hw->intr.lsc_only)
                      rqd->conf.intrIdx = 1;
              else

________________________________

⚠ External Email: This email originated from outside of the organization. Do not click links or open attachments unless you recognize the sender.

#21 lore raw

Re: [PATCH 8/8] vmxnet3: Fix merge error in initialization for rxDataRing feature

Hi Pakai,

Quoted 5 lines · Pankaj Gupta

Hi Andrew,

Changes done in this patch was accidentally removed in commit 046f1161956777e3afb13504acbe8df2ec3a383c.

This was noticed later and we are trying to address this here.

If so, you should add:

Fixes 046f11619567 ("net/vmxnet3: support MSI-X interrupt")
Quoted 49 lines

Thanks,

Pankaj

*From: *Andrew Rybchenko <[email protected]>
*Date: *Wednesday, May 4, 2022 at 8:09 AM
*To: *Pankaj Gupta <[email protected]>, Jochen Behrens <[email protected]>, Yong Wang <[email protected]> *Cc: *[email protected] <[email protected]>
*Subject: *Re: [PATCH 8/8] vmxnet3: Fix merge error in initialization for rxDataRing feature

⚠External Email

Quoted 1 line · Pankaj Gupta

Fix merge error in initialization for rxDataRing feature.

Is it a bug fix? If so, it requires corresponding "Fixes:" tag and Cc to [email protected] in order to be backported to stable releases.

Quoted 23 lines

Tested, using testpmd, for different hardware version on ESXi 7.0 Update 2.

---
   drivers/net/vmxnet3/vmxnet3_ethdev.c | 5 +++++

   1 file changed, 5 insertions(+)
drivers/net/vmxnet3/vmxnet3_ethdev.c +5 -0
index 9955f121f6..6ced76ae2a 100644
@@ -876,6 +876,11 @@ vmxnet3_setup_driver_shared(struct rte_eth_dev *dev)
                rqd->conf.rxRingSize[1]   = rxq->cmd_ring[1].size;
                rqd->conf.compRingSize    = rxq->comp_ring.size;
 
+             if (VMXNET3_VERSION_GE_3(hw)) {
+                     rqd->conf.rxDataRingBasePA = rxq->data_ring.basePA;
+                     rqd->conf.rxDataRingDescSize = rxq->data_desc_size;
+             }
+
                if (hw->intr.lsc_only)
                        rqd->conf.intrIdx = 1;
Quoted 1 line

               else

________________________________

⚠External Email: This email originated from outside of the organization. Do not click links or open attachments unless you recognize the sender.

Reviewed-by Jochen Behrens [email protected] on the v1 series
#22 lore raw
In reply to Pankaj Gupta

From: Pankaj Gupta <[email protected]>
Date: Monday, May 2, 2022 at 9:23 PM
To: Jochen Behrens <[email protected]>, Yong Wang <[email protected]>
Cc: [email protected] <[email protected]>, Pankaj Gupta <[email protected]>
Subject: [PATCH 0/8] vmxnet3 version V5 and V6
Pankaj Gupta (8):
vmxnet3: Added V5 support
vmxnet3: implement reta query and reta update
vmxnet3: add rx queue usage count utility
vmxnet3: add get hw version api
vmxnet3, version 6
vmxnet3: set reta size
vmxnet3: Set packet for fragmented packet
vmxnet3: Fix merge error in initialization for rxDataRing feature

 drivers/net/vmxnet3/base/vmxnet3_defs.h | 135 ++++++----
 drivers/net/vmxnet3/vmxnet3_ethdev.c    | 329 +++++++++++++++++++-----
 drivers/net/vmxnet3/vmxnet3_ethdev.h    |  15 +-
 drivers/net/vmxnet3/vmxnet3_rxtx.c      |  49 +++-
 4 files changed, 416 insertions(+), 112 deletions(-)

--
2.17.1

#23 lore raw
In reply to Pankaj Gupta
Quoted 9 lines · Pankaj Gupta

Pankaj Gupta (8):
vmxnet3: Added V5 support
vmxnet3: implement reta query and reta update
vmxnet3: add rx queue usage count utility
vmxnet3: add get hw version api
vmxnet3, version 6
vmxnet3: set reta size
vmxnet3: Set packet for fragmented packet
vmxnet3: Fix merge error in initialization for rxDataRing feature

Please, fix prefix for all patches. It should be "net/vmxnet3: ". Summary after prefix should start from small letter and be in present tense, i.e. "Added" -> "add"

#24 lore raw

v6 cover net/vmxnet3: support versions 5 and 6

In reply to Pankaj Gupta

v6 (Andrew Rybchenko):
Minor style changes in patches description
Split FW version get patch to have callbacks reorder seperately Minor fix in FW version get patch to put callback definition, assignment and implementation just after device info get

v5:
Use RTE_MIN instead of defining MIN in drivers/net/vmxnet3/vmxnet3_ethdev.c User RETA instead of reta in commit message
Fix the issue thrown by checkpatches.sh in file drivers/net/vmxnet3/vmxnet3_ethdev.c

v4:
Changing the subject for [Patch 8/8] from "net/vmxnet3: fix merge error in initialization for rxDataRing feature" to
"Fixes: 046f11619567 ("net/vmxnet3: support MSI-X interrupt")"

v3:
adding Reviewed-by info in all the patches

v2:
address review comments from Andrew Rybchenko [email protected]

Pankaj Gupta (9):
net/vmxnet3: add version 5 support
net/vmxnet3: implement RETA query and RETA update net/vmxnet3: add Rx queue usage count utility net/vmxnet3: fix ethdev callbacks init order net/vmxnet3: report HW version on FW version get net/vmxnet3: add version 6 support
net/vmxnet3: advertise RETA size in device info net/vmxnet3: set packet type for fragmented packet net/vmxnet3: fix merge error in Rx data ring initialization

 drivers/net/vmxnet3/base/vmxnet3_defs.h |  73 ++++-
 drivers/net/vmxnet3/vmxnet3_ethdev.c    | 339 +++++++++++++++++++-----
 drivers/net/vmxnet3/vmxnet3_ethdev.h    |  15 +-
 drivers/net/vmxnet3/vmxnet3_rxtx.c      |  49 +++-
 4 files changed, 388 insertions(+), 88 deletions(-)
Signature · 1 line
2.30.2
#25 lore raw

PATCH v6 1/9 net/vmxnet3: add version 5 support

From: Pankaj Gupta <[email protected]>

Add VMXNET3 v5 support.

Tested, using testpmd, for different hardware versions on ESXi 7.0 Update 2.

---
 drivers/net/vmxnet3/vmxnet3_ethdev.c | 7 +++++--
 drivers/net/vmxnet3/vmxnet3_ethdev.h | 2 ++
 2 files changed, 7 insertions(+), 2 deletions(-)
drivers/net/vmxnet3/vmxnet3_ethdev.c +5 -2
index d1ef1cad08..a7e1e5fef5 100644
@@ -316,9 +316,12 @@ eth_vmxnet3_dev_init(struct rte_eth_dev *eth_dev)
 
 	/* Check h/w version compatibility with driver. */
 	ver = VMXNET3_READ_BAR1_REG(hw, VMXNET3_REG_VRRS);
-	PMD_INIT_LOG(DEBUG, "Hardware version : %d", ver);
 
-	if (ver & (1 << VMXNET3_REV_4)) {
+	if (ver & (1 << VMXNET3_REV_5)) {
+		VMXNET3_WRITE_BAR1_REG(hw, VMXNET3_REG_VRRS,
+				       1 << VMXNET3_REV_5);
+		hw->version = VMXNET3_REV_5 + 1;
+	} else if (ver & (1 << VMXNET3_REV_4)) {
 		VMXNET3_WRITE_BAR1_REG(hw, VMXNET3_REG_VRRS,
 				       1 << VMXNET3_REV_4);
 		hw->version = VMXNET3_REV_4 + 1;
drivers/net/vmxnet3/vmxnet3_ethdev.h +2 -0
index ef858ac951..7ec3b2e1f0 100644
@@ -124,11 +124,13 @@ struct vmxnet3_hw {
 	UPT1_RxStats          snapshot_rx_stats[VMXNET3_MAX_RX_QUEUES];
 };
 
+#define VMXNET3_REV_5		4		/* Vmxnet3 Rev. 5 */
 #define VMXNET3_REV_4		3		/* Vmxnet3 Rev. 4 */
 #define VMXNET3_REV_3		2		/* Vmxnet3 Rev. 3 */
 #define VMXNET3_REV_2		1		/* Vmxnet3 Rev. 2 */
 #define VMXNET3_REV_1		0		/* Vmxnet3 Rev. 1 */
 
+#define VMXNET3_VERSION_GE_5(hw) ((hw)->version >= VMXNET3_REV_5 + 1)
 #define VMXNET3_VERSION_GE_4(hw) ((hw)->version >= VMXNET3_REV_4 + 1)
 #define VMXNET3_VERSION_GE_3(hw) ((hw)->version >= VMXNET3_REV_3 + 1)
 #define VMXNET3_VERSION_GE_2(hw) ((hw)->version >= VMXNET3_REV_2 + 1)
Signature · 1 line
2.30.2
#26 lore raw

PATCH v6 2/9 net/vmxnet3: implement RETA query and RETA update

In reply to Andrew Rybchenko

From: Pankaj Gupta <[email protected]>

Add RETA query and RETA update support for VMXNET3.

Tested, using testpmd, for different hardware versions on ESXi 7.0 Update 2.

---
 drivers/net/vmxnet3/vmxnet3_ethdev.c | 67 ++++++++++++++++++++++++++++
 1 file changed, 67 insertions(+)
drivers/net/vmxnet3/vmxnet3_ethdev.c +67 -0
index a7e1e5fef5..d5f9903946 100644
@@ -95,6 +95,14 @@ static int vmxnet3_mac_addr_set(struct rte_eth_dev *dev,
 				 struct rte_ether_addr *mac_addr);
 static void vmxnet3_process_events(struct rte_eth_dev *dev);
 static void vmxnet3_interrupt_handler(void *param);
+static int
+vmxnet3_rss_reta_update(struct rte_eth_dev *dev,
+			struct rte_eth_rss_reta_entry64 *reta_conf,
+			uint16_t reta_size);
+static int
+vmxnet3_rss_reta_query(struct rte_eth_dev *dev,
+		       struct rte_eth_rss_reta_entry64 *reta_conf,
+		       uint16_t reta_size);
 static int vmxnet3_dev_rx_queue_intr_enable(struct rte_eth_dev *dev,
 						uint16_t queue_id);
 static int vmxnet3_dev_rx_queue_intr_disable(struct rte_eth_dev *dev,
@@ -137,6 +145,8 @@ static const struct eth_dev_ops vmxnet3_eth_dev_ops = {
 	.tx_queue_release     = vmxnet3_dev_tx_queue_release,
 	.rx_queue_intr_enable = vmxnet3_dev_rx_queue_intr_enable,
 	.rx_queue_intr_disable = vmxnet3_dev_rx_queue_intr_disable,
+	.reta_update          = vmxnet3_rss_reta_update,
+	.reta_query           = vmxnet3_rss_reta_query,
 };
 
 struct vmxnet3_xstats_name_off {
@@ -1696,3 +1706,60 @@ RTE_PMD_REGISTER_PCI_TABLE(net_vmxnet3, pci_id_vmxnet3_map);
 RTE_PMD_REGISTER_KMOD_DEP(net_vmxnet3, "* igb_uio | uio_pci_generic | vfio-pci");
 RTE_LOG_REGISTER_SUFFIX(vmxnet3_logtype_init, init, NOTICE);
 RTE_LOG_REGISTER_SUFFIX(vmxnet3_logtype_driver, driver, NOTICE);
+
+static int
+vmxnet3_rss_reta_update(struct rte_eth_dev *dev,
+			struct rte_eth_rss_reta_entry64 *reta_conf,
+			uint16_t reta_size)
+{
+	int i, idx, shift;
+	struct vmxnet3_hw *hw = dev->data->dev_private;
+	struct VMXNET3_RSSConf *dev_rss_conf = hw->rss_conf;
+
+	if (reta_size != dev_rss_conf->indTableSize) {
+		PMD_DRV_LOG(ERR,
+			"The size of hash lookup table configured (%d) doesn't match "
+			"the supported number (%d)",
+			reta_size, dev_rss_conf->indTableSize);
+		return -EINVAL;
+	}
+
+	for (i = 0; i < reta_size; i++) {
+		idx = i / RTE_ETH_RETA_GROUP_SIZE;
+		shift = i % RTE_ETH_RETA_GROUP_SIZE;
+		if (reta_conf[idx].mask & RTE_BIT64(shift))
+			dev_rss_conf->indTable[i] = (uint8_t)reta_conf[idx].reta[shift];
+	}
+
+	VMXNET3_WRITE_BAR1_REG(hw, VMXNET3_REG_CMD,
+				VMXNET3_CMD_UPDATE_RSSIDT);
+
+	return 0;
+}
+
+static int
+vmxnet3_rss_reta_query(struct rte_eth_dev *dev,
+		       struct rte_eth_rss_reta_entry64 *reta_conf,
+		       uint16_t reta_size)
+{
+	int i, idx, shift;
+	struct vmxnet3_hw *hw = dev->data->dev_private;
+	struct VMXNET3_RSSConf *dev_rss_conf = hw->rss_conf;
+
+	if (reta_size != dev_rss_conf->indTableSize) {
+		PMD_DRV_LOG(ERR,
+			"Size of requested hash lookup table (%d) doesn't "
+			"match the configured size (%d)",
+			reta_size, dev_rss_conf->indTableSize);
+		return -EINVAL;
+	}
+
+	for (i = 0; i < reta_size; i++) {
+		idx = i / RTE_ETH_RETA_GROUP_SIZE;
+		shift = i % RTE_ETH_RETA_GROUP_SIZE;
+		if (reta_conf[idx].mask & RTE_BIT64(shift))
+			reta_conf[idx].reta[shift] = dev_rss_conf->indTable[i];
+	}
+
+	return 0;
+}
Signature · 1 line
2.30.2
#27 lore raw

PATCH v6 3/9 net/vmxnet3: add Rx queue usage count utility

In reply to Andrew Rybchenko

From: Pankaj Gupta <[email protected]>

Count the number of entries in the Rx queue for debugging.

Tested, using testpmd, for different hardware versions on ESXi 7.0 Update 2.

---
 drivers/net/vmxnet3/vmxnet3_ethdev.c |  1 +
 drivers/net/vmxnet3/vmxnet3_ethdev.h |  3 +++
 drivers/net/vmxnet3/vmxnet3_rxtx.c   | 30 ++++++++++++++++++++++++++++
 3 files changed, 34 insertions(+)
drivers/net/vmxnet3/vmxnet3_ethdev.c +1 -0
index d5f9903946..cd32c1b4ee 100644
@@ -294,6 +294,7 @@ eth_vmxnet3_dev_init(struct rte_eth_dev *eth_dev)
 	eth_dev->rx_pkt_burst = &vmxnet3_recv_pkts;
 	eth_dev->tx_pkt_burst = &vmxnet3_xmit_pkts;
 	eth_dev->tx_pkt_prepare = vmxnet3_prep_pkts;
+	eth_dev->rx_queue_count = vmxnet3_dev_rx_queue_count;
 	pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);
 
 	/* extra mbuf field is required to guess MSS */
drivers/net/vmxnet3/vmxnet3_ethdev.h +3 -0
index 7ec3b2e1f0..ceaeb66392 100644
@@ -193,6 +193,9 @@ int  vmxnet3_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id,
 				uint16_t nb_rx_desc, unsigned int socket_id,
 				const struct rte_eth_rxconf *rx_conf,
 				struct rte_mempool *mb_pool);
+
+uint32_t vmxnet3_dev_rx_queue_count(void *rx_queue);
+
 int  vmxnet3_dev_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id,
 				uint16_t nb_tx_desc, unsigned int socket_id,
 				const struct rte_eth_txconf *tx_conf);
drivers/net/vmxnet3/vmxnet3_rxtx.c +30 -0
index d745064bc4..e15b377d8c 100644
@@ -1019,6 +1019,36 @@ vmxnet3_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
 	return nb_rx;
 }
 
+uint32_t
+vmxnet3_dev_rx_queue_count(void *rx_queue)
+{
+	const vmxnet3_rx_queue_t *rxq;
+	const Vmxnet3_RxCompDesc *rcd;
+	uint32_t idx, nb_rxd = 0;
+	uint8_t gen;
+
+	rxq = rx_queue;
+	if (unlikely(rxq->stopped)) {
+		PMD_RX_LOG(DEBUG, "Rx queue is stopped.");
+		return 0;
+	}
+
+	gen = rxq->comp_ring.gen;
+	idx = rxq->comp_ring.next2proc;
+	rcd = &rxq->comp_ring.base[idx].rcd;
+	while (rcd->gen == gen) {
+		if (rcd->eop)
+			++nb_rxd;
+		if (++idx == rxq->comp_ring.size) {
+			idx = 0;
+			gen ^= 1;
+		}
+		rcd = &rxq->comp_ring.base[idx].rcd;
+	}
+
+	return nb_rxd;
+}
+
 int
 vmxnet3_dev_tx_queue_setup(struct rte_eth_dev *dev,
 			   uint16_t queue_idx,
Signature · 1 line
2.30.2
#28 lore raw

PATCH v6 4/9 net/vmxnet3: fix ethdev callbacks init order

In reply to Andrew Rybchenko

From: Pankaj Gupta <[email protected]>

Driver callbacks initialization should follow callbacks order in the structure definition.

Do not reorder callbacks implementation to avoid extra noise in the code.

---
 drivers/net/vmxnet3/vmxnet3_ethdev.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/net/vmxnet3/vmxnet3_ethdev.c +7 -7
index cd32c1b4ee..e84d304378 100644
@@ -124,27 +124,27 @@ static const struct eth_dev_ops vmxnet3_eth_dev_ops = {
 	.dev_stop             = vmxnet3_dev_stop,
 	.dev_close            = vmxnet3_dev_close,
 	.dev_reset            = vmxnet3_dev_reset,
+	.link_update          = vmxnet3_dev_link_update,
 	.promiscuous_enable   = vmxnet3_dev_promiscuous_enable,
 	.promiscuous_disable  = vmxnet3_dev_promiscuous_disable,
 	.allmulticast_enable  = vmxnet3_dev_allmulticast_enable,
 	.allmulticast_disable = vmxnet3_dev_allmulticast_disable,
-	.link_update          = vmxnet3_dev_link_update,
+	.mac_addr_set         = vmxnet3_mac_addr_set,
+	.mtu_set              = vmxnet3_dev_mtu_set,
 	.stats_get            = vmxnet3_dev_stats_get,
-	.xstats_get_names     = vmxnet3_dev_xstats_get_names,
-	.xstats_get           = vmxnet3_dev_xstats_get,
 	.stats_reset          = vmxnet3_dev_stats_reset,
-	.mac_addr_set         = vmxnet3_mac_addr_set,
+	.xstats_get           = vmxnet3_dev_xstats_get,
+	.xstats_get_names     = vmxnet3_dev_xstats_get_names,
 	.dev_infos_get        = vmxnet3_dev_info_get,
 	.dev_supported_ptypes_get = vmxnet3_dev_supported_ptypes_get,
-	.mtu_set              = vmxnet3_dev_mtu_set,
 	.vlan_filter_set      = vmxnet3_dev_vlan_filter_set,
 	.vlan_offload_set     = vmxnet3_dev_vlan_offload_set,
 	.rx_queue_setup       = vmxnet3_dev_rx_queue_setup,
 	.rx_queue_release     = vmxnet3_dev_rx_queue_release,
-	.tx_queue_setup       = vmxnet3_dev_tx_queue_setup,
-	.tx_queue_release     = vmxnet3_dev_tx_queue_release,
 	.rx_queue_intr_enable = vmxnet3_dev_rx_queue_intr_enable,
 	.rx_queue_intr_disable = vmxnet3_dev_rx_queue_intr_disable,
+	.tx_queue_setup       = vmxnet3_dev_tx_queue_setup,
+	.tx_queue_release     = vmxnet3_dev_tx_queue_release,
 	.reta_update          = vmxnet3_rss_reta_update,
 	.reta_query           = vmxnet3_rss_reta_query,
 };
Signature · 1 line
2.30.2
#29 lore raw

PATCH v6 5/9 net/vmxnet3: report HW version on FW version get

In reply to Andrew Rybchenko

From: Pankaj Gupta <[email protected]>

Support rte_eth_dev_fw_version_get() API.

Tested, using testpmd, for different hardware versions on ESXi 7.0 Update 2.

---
 drivers/net/vmxnet3/vmxnet3_ethdev.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
drivers/net/vmxnet3/vmxnet3_ethdev.c +20 -0
index e84d304378..62844f3d39 100644
@@ -85,6 +85,8 @@ static int vmxnet3_dev_xstats_get(struct rte_eth_dev *dev,
 				  struct rte_eth_xstat *xstats, unsigned int n);
 static int vmxnet3_dev_info_get(struct rte_eth_dev *dev,
 				struct rte_eth_dev_info *dev_info);
+static int vmxnet3_hw_ver_get(struct rte_eth_dev *dev,
+			      char *fw_version, size_t fw_size);
 static const uint32_t *
 vmxnet3_dev_supported_ptypes_get(struct rte_eth_dev *dev);
 static int vmxnet3_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu);
@@ -103,6 +105,7 @@ static int
 vmxnet3_rss_reta_query(struct rte_eth_dev *dev,
 		       struct rte_eth_rss_reta_entry64 *reta_conf,
 		       uint16_t reta_size);
+
 static int vmxnet3_dev_rx_queue_intr_enable(struct rte_eth_dev *dev,
 						uint16_t queue_id);
 static int vmxnet3_dev_rx_queue_intr_disable(struct rte_eth_dev *dev,
@@ -136,6 +139,7 @@ static const struct eth_dev_ops vmxnet3_eth_dev_ops = {
 	.xstats_get           = vmxnet3_dev_xstats_get,
 	.xstats_get_names     = vmxnet3_dev_xstats_get_names,
 	.dev_infos_get        = vmxnet3_dev_info_get,
+	.fw_version_get       = vmxnet3_hw_ver_get,
 	.dev_supported_ptypes_get = vmxnet3_dev_supported_ptypes_get,
 	.vlan_filter_set      = vmxnet3_dev_vlan_filter_set,
 	.vlan_offload_set     = vmxnet3_dev_vlan_offload_set,
@@ -1410,6 +1414,22 @@ vmxnet3_dev_info_get(struct rte_eth_dev *dev,
 	return 0;
 }
 
+static int
+vmxnet3_hw_ver_get(struct rte_eth_dev *dev,
+		   char *fw_version, size_t fw_size)
+{
+	int ret;
+	struct vmxnet3_hw *hw = dev->data->dev_private;
+
+	ret = snprintf(fw_version, fw_size, "v%d", hw->version);
+
+	ret += 1; /* add the size of '\0' */
+	if (fw_size < (uint32_t)ret)
+		return ret;
+	else
+		return 0;
+}
+
 static const uint32_t *
 vmxnet3_dev_supported_ptypes_get(struct rte_eth_dev *dev)
 {
Signature · 1 line
2.30.2
#30 lore raw

PATCH v6 6/9 net/vmxnet3: add version 6 support

In reply to Andrew Rybchenko

From: Pankaj Gupta <[email protected]>

VMXNET3 version 6 supports some new features, including but not limited to:
- Increased max MTU up to 9190
- Increased max number of queues, both for Rx and Tx
- Removes power-of-two limitations
- Extended interrupt structures, required implementation for additional number of queues

Tested, using testpmd, for different hardware versions on ESXi 7.0 Update 2.

---
 drivers/net/vmxnet3/base/vmxnet3_defs.h |  73 ++++++--
 drivers/net/vmxnet3/vmxnet3_ethdev.c    | 220 +++++++++++++++++-------
 drivers/net/vmxnet3/vmxnet3_ethdev.h    |  10 +-
 drivers/net/vmxnet3/vmxnet3_rxtx.c      |   2 +-
 4 files changed, 226 insertions(+), 79 deletions(-)
drivers/net/vmxnet3/base/vmxnet3_defs.h +60 -13
index 8d62b3e116..bd6695e69d 100644
@@ -103,7 +103,11 @@ typedef enum {
    VMXNET3_CMD_GET_CONF_INTR,
    VMXNET3_CMD_GET_ADAPTIVE_RING_INFO,
    VMXNET3_CMD_GET_TXDATA_DESC_SIZE,
-   VMXNET3_CMD_RESERVED5,
+	VMXNET3_CMD_RESERVED5,
+	VMXNET3_CMD_RESERVED6,
+	VMXNET3_CMD_RESERVED7,
+	VMXNET3_CMD_RESERVED8,
+	VMXNET3_CMD_GET_MAX_QUEUES_CONF,
 } Vmxnet3_Cmd;
 
 /* Adaptive Ring Info Flags */
@@ -571,6 +575,24 @@ enum vmxnet3_intr_type {
 /* addition 1 for events */
 #define VMXNET3_MAX_INTRS      25
 
+/* Version 6 and later will use below macros */
+#define VMXNET3_EXT_MAX_TX_QUEUES  32
+#define VMXNET3_EXT_MAX_RX_QUEUES  32
+
+/* Version-dependent MAX RX/TX queues macro */
+#define MAX_RX_QUEUES(hw) \
+	(VMXNET3_VERSION_GE_6((hw)) ? \
+	VMXNET3_EXT_MAX_RX_QUEUES : \
+	VMXNET3_MAX_RX_QUEUES)
+#define MAX_TX_QUEUES(hw) \
+	(VMXNET3_VERSION_GE_6((hw)) ? \
+	VMXNET3_EXT_MAX_TX_QUEUES : \
+	VMXNET3_MAX_TX_QUEUES)
+
+/* addition 1 for events */
+#define VMXNET3_EXT_MAX_INTRS      65
+#define VMXNET3_FIRST_SET_INTRS    64
+
 /* value of intrCtrl */
 #define VMXNET3_IC_DISABLE_ALL  0x1   /* bit 0 */
 
@@ -587,6 +609,21 @@ struct Vmxnet3_IntrConf {
 #include "vmware_pack_end.h"
 Vmxnet3_IntrConf;
 
+typedef
+#include "vmware_pack_begin.h"
+struct Vmxnet3_IntrConfExt {
+	uint8    autoMask;
+	uint8    numIntrs;      /* # of interrupts */
+	uint8    eventIntrIdx;
+	uint8    reserved;
+	__le32   intrCtrl;
+	__le32   reserved1;
+	uint8    modLevels[VMXNET3_EXT_MAX_INTRS]; /* moderation level for each intr */
+	uint8    reserved2[3];
+}
+#include "vmware_pack_end.h"
+Vmxnet3_IntrConfExt;
+
 /* one bit per VLAN ID, the size is in the units of uint32 */
 #define VMXNET3_VFT_SIZE  (4096 / (sizeof(uint32) * 8))
 
@@ -692,6 +729,15 @@ struct Vmxnet3_DSDevRead {
 #include "vmware_pack_end.h"
 Vmxnet3_DSDevRead;
 
+typedef
+#include "vmware_pack_begin.h"
+struct Vmxnet3_DSDevReadExt {
+	/* read-only region for device, read by dev in response to a SET cmd */
+	struct Vmxnet3_IntrConfExt    intrConfExt;
+}
+#include "vmware_pack_end.h"
+Vmxnet3_DSDevReadExt;
+
 typedef
 #include "vmware_pack_begin.h"
 struct Vmxnet3_TxQueueDesc {
@@ -778,18 +824,18 @@ Vmxnet3_CmdInfo;
 typedef
 #include "vmware_pack_begin.h"
 struct Vmxnet3_DriverShared {
-   __le32               magic;
-   __le32               pad; /* make devRead start at 64-bit boundaries */
-   Vmxnet3_DSDevRead    devRead;
-   __le32               ecr;
-   __le32               reserved;
-
-   union {
-      __le32            reserved1[4];
-      Vmxnet3_CmdInfo   cmdInfo; /* only valid in the context of executing the
-				  * relevant command
-				  */
-   } cu;
+	__le32               magic;
+	__le32               size;    /* size of DriverShared */
+	Vmxnet3_DSDevRead    devRead;
+	__le32               ecr;
+	__le32               reserved;
+
+	union {
+		__le32			reserved1[4];
+		/* only valid in the context of executing the relevant command */
+		Vmxnet3_CmdInfo	cmdInfo;
+	} cu;
+	struct Vmxnet3_DSDevReadExt   devReadExt;
 }
 #include "vmware_pack_end.h"
 Vmxnet3_DriverShared;
@@ -821,6 +867,7 @@ do {\
    ((vfTable[vid >> 5] & (1 << (vid & 31))) != 0)
 
 #define VMXNET3_MAX_MTU     9000
+#define VMXNET3_V6_MAX_MTU  9190
 #define VMXNET3_MIN_MTU     60
 
 #define VMXNET3_LINK_UP         (10000 << 16 | 1)    // 10 Gbps, up
drivers/net/vmxnet3/vmxnet3_ethdev.c +159 -61

339 lines not on this page · raw message

drivers/net/vmxnet3/vmxnet3_ethdev.h +6 -4
index ceaeb66392..5a303717b1 100644
@@ -70,7 +70,7 @@ struct vmxnet3_intr {
 	enum vmxnet3_intr_type      type; /* MSI-X, MSI, or INTx? */
 	uint8_t num_intrs;                /* # of intr vectors */
 	uint8_t event_intr_idx;           /* idx of the intr vector for event */
-	uint8_t mod_levels[VMXNET3_MAX_MSIX_VECT]; /* moderation level */
+	uint8_t mod_levels[VMXNET3_EXT_MAX_INTRS]; /* moderation level */
 	bool lsc_only;                    /* no Rx queue interrupt */
 };
 
@@ -108,6 +108,7 @@ struct vmxnet3_hw {
 	uint64_t              queueDescPA;
 	uint16_t              queue_desc_len;
 	uint16_t              mtu;
+	bool                  queuesExtEnabled;
 
 	VMXNET3_RSSConf       *rss_conf;
 	uint64_t              rss_confPA;
@@ -117,19 +118,20 @@ struct vmxnet3_hw {
 	Vmxnet3_MemRegs	      *memRegs;
 	uint64_t	      memRegsPA;
 #define VMXNET3_VFT_TABLE_SIZE     (VMXNET3_VFT_SIZE * sizeof(uint32_t))
-	UPT1_TxStats	      saved_tx_stats[VMXNET3_MAX_TX_QUEUES];
-	UPT1_RxStats	      saved_rx_stats[VMXNET3_MAX_RX_QUEUES];
-
+	UPT1_TxStats	      saved_tx_stats[VMXNET3_EXT_MAX_TX_QUEUES];
+	UPT1_RxStats	      saved_rx_stats[VMXNET3_EXT_MAX_RX_QUEUES];
 	UPT1_TxStats          snapshot_tx_stats[VMXNET3_MAX_TX_QUEUES];
 	UPT1_RxStats          snapshot_rx_stats[VMXNET3_MAX_RX_QUEUES];
 };
 
+#define VMXNET3_REV_6		5		/* Vmxnet3 Rev. 6 */
 #define VMXNET3_REV_5		4		/* Vmxnet3 Rev. 5 */
 #define VMXNET3_REV_4		3		/* Vmxnet3 Rev. 4 */
 #define VMXNET3_REV_3		2		/* Vmxnet3 Rev. 3 */
 #define VMXNET3_REV_2		1		/* Vmxnet3 Rev. 2 */
 #define VMXNET3_REV_1		0		/* Vmxnet3 Rev. 1 */
 
+#define VMXNET3_VERSION_GE_6(hw) ((hw)->version >= VMXNET3_REV_6 + 1)
 #define VMXNET3_VERSION_GE_5(hw) ((hw)->version >= VMXNET3_REV_5 + 1)
 #define VMXNET3_VERSION_GE_4(hw) ((hw)->version >= VMXNET3_REV_4 + 1)
 #define VMXNET3_VERSION_GE_3(hw) ((hw)->version >= VMXNET3_REV_3 + 1)
drivers/net/vmxnet3/vmxnet3_rxtx.c +1 -1
index e15b377d8c..c94e3762e6 100644
@@ -1400,7 +1400,7 @@ vmxnet3_rss_configure(struct rte_eth_dev *dev)
 	/* loading hashKeySize */
 	dev_rss_conf->hashKeySize = VMXNET3_RSS_MAX_KEY_SIZE;
 	/* loading indTableSize: Must not exceed VMXNET3_RSS_MAX_IND_TABLE_SIZE (128)*/
-	dev_rss_conf->indTableSize = (uint16_t)(hw->num_rx_queues * 4);
+	dev_rss_conf->indTableSize = (uint16_t)((MAX_RX_QUEUES(hw)) * 4);
 
 	if (port_rss_conf->rss_key == NULL) {
 		/* Default hash key */
Signature · 1 line
2.30.2
#31 lore raw

PATCH v6 7/9 net/vmxnet3: advertise RETA size in device info

In reply to Andrew Rybchenko

From: Pankaj Gupta <[email protected]>

Currently the driver assumes that the size of the RETA table is four times the number of Rx queues at multiple places. However, it sets it to four times the maximum number of queues (4 * 32 = 128) when it first initializes the device. Change the other uses to use the stored value, not the assumed default.

Tested, using testpmd, for different hardware versions on ESXi 7.0 Update 2.

---
 drivers/net/vmxnet3/vmxnet3_ethdev.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/net/vmxnet3/vmxnet3_ethdev.c +6 -1
index 52309811e5..c9e352b73a 100644
@@ -1479,7 +1479,12 @@ vmxnet3_dev_info_get(struct rte_eth_dev *dev,
 	dev_info->rx_queue_offload_capa = 0;
 	dev_info->tx_offload_capa = VMXNET3_TX_OFFLOAD_CAP;
 	dev_info->tx_queue_offload_capa = 0;
-
+	if (hw->rss_conf == NULL) {
+		/* RSS not configured */
+		dev_info->reta_size = 0;
+	} else {
+		dev_info->reta_size = hw->rss_conf->indTableSize;
+	}
 	return 0;
 }
 
Signature · 1 line
2.30.2
#32 lore raw

PATCH v6 8/9 net/vmxnet3: set packet type for fragmented packet

In reply to Andrew Rybchenko

From: Pankaj Gupta <[email protected]>

The packet type is set even if it is a fragmented packet.

Tested, using testpmd, for different hardware versions on ESXi 7.0 Update 2.

---
 drivers/net/vmxnet3/vmxnet3_rxtx.c | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
drivers/net/vmxnet3/vmxnet3_rxtx.c +17 -0
index c94e3762e6..a875ffec07 100644
@@ -759,6 +759,23 @@ vmxnet3_rx_offload(struct vmxnet3_hw *hw, const Vmxnet3_RxCompDesc *rcd,
 		/* Check packet type, checksum errors, etc. */
 		if (rcd->cnc) {
 			ol_flags |= RTE_MBUF_F_RX_L4_CKSUM_UNKNOWN;
+
+			if (rcd->v4) {
+				packet_type |= RTE_PTYPE_L3_IPV4_EXT_UNKNOWN;
+				if (rcd->tcp)
+					packet_type |= RTE_PTYPE_L4_TCP;
+				else if (rcd->udp)
+					packet_type |= RTE_PTYPE_L4_UDP;
+			} else if (rcd->v6) {
+				packet_type |= RTE_PTYPE_L3_IPV6_EXT_UNKNOWN;
+				if (rcd->tcp)
+					packet_type |= RTE_PTYPE_L4_TCP;
+				else if (rcd->udp)
+					packet_type |= RTE_PTYPE_L4_UDP;
+			} else {
+				packet_type |= RTE_PTYPE_UNKNOWN;
+			}
+
 		} else {
 			if (rcd->v4) {
 				packet_type |= RTE_PTYPE_L3_IPV4_EXT_UNKNOWN;
Signature · 1 line
2.30.2
#33 lore raw

PATCH v6 9/9 net/vmxnet3: fix merge error in Rx data ring initialization

In reply to Andrew Rybchenko

From: Pankaj Gupta <[email protected]>

Tested, using testpmd, for different hardware versions on ESXi 7.0 Update 2.

Fixes 046f11619567 ("net/vmxnet3: support MSI-X interrupt")
---
 drivers/net/vmxnet3/vmxnet3_ethdev.c | 5 +++++
 1 file changed, 5 insertions(+)
drivers/net/vmxnet3/vmxnet3_ethdev.c +5 -0
index c9e352b73a..2af67dc0a3 100644
@@ -875,6 +875,11 @@ vmxnet3_setup_driver_shared(struct rte_eth_dev *dev)
 		rqd->conf.rxRingSize[1]   = rxq->cmd_ring[1].size;
 		rqd->conf.compRingSize    = rxq->comp_ring.size;
 
+		if (VMXNET3_VERSION_GE_3(hw)) {
+			rqd->conf.rxDataRingBasePA = rxq->data_ring.basePA;
+			rqd->conf.rxDataRingDescSize = rxq->data_desc_size;
+		}
+
 		if (hw->intr.lsc_only)
 			rqd->conf.intrIdx = 1;
 		else
Signature · 1 line
2.30.2
#34 lore raw

Re: [PATCH v6 0/9] net/vmxnet3: support versions 5 and 6

In reply to Andrew Rybchenko

Hi Pankaj,

I did final cleanup before applying the patch series, but realized that release notes update is missing. Please, pick up my changes and amend patches which support new features with release notes update in the documentation.

Everything else LGTM now.

Thanks,
Andrew.

Quoted 39 lines · Andrew Rybchenko

v6 (Andrew Rybchenko):
Minor style changes in patches description
Split FW version get patch to have callbacks reorder seperately Minor fix in FW version get patch to put callback definition, assignment and implementation just after device info get

v5:
Use RTE_MIN instead of defining MIN in drivers/net/vmxnet3/vmxnet3_ethdev.c User RETA instead of reta in commit message
Fix the issue thrown by checkpatches.sh in file drivers/net/vmxnet3/vmxnet3_ethdev.c

v4:
Changing the subject for [Patch 8/8] from "net/vmxnet3: fix merge error in initialization for rxDataRing feature" to
"Fixes: 046f11619567 ("net/vmxnet3: support MSI-X interrupt")"

v3:
adding Reviewed-by info in all the patches

v2:
address review comments from Andrew Rybchenko [email protected]

Pankaj Gupta (9):
net/vmxnet3: add version 5 support
net/vmxnet3: implement RETA query and RETA update net/vmxnet3: add Rx queue usage count utility net/vmxnet3: fix ethdev callbacks init order net/vmxnet3: report HW version on FW version get net/vmxnet3: add version 6 support
net/vmxnet3: advertise RETA size in device info net/vmxnet3: set packet type for fragmented packet net/vmxnet3: fix merge error in Rx data ring initialization

  drivers/net/vmxnet3/base/vmxnet3_defs.h |  73 ++++-
  drivers/net/vmxnet3/vmxnet3_ethdev.c    | 339 +++++++++++++++++++-----
  drivers/net/vmxnet3/vmxnet3_ethdev.h    |  15 +-
  drivers/net/vmxnet3/vmxnet3_rxtx.c      |  49 +++-
  4 files changed, 388 insertions(+), 88 deletions(-)
#35 lore raw

Re: [PATCH v6 0/9] net/vmxnet3: support versions 5 and 6

Hi Andrew,
New features were introduced in following two patches so I will update release_22_07.rst for these two patches.

[PATCH v6 1/9] net/vmxnet3: add version 5 support

[PATCH v6 6/9] net/vmxnet3: add version 6 support

Let me know if I am missing anything.

Thanks,
Pankaj

From: Andrew Rybchenko <[email protected]>
Date: Thursday, May 19, 2022 at 1:07 AM
To: Pankaj Gupta <[email protected]>, Jochen Behrens <[email protected]>
Cc: [email protected] <[email protected]>
Subject: Re: [PATCH v6 0/9] net/vmxnet3: support versions 5 and 6 ⚠ External Email

Hi Pankaj,

I did final cleanup before applying the patch series, but realized that release notes update is missing. Please, pick up my changes and amend patches which support new features with release notes update in the documentation.

Everything else LGTM now.

Thanks,
Andrew.

Quoted 33 lines · Andrew Rybchenko

v6 (Andrew Rybchenko):
Minor style changes in patches description
Split FW version get patch to have callbacks reorder seperately Minor fix in FW version get patch to put callback definition, assignment and implementation just after device info get

v5:
Use RTE_MIN instead of defining MIN in drivers/net/vmxnet3/vmxnet3_ethdev.c User RETA instead of reta in commit message
Fix the issue thrown by checkpatches.sh in file drivers/net/vmxnet3/vmxnet3_ethdev.c

v4:
Changing the subject for [Patch 8/8] from "net/vmxnet3: fix merge error in initialization for rxDataRing feature" to
"Fixes: 046f11619567 ("net/vmxnet3: support MSI-X interrupt")"

v3:
adding Reviewed-by info in all the patches

v2:
address review comments from Andrew Rybchenko [email protected]

Pankaj Gupta (9):
net/vmxnet3: add version 5 support
net/vmxnet3: implement RETA query and RETA update net/vmxnet3: add Rx queue usage count utility net/vmxnet3: fix ethdev callbacks init order net/vmxnet3: report HW version on FW version get net/vmxnet3: add version 6 support
net/vmxnet3: advertise RETA size in device info net/vmxnet3: set packet type for fragmented packet net/vmxnet3: fix merge error in Rx data ring initialization

Quoted 6 lines
  drivers/net/vmxnet3/base/vmxnet3_defs.h |  73 ++++-
  drivers/net/vmxnet3/vmxnet3_ethdev.c    | 339 +++++++++++++++++++-----
  drivers/net/vmxnet3/vmxnet3_ethdev.h    |  15 +-
  drivers/net/vmxnet3/vmxnet3_rxtx.c      |  49 +++-
  4 files changed, 388 insertions(+), 88 deletions(-)

________________________________

⚠ External Email: This email originated from outside of the organization. Do not click links or open attachments unless you recognize the sender.

#36 lore raw

Re: [PATCH v6 0/9] net/vmxnet3: support versions 5 and 6

Hi Pankai,

I'd consider a patch which adds RETA controls as well. IMHO it is a major feature which could be interesting to end users.

Regards,
Andrew.

Quoted 80 lines · Pankaj Gupta

Hi Andrew,

New features were introduced in following two patches so I will update release_22_07.rst for these two patches.

[PATCH v6 1/9] net/vmxnet3: add version 5 support

[PATCH v6 6/9] net/vmxnet3: add version 6 support

Let me know if I am missing anything.

Thanks,

Pankaj

*From: *Andrew Rybchenko <[email protected]>
*Date: *Thursday, May 19, 2022 at 1:07 AM
*To: *Pankaj Gupta <[email protected]>, Jochen Behrens <[email protected]> *Cc: *[email protected] <[email protected]>
*Subject: *Re: [PATCH v6 0/9] net/vmxnet3: support versions 5 and 6

⚠External Email

Hi Pankaj,

I did final cleanup before applying the patch series, but realized that release notes update is missing. Please, pick up my changes and amend patches which support new features with release notes update in the documentation.

Everything else LGTM now.

Thanks,
Andrew.

Quoted 33 lines · Andrew Rybchenko

v6 (Andrew Rybchenko):
      Minor style changes in patches description
      Split FW version get patch to have callbacks reorder seperately Minor fix in FW version get patch to put callback definition, assignment and implementation just after device info get

v5:
      Use RTE_MIN instead of defining MIN in drivers/net/vmxnet3/vmxnet3_ethdev.c User RETA instead of reta in commit message
      Fix the issue thrown by checkpatches.sh in file drivers/net/vmxnet3/vmxnet3_ethdev.c

v4:
      Changing the subject for [Patch 8/8] from "net/vmxnet3: fix merge error in initialization for rxDataRing feature" to
      "Fixes: 046f11619567 ("net/vmxnet3: support MSI-X interrupt")"

v3:
      adding Reviewed-by info in all the patches

v2:
      address review comments from Andrew Rybchenko [email protected]

Pankaj Gupta (9):
    net/vmxnet3: add version 5 support
    net/vmxnet3: implement RETA query and RETA update net/vmxnet3: add Rx queue usage count utility net/vmxnet3: fix ethdev callbacks init order net/vmxnet3: report HW version on FW version get net/vmxnet3: add version 6 support
    net/vmxnet3: advertise RETA size in device info net/vmxnet3: set packet type for fragmented packet net/vmxnet3: fix merge error in Rx data ring initialization

Quoted 6 lines

   drivers/net/vmxnet3/base/vmxnet3_defs.h |  73 ++++- drivers/net/vmxnet3/vmxnet3_ethdev.c    | 339 +++++++++++++++++++----- drivers/net/vmxnet3/vmxnet3_ethdev.h    |  15 +- drivers/net/vmxnet3/vmxnet3_rxtx.c      |  49 +++-

   4 files changed, 388 insertions(+), 88 deletions(-)

________________________________

⚠External Email: This email originated from outside of the organization. Do not click links or open attachments unless you recognize the sender.