* [PATCH v6 1/9] net/vmxnet3: add version 5 support
2022-05-25 0:40 [PATCH v6 0/9] net/vmxnet3: support versions 5 and 6 Pankaj Gupta
@ 2022-05-25 0:40 ` Pankaj Gupta
2022-05-25 0:40 ` [PATCH v6 2/9] net/vmxnet3: implement RETA query and RETA update Pankaj Gupta
` (8 subsequent siblings)
9 siblings, 0 replies; 19+ messages in thread
From: Pankaj Gupta @ 2022-05-25 0:40 UTC (permalink / raw)
To: jbehrens; +Cc: dev, pagupta
Add VMXNET3 v5 support.
Tested, using testpmd, for different hardware versions on ESXi 7.0
Update 2.
Signed-off-by: Pankaj Gupta <pagupta@vmware.com>
Reviewed-by: Jochen Behrens <jbehrens@vmware.com>
---
doc/guides/rel_notes/release_21_08.rst | 2 ++
drivers/net/vmxnet3/vmxnet3_ethdev.c | 7 +++++--
drivers/net/vmxnet3/vmxnet3_ethdev.h | 2 ++
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/doc/guides/rel_notes/release_21_08.rst b/doc/guides/rel_notes/release_21_08.rst
index ac1c081903..cc472d7a05 100644
--- a/doc/guides/rel_notes/release_21_08.rst
+++ b/doc/guides/rel_notes/release_21_08.rst
@@ -129,6 +129,8 @@ New Features
Updated testpmd application to output log errors and warnings to stderr
instead of stdout.
+* **Added vmxnet3 version 5 support.**
+
API Changes
-----------
diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c
index d1ef1cad08..a7e1e5fef5 100644
--- a/drivers/net/vmxnet3/vmxnet3_ethdev.c
+++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c
@@ -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;
diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.h b/drivers/net/vmxnet3/vmxnet3_ethdev.h
index ef858ac951..7ec3b2e1f0 100644
--- a/drivers/net/vmxnet3/vmxnet3_ethdev.h
+++ b/drivers/net/vmxnet3/vmxnet3_ethdev.h
@@ -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)
--
2.17.1
^ permalink raw reply [flat|nested] 19+ messages in thread* [PATCH v6 2/9] net/vmxnet3: implement RETA query and RETA update
2022-05-25 0:40 [PATCH v6 0/9] net/vmxnet3: support versions 5 and 6 Pankaj Gupta
2022-05-25 0:40 ` [PATCH v6 1/9] net/vmxnet3: add version 5 support Pankaj Gupta
@ 2022-05-25 0:40 ` Pankaj Gupta
2022-05-25 0:40 ` [PATCH v6 3/9] net/vmxnet3: add Rx queue usage count utility Pankaj Gupta
` (7 subsequent siblings)
9 siblings, 0 replies; 19+ messages in thread
From: Pankaj Gupta @ 2022-05-25 0:40 UTC (permalink / raw)
To: jbehrens; +Cc: dev, pagupta
Add RETA query and RETA update support for VMXNET3.
Tested, using testpmd, for different hardware versions on ESXi 7.0
Update 2.
Signed-off-by: Pankaj Gupta <pagupta@vmware.com>
Reviewed-by: Jochen Behrens <jbehrens@vmware.com>
---
doc/guides/rel_notes/release_21_08.rst | 2 +
drivers/net/vmxnet3/vmxnet3_ethdev.c | 67 ++++++++++++++++++++++++++
2 files changed, 69 insertions(+)
diff --git a/doc/guides/rel_notes/release_21_08.rst b/doc/guides/rel_notes/release_21_08.rst
index cc472d7a05..4027bd4390 100644
--- a/doc/guides/rel_notes/release_21_08.rst
+++ b/doc/guides/rel_notes/release_21_08.rst
@@ -131,6 +131,8 @@ New Features
* **Added vmxnet3 version 5 support.**
+* **Added RETA query and RETA update support for vmxnet3.**
+
API Changes
-----------
diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c
index a7e1e5fef5..d5f9903946 100644
--- a/drivers/net/vmxnet3/vmxnet3_ethdev.c
+++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c
@@ -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;
+}
--
2.17.1
^ permalink raw reply [flat|nested] 19+ messages in thread* [PATCH v6 3/9] net/vmxnet3: add Rx queue usage count utility
2022-05-25 0:40 [PATCH v6 0/9] net/vmxnet3: support versions 5 and 6 Pankaj Gupta
2022-05-25 0:40 ` [PATCH v6 1/9] net/vmxnet3: add version 5 support Pankaj Gupta
2022-05-25 0:40 ` [PATCH v6 2/9] net/vmxnet3: implement RETA query and RETA update Pankaj Gupta
@ 2022-05-25 0:40 ` Pankaj Gupta
2022-05-25 0:40 ` [PATCH v6 4/9] net/vmxnet3: fix ethdev callbacks init order Pankaj Gupta
` (6 subsequent siblings)
9 siblings, 0 replies; 19+ messages in thread
From: Pankaj Gupta @ 2022-05-25 0:40 UTC (permalink / raw)
To: jbehrens; +Cc: dev, pagupta
Count the number of entries in the Rx queue for debugging.
Tested, using testpmd, for different hardware versions on ESXi 7.0
Update 2.
Signed-off-by: Pankaj Gupta <pagupta@vmware.com>
Reviewed-by: Jochen Behrens <jbehrens@vmware.com>
---
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(+)
diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c
index d5f9903946..cd32c1b4ee 100644
--- a/drivers/net/vmxnet3/vmxnet3_ethdev.c
+++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c
@@ -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 */
diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.h b/drivers/net/vmxnet3/vmxnet3_ethdev.h
index 7ec3b2e1f0..ceaeb66392 100644
--- a/drivers/net/vmxnet3/vmxnet3_ethdev.h
+++ b/drivers/net/vmxnet3/vmxnet3_ethdev.h
@@ -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);
diff --git a/drivers/net/vmxnet3/vmxnet3_rxtx.c b/drivers/net/vmxnet3/vmxnet3_rxtx.c
index d745064bc4..e15b377d8c 100644
--- a/drivers/net/vmxnet3/vmxnet3_rxtx.c
+++ b/drivers/net/vmxnet3/vmxnet3_rxtx.c
@@ -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,
--
2.17.1
^ permalink raw reply [flat|nested] 19+ messages in thread* [PATCH v6 4/9] net/vmxnet3: fix ethdev callbacks init order
2022-05-25 0:40 [PATCH v6 0/9] net/vmxnet3: support versions 5 and 6 Pankaj Gupta
` (2 preceding siblings ...)
2022-05-25 0:40 ` [PATCH v6 3/9] net/vmxnet3: add Rx queue usage count utility Pankaj Gupta
@ 2022-05-25 0:40 ` Pankaj Gupta
2022-05-25 0:40 ` [PATCH v6 5/9] net/vmxnet3: report HW version on FW version get Pankaj Gupta
` (5 subsequent siblings)
9 siblings, 0 replies; 19+ messages in thread
From: Pankaj Gupta @ 2022-05-25 0:40 UTC (permalink / raw)
To: jbehrens; +Cc: dev, pagupta, Andrew Rybchenko
Driver callbacks initialization should follow callbacks order in the
structure definition.
Do not reorder callbacks implementation to avoid extra noise in
the code.
Signed-off-by: Pankaj Gupta <pagupta@vmware.com>
Signed-off-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
---
drivers/net/vmxnet3/vmxnet3_ethdev.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c
index cd32c1b4ee..e84d304378 100644
--- a/drivers/net/vmxnet3/vmxnet3_ethdev.c
+++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c
@@ -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,
};
--
2.17.1
^ permalink raw reply [flat|nested] 19+ messages in thread* [PATCH v6 5/9] net/vmxnet3: report HW version on FW version get
2022-05-25 0:40 [PATCH v6 0/9] net/vmxnet3: support versions 5 and 6 Pankaj Gupta
` (3 preceding siblings ...)
2022-05-25 0:40 ` [PATCH v6 4/9] net/vmxnet3: fix ethdev callbacks init order Pankaj Gupta
@ 2022-05-25 0:40 ` Pankaj Gupta
2022-05-25 0:40 ` [PATCH v6 6/9] net/vmxnet3: add version 6 support Pankaj Gupta
` (4 subsequent siblings)
9 siblings, 0 replies; 19+ messages in thread
From: Pankaj Gupta @ 2022-05-25 0:40 UTC (permalink / raw)
To: jbehrens; +Cc: dev, pagupta, Andrew Rybchenko
Support rte_eth_dev_fw_version_get() API.
Tested, using testpmd, for different hardware versions on ESXi 7.0
Update 2.
Signed-off-by: Pankaj Gupta <pagupta@vmware.com>
Reviewed-by: Jochen Behrens <jbehrens@vmware.com>
Signed-off-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
---
drivers/net/vmxnet3/vmxnet3_ethdev.c | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c
index e84d304378..62844f3d39 100644
--- a/drivers/net/vmxnet3/vmxnet3_ethdev.c
+++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c
@@ -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)
{
--
2.17.1
^ permalink raw reply [flat|nested] 19+ messages in thread* [PATCH v6 6/9] net/vmxnet3: add version 6 support
2022-05-25 0:40 [PATCH v6 0/9] net/vmxnet3: support versions 5 and 6 Pankaj Gupta
` (4 preceding siblings ...)
2022-05-25 0:40 ` [PATCH v6 5/9] net/vmxnet3: report HW version on FW version get Pankaj Gupta
@ 2022-05-25 0:40 ` Pankaj Gupta
2022-05-25 8:45 ` Andrew Rybchenko
2022-05-25 0:40 ` [PATCH v6 7/9] net/vmxnet3: advertise RETA size in device info Pankaj Gupta
` (3 subsequent siblings)
9 siblings, 1 reply; 19+ messages in thread
From: Pankaj Gupta @ 2022-05-25 0:40 UTC (permalink / raw)
To: jbehrens; +Cc: dev, pagupta
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.
Signed-off-by: Pankaj Gupta <pagupta@vmware.com>
Reviewed-by: Jochen Behrens <jbehrens@vmware.com>
---
doc/guides/rel_notes/release_21_08.rst | 8 +
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 +-
5 files changed, 234 insertions(+), 79 deletions(-)
diff --git a/doc/guides/rel_notes/release_21_08.rst b/doc/guides/rel_notes/release_21_08.rst
index 4027bd4390..810da2cc1f 100644
--- a/doc/guides/rel_notes/release_21_08.rst
+++ b/doc/guides/rel_notes/release_21_08.rst
@@ -133,6 +133,14 @@ New Features
* **Added RETA query and RETA update support for vmxnet3.**
+* **Added vmxnet3 version 6 supports with some new features.**
+
+ * 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
+
API Changes
-----------
diff --git a/drivers/net/vmxnet3/base/vmxnet3_defs.h b/drivers/net/vmxnet3/base/vmxnet3_defs.h
index 8d62b3e116..bd6695e69d 100644
--- a/drivers/net/vmxnet3/base/vmxnet3_defs.h
+++ b/drivers/net/vmxnet3/base/vmxnet3_defs.h
@@ -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
diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c
index 62844f3d39..52309811e5 100644
--- a/drivers/net/vmxnet3/vmxnet3_ethdev.c
+++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c
@@ -221,24 +221,20 @@ vmxnet3_disable_intr(struct vmxnet3_hw *hw, unsigned int intr_idx)
}
/*
- * Enable all intrs used by the device
+ * Simple helper to get intrCtrl and eventIntrIdx based on config and hw version
*/
static void
-vmxnet3_enable_all_intrs(struct vmxnet3_hw *hw)
+vmxnet3_get_intr_ctrl_ev(struct vmxnet3_hw *hw,
+ uint8 **out_eventIntrIdx,
+ uint32 **out_intrCtrl)
{
- Vmxnet3_DSDevRead *devRead = &hw->shared->devRead;
-
- PMD_INIT_FUNC_TRACE();
- devRead->intrConf.intrCtrl &= rte_cpu_to_le_32(~VMXNET3_IC_DISABLE_ALL);
-
- if (hw->intr.lsc_only) {
- vmxnet3_enable_intr(hw, devRead->intrConf.eventIntrIdx);
+ if (VMXNET3_VERSION_GE_6(hw) && hw->queuesExtEnabled) {
+ *out_eventIntrIdx = &hw->shared->devReadExt.intrConfExt.eventIntrIdx;
+ *out_intrCtrl = &hw->shared->devReadExt.intrConfExt.intrCtrl;
} else {
- int i;
-
- for (i = 0; i < hw->intr.num_intrs; i++)
- vmxnet3_enable_intr(hw, i);
+ *out_eventIntrIdx = &hw->shared->devRead.intrConf.eventIntrIdx;
+ *out_intrCtrl = &hw->shared->devRead.intrConf.intrCtrl;
}
}
@@ -249,15 +245,42 @@ static void
vmxnet3_disable_all_intrs(struct vmxnet3_hw *hw)
{
int i;
+ uint8 *eventIntrIdx;
+ uint32 *intrCtrl;
PMD_INIT_FUNC_TRACE();
+ vmxnet3_get_intr_ctrl_ev(hw, &eventIntrIdx, &intrCtrl);
+
+ *intrCtrl |= rte_cpu_to_le_32(VMXNET3_IC_DISABLE_ALL);
- hw->shared->devRead.intrConf.intrCtrl |=
- rte_cpu_to_le_32(VMXNET3_IC_DISABLE_ALL);
- for (i = 0; i < hw->num_intrs; i++)
+ for (i = 0; i < hw->intr.num_intrs; i++)
vmxnet3_disable_intr(hw, i);
}
+/*
+ * Enable all intrs used by the device
+ */
+static void
+vmxnet3_enable_all_intrs(struct vmxnet3_hw *hw)
+{
+ uint8 *eventIntrIdx;
+ uint32 *intrCtrl;
+
+ PMD_INIT_FUNC_TRACE();
+ vmxnet3_get_intr_ctrl_ev(hw, &eventIntrIdx, &intrCtrl);
+
+ *intrCtrl &= rte_cpu_to_le_32(~VMXNET3_IC_DISABLE_ALL);
+
+ if (hw->intr.lsc_only) {
+ vmxnet3_enable_intr(hw, *eventIntrIdx);
+ } else {
+ int i;
+
+ for (i = 0; i < hw->intr.num_intrs; i++)
+ vmxnet3_enable_intr(hw, i);
+ }
+}
+
/*
* Gets tx data ring descriptor size.
*/
@@ -332,7 +355,11 @@ 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);
- if (ver & (1 << VMXNET3_REV_5)) {
+ if (ver & (1 << VMXNET3_REV_6)) {
+ VMXNET3_WRITE_BAR1_REG(hw, VMXNET3_REG_VRRS,
+ 1 << VMXNET3_REV_6);
+ hw->version = VMXNET3_REV_6 + 1;
+ } else if (ver & (1 << VMXNET3_REV_5)) {
VMXNET3_WRITE_BAR1_REG(hw, VMXNET3_REG_VRRS,
1 << VMXNET3_REV_5);
hw->version = VMXNET3_REV_5 + 1;
@@ -507,15 +534,22 @@ vmxnet3_dev_configure(struct rte_eth_dev *dev)
if (dev->data->dev_conf.rxmode.mq_mode & RTE_ETH_MQ_RX_RSS_FLAG)
dev->data->dev_conf.rxmode.offloads |= RTE_ETH_RX_OFFLOAD_RSS_HASH;
- if (dev->data->nb_tx_queues > VMXNET3_MAX_TX_QUEUES ||
- dev->data->nb_rx_queues > VMXNET3_MAX_RX_QUEUES) {
- PMD_INIT_LOG(ERR, "ERROR: Number of queues not supported");
- return -EINVAL;
+ if (!VMXNET3_VERSION_GE_6(hw)) {
+ if (!rte_is_power_of_2(dev->data->nb_rx_queues)) {
+ PMD_INIT_LOG(ERR,
+ "ERROR: Number of rx queues not power of 2");
+ return -EINVAL;
+ }
}
- if (!rte_is_power_of_2(dev->data->nb_rx_queues)) {
- PMD_INIT_LOG(ERR, "ERROR: Number of rx queues not power of 2");
- return -EINVAL;
+ /* At this point, the number of queues requested has already
+ * been validated against dev_infos max queues by EAL
+ */
+ if (dev->data->nb_rx_queues > VMXNET3_MAX_RX_QUEUES ||
+ dev->data->nb_tx_queues > VMXNET3_MAX_TX_QUEUES) {
+ hw->queuesExtEnabled = 1;
+ } else {
+ hw->queuesExtEnabled = 0;
}
size = dev->data->nb_rx_queues * sizeof(struct Vmxnet3_TxQueueDesc) +
@@ -626,9 +660,9 @@ vmxnet3_configure_msix(struct rte_eth_dev *dev)
return -1;
intr_vector = dev->data->nb_rx_queues;
- if (intr_vector > VMXNET3_MAX_RX_QUEUES) {
+ if (intr_vector > MAX_RX_QUEUES(hw)) {
PMD_INIT_LOG(ERR, "At most %d intr queues supported",
- VMXNET3_MAX_RX_QUEUES);
+ MAX_RX_QUEUES(hw));
return -ENOTSUP;
}
@@ -776,6 +810,7 @@ vmxnet3_setup_driver_shared(struct rte_eth_dev *dev)
uint32_t mtu = dev->data->mtu;
Vmxnet3_DriverShared *shared = hw->shared;
Vmxnet3_DSDevRead *devRead = &shared->devRead;
+ struct Vmxnet3_DSDevReadExt *devReadExt = &shared->devReadExt;
uint64_t rx_offloads = dev->data->dev_conf.rxmode.offloads;
uint32_t i;
int ret;
@@ -852,13 +887,27 @@ vmxnet3_setup_driver_shared(struct rte_eth_dev *dev)
}
/* intr settings */
- devRead->intrConf.autoMask = hw->intr.mask_mode == VMXNET3_IMM_AUTO;
- devRead->intrConf.numIntrs = hw->intr.num_intrs;
- for (i = 0; i < hw->intr.num_intrs; i++)
- devRead->intrConf.modLevels[i] = hw->intr.mod_levels[i];
+ if (VMXNET3_VERSION_GE_6(hw) && hw->queuesExtEnabled) {
+ devReadExt->intrConfExt.autoMask = hw->intr.mask_mode ==
+ VMXNET3_IMM_AUTO;
+ devReadExt->intrConfExt.numIntrs = hw->intr.num_intrs;
+ for (i = 0; i < hw->intr.num_intrs; i++)
+ devReadExt->intrConfExt.modLevels[i] =
+ hw->intr.mod_levels[i];
+
+ devReadExt->intrConfExt.eventIntrIdx = hw->intr.event_intr_idx;
+ devReadExt->intrConfExt.intrCtrl |=
+ rte_cpu_to_le_32(VMXNET3_IC_DISABLE_ALL);
+ } else {
+ devRead->intrConf.autoMask = hw->intr.mask_mode ==
+ VMXNET3_IMM_AUTO;
+ devRead->intrConf.numIntrs = hw->intr.num_intrs;
+ for (i = 0; i < hw->intr.num_intrs; i++)
+ devRead->intrConf.modLevels[i] = hw->intr.mod_levels[i];
- devRead->intrConf.eventIntrIdx = hw->intr.event_intr_idx;
- devRead->intrConf.intrCtrl |= rte_cpu_to_le_32(VMXNET3_IC_DISABLE_ALL);
+ devRead->intrConf.eventIntrIdx = hw->intr.event_intr_idx;
+ devRead->intrConf.intrCtrl |= rte_cpu_to_le_32(VMXNET3_IC_DISABLE_ALL);
+ }
/* RxMode set to 0 of VMXNET3_RXM_xxx */
devRead->rxFilterConf.rxMode = 0;
@@ -936,18 +985,24 @@ vmxnet3_dev_start(struct rte_eth_dev *dev)
return -EINVAL;
}
- /* Setup memory region for rx buffers */
- ret = vmxnet3_dev_setup_memreg(dev);
- if (ret == 0) {
- VMXNET3_WRITE_BAR1_REG(hw, VMXNET3_REG_CMD,
- VMXNET3_CMD_REGISTER_MEMREGS);
- ret = VMXNET3_READ_BAR1_REG(hw, VMXNET3_REG_CMD);
- if (ret != 0)
- PMD_INIT_LOG(DEBUG,
- "Failed in setup memory region cmd\n");
- ret = 0;
+ /* Check memregs restrictions first */
+ if (dev->data->nb_rx_queues <= VMXNET3_MAX_RX_QUEUES &&
+ dev->data->nb_tx_queues <= VMXNET3_MAX_TX_QUEUES) {
+ ret = vmxnet3_dev_setup_memreg(dev);
+ if (ret == 0) {
+ VMXNET3_WRITE_BAR1_REG(hw, VMXNET3_REG_CMD,
+ VMXNET3_CMD_REGISTER_MEMREGS);
+ ret = VMXNET3_READ_BAR1_REG(hw, VMXNET3_REG_CMD);
+ if (ret != 0)
+ PMD_INIT_LOG(DEBUG,
+ "Failed in setup memory region cmd\n");
+ ret = 0;
+ } else {
+ PMD_INIT_LOG(DEBUG, "Failed to setup memory region\n");
+ }
} else {
- PMD_INIT_LOG(DEBUG, "Failed to setup memory region\n");
+ PMD_INIT_LOG(WARNING, "Memregs can't init (rx: %d, tx: %d)",
+ dev->data->nb_rx_queues, dev->data->nb_tx_queues);
}
if (VMXNET3_VERSION_GE_4(hw) &&
@@ -1202,8 +1257,6 @@ vmxnet3_hw_stats_save(struct vmxnet3_hw *hw)
VMXNET3_WRITE_BAR1_REG(hw, VMXNET3_REG_CMD, VMXNET3_CMD_GET_STATS);
- RTE_BUILD_BUG_ON(RTE_ETHDEV_QUEUE_STAT_CNTRS < VMXNET3_MAX_TX_QUEUES);
-
for (i = 0; i < hw->num_tx_queues; i++)
vmxnet3_hw_tx_stats_get(hw, i, &hw->saved_tx_stats[i]);
for (i = 0; i < hw->num_rx_queues; i++)
@@ -1305,7 +1358,6 @@ vmxnet3_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
VMXNET3_WRITE_BAR1_REG(hw, VMXNET3_REG_CMD, VMXNET3_CMD_GET_STATS);
- RTE_BUILD_BUG_ON(RTE_ETHDEV_QUEUE_STAT_CNTRS < VMXNET3_MAX_TX_QUEUES);
for (i = 0; i < hw->num_tx_queues; i++) {
vmxnet3_tx_stats_get(hw, i, &txStats);
@@ -1322,7 +1374,6 @@ vmxnet3_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
stats->oerrors += txStats.pktsTxError + txStats.pktsTxDiscard;
}
- RTE_BUILD_BUG_ON(RTE_ETHDEV_QUEUE_STAT_CNTRS < VMXNET3_MAX_RX_QUEUES);
for (i = 0; i < hw->num_rx_queues; i++) {
vmxnet3_rx_stats_get(hw, i, &rxStats);
@@ -1376,9 +1427,27 @@ vmxnet3_dev_info_get(struct rte_eth_dev *dev,
struct rte_eth_dev_info *dev_info)
{
struct vmxnet3_hw *hw = dev->data->dev_private;
+ int queues = 0;
+
+ if (VMXNET3_VERSION_GE_6(hw)) {
+ VMXNET3_WRITE_BAR1_REG(hw, VMXNET3_REG_CMD,
+ VMXNET3_CMD_GET_MAX_QUEUES_CONF);
+ queues = VMXNET3_READ_BAR1_REG(hw, VMXNET3_REG_CMD);
+
+ if (queues > 0) {
+ dev_info->max_rx_queues =
+ RTE_MIN(VMXNET3_EXT_MAX_RX_QUEUES, ((queues >> 8) & 0xff));
+ dev_info->max_tx_queues =
+ RTE_MIN(VMXNET3_EXT_MAX_TX_QUEUES, (queues & 0xff));
+ } else {
+ dev_info->max_rx_queues = VMXNET3_MAX_RX_QUEUES;
+ dev_info->max_tx_queues = VMXNET3_MAX_TX_QUEUES;
+ }
+ } else {
+ dev_info->max_rx_queues = VMXNET3_MAX_RX_QUEUES;
+ dev_info->max_tx_queues = VMXNET3_MAX_TX_QUEUES;
+ }
- dev_info->max_rx_queues = VMXNET3_MAX_RX_QUEUES;
- dev_info->max_tx_queues = VMXNET3_MAX_TX_QUEUES;
dev_info->min_rx_bufsize = 1518 + RTE_PKTMBUF_HEADROOM;
dev_info->max_rx_pktlen = 16384; /* includes CRC, cf MAXFRS register */
dev_info->min_mtu = VMXNET3_MIN_MTU;
@@ -1445,24 +1514,50 @@ vmxnet3_dev_supported_ptypes_get(struct rte_eth_dev *dev)
}
static int
-vmxnet3_dev_mtu_set(struct rte_eth_dev *dev, __rte_unused uint16_t mtu)
+vmxnet3_mac_addr_set(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr)
{
- if (dev->data->dev_started) {
- PMD_DRV_LOG(ERR, "Port %d must be stopped to configure MTU",
- dev->data->port_id);
- return -EBUSY;
- }
+ struct vmxnet3_hw *hw = dev->data->dev_private;
+ rte_ether_addr_copy(mac_addr, (struct rte_ether_addr *)(hw->perm_addr));
+ vmxnet3_write_mac(hw, mac_addr->addr_bytes);
return 0;
}
static int
-vmxnet3_mac_addr_set(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr)
+vmxnet3_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)
{
struct vmxnet3_hw *hw = dev->data->dev_private;
+ uint32_t frame_size = mtu + RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN + 4;
+
+ if (mtu < VMXNET3_MIN_MTU)
+ return -EINVAL;
+
+ if (VMXNET3_VERSION_GE_6(hw)) {
+ if (mtu > VMXNET3_V6_MAX_MTU)
+ return -EINVAL;
+ } else {
+ if (mtu > VMXNET3_MAX_MTU) {
+ PMD_DRV_LOG(ERR, "MTU %d too large in device version v%d",
+ mtu, hw->version);
+ return -EINVAL;
+ }
+ }
+
+ dev->data->mtu = mtu;
+ /* update max frame size */
+ dev->data->dev_conf.rxmode.mtu = frame_size;
+
+ if (dev->data->dev_started == 0)
+ return 0;
+
+ /* changing mtu for vmxnet3 pmd does not require a restart
+ * as it does not need to repopulate the rx rings to support
+ * different mtu size. We stop and restart the device here
+ * just to pass the mtu info to the backend.
+ */
+ vmxnet3_dev_stop(dev);
+ vmxnet3_dev_start(dev);
- rte_ether_addr_copy(mac_addr, (struct rte_ether_addr *)(hw->perm_addr));
- vmxnet3_write_mac(hw, mac_addr->addr_bytes);
return 0;
}
@@ -1683,11 +1778,14 @@ vmxnet3_interrupt_handler(void *param)
{
struct rte_eth_dev *dev = param;
struct vmxnet3_hw *hw = dev->data->dev_private;
- Vmxnet3_DSDevRead *devRead = &hw->shared->devRead;
uint32_t events;
+ uint8 *eventIntrIdx;
+ uint32 *intrCtrl;
PMD_INIT_FUNC_TRACE();
- vmxnet3_disable_intr(hw, devRead->intrConf.eventIntrIdx);
+
+ vmxnet3_get_intr_ctrl_ev(hw, &eventIntrIdx, &intrCtrl);
+ vmxnet3_disable_intr(hw, *eventIntrIdx);
events = VMXNET3_READ_BAR1_REG(hw, VMXNET3_REG_ECR);
if (events == 0)
@@ -1696,7 +1794,7 @@ vmxnet3_interrupt_handler(void *param)
RTE_LOG(DEBUG, PMD, "Reading events: 0x%X", events);
vmxnet3_process_events(dev);
done:
- vmxnet3_enable_intr(hw, devRead->intrConf.eventIntrIdx);
+ vmxnet3_enable_intr(hw, *eventIntrIdx);
}
static int
diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.h b/drivers/net/vmxnet3/vmxnet3_ethdev.h
index ceaeb66392..5a303717b1 100644
--- a/drivers/net/vmxnet3/vmxnet3_ethdev.h
+++ b/drivers/net/vmxnet3/vmxnet3_ethdev.h
@@ -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)
diff --git a/drivers/net/vmxnet3/vmxnet3_rxtx.c b/drivers/net/vmxnet3/vmxnet3_rxtx.c
index e15b377d8c..c94e3762e6 100644
--- a/drivers/net/vmxnet3/vmxnet3_rxtx.c
+++ b/drivers/net/vmxnet3/vmxnet3_rxtx.c
@@ -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 */
--
2.17.1
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PATCH v6 6/9] net/vmxnet3: add version 6 support
2022-05-25 0:40 ` [PATCH v6 6/9] net/vmxnet3: add version 6 support Pankaj Gupta
@ 2022-05-25 8:45 ` Andrew Rybchenko
2022-05-25 17:13 ` Pankaj Gupta
0 siblings, 1 reply; 19+ messages in thread
From: Andrew Rybchenko @ 2022-05-25 8:45 UTC (permalink / raw)
To: Pankaj Gupta, jbehrens; +Cc: dev
Hi, Pankaj,
On 5/25/22 03:40, Pankaj Gupta wrote:
> 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.
>
> Signed-off-by: Pankaj Gupta <pagupta@vmware.com>
> Reviewed-by: Jochen Behrens <jbehrens@vmware.com>
> ---
> doc/guides/rel_notes/release_21_08.rst | 8 +
> 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 +-
> 5 files changed, 234 insertions(+), 79 deletions(-)
>
> diff --git a/doc/guides/rel_notes/release_21_08.rst b/doc/guides/rel_notes/release_21_08.rst
> index 4027bd4390..810da2cc1f 100644
> --- a/doc/guides/rel_notes/release_21_08.rst
> +++ b/doc/guides/rel_notes/release_21_08.rst
> @@ -133,6 +133,14 @@ New Features
>
> * **Added RETA query and RETA update support for vmxnet3.**
>
> +* **Added vmxnet3 version 6 supports with some new features.**
> +
> + * 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
> +
I've realized that I don't understand the last bullet. Could
you clarify it, please, and I'll update it on applying.
Also, JFYI, you should update release notes for 22.07 release, not old
release notes for 21.08. Don't worry about it now -
I'll move and rephrase it on applying.
Thanks,
Andrew.
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v6 6/9] net/vmxnet3: add version 6 support
2022-05-25 8:45 ` Andrew Rybchenko
@ 2022-05-25 17:13 ` Pankaj Gupta
2022-05-31 12:54 ` Andrew Rybchenko
0 siblings, 1 reply; 19+ messages in thread
From: Pankaj Gupta @ 2022-05-25 17:13 UTC (permalink / raw)
To: Andrew Rybchenko, Jochen Behrens; +Cc: dev
[-- Attachment #1: Type: text/plain, Size: 2730 bytes --]
Hi Andrew,
>> Extended interrupt structures, required implementation for additional number of queues
It is about Vmxnet3_IntrConfExt.
Vmxnet3_IntrConfExt is a control data structure shared with ESX.
ESX introduced it for this version to increase the number of queues that can be used.
Vmxnet3_IntrConf was used for older hardware versions
Thanks,
Pankaj
From: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
Date: Wednesday, May 25, 2022 at 1:46 AM
To: Pankaj Gupta <pagupta@vmware.com>, Jochen Behrens <jbehrens@vmware.com>
Cc: dev@dpdk.org <dev@dpdk.org>
Subject: Re: [PATCH v6 6/9] net/vmxnet3: add version 6 support
⚠ External Email
Hi, Pankaj,
On 5/25/22 03:40, Pankaj Gupta wrote:
> 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.
>
> Signed-off-by: Pankaj Gupta <pagupta@vmware.com>
> Reviewed-by: Jochen Behrens <jbehrens@vmware.com>
> ---
> doc/guides/rel_notes/release_21_08.rst | 8 +
> 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 +-
> 5 files changed, 234 insertions(+), 79 deletions(-)
>
> diff --git a/doc/guides/rel_notes/release_21_08.rst b/doc/guides/rel_notes/release_21_08.rst
> index 4027bd4390..810da2cc1f 100644
> --- a/doc/guides/rel_notes/release_21_08.rst
> +++ b/doc/guides/rel_notes/release_21_08.rst
> @@ -133,6 +133,14 @@ New Features
>
> * **Added RETA query and RETA update support for vmxnet3.**
>
> +* **Added vmxnet3 version 6 supports with some new features.**
> +
> + * 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
> +
I've realized that I don't understand the last bullet. Could
you clarify it, please, and I'll update it on applying.
Also, JFYI, you should update release notes for 22.07 release, not old
release notes for 21.08. Don't worry about it now -
I'll move and rephrase it on applying.
Thanks,
Andrew.
________________________________
⚠ External Email: This email originated from outside of the organization. Do not click links or open attachments unless you recognize the sender.
[-- Attachment #2: Type: text/html, Size: 6591 bytes --]
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v6 6/9] net/vmxnet3: add version 6 support
2022-05-25 17:13 ` Pankaj Gupta
@ 2022-05-31 12:54 ` Andrew Rybchenko
0 siblings, 0 replies; 19+ messages in thread
From: Andrew Rybchenko @ 2022-05-31 12:54 UTC (permalink / raw)
To: Pankaj Gupta, Jochen Behrens; +Cc: dev
Hi Pankaj,
On 5/25/22 20:13, Pankaj Gupta wrote:
> Hi Andrew,
>
>>> Extended interrupt structures, required implementation for additional number of queues
>
> It is about Vmxnet3_IntrConfExt.
>
> Vmxnet3_IntrConfExt is a control data structure shared with ESX.
>
> ESX introduced it for this version to increase the number of queues that
> can be used.
> Vmxnet3_IntrConf was used for older hardware versions
Thanks, I see.
Andrew.
>
> Thanks,
>
> Pankaj
>
> *From: *Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
> *Date: *Wednesday, May 25, 2022 at 1:46 AM
> *To: *Pankaj Gupta <pagupta@vmware.com>, Jochen Behrens
> <jbehrens@vmware.com>
> *Cc: *dev@dpdk.org <dev@dpdk.org>
> *Subject: *Re: [PATCH v6 6/9] net/vmxnet3: add version 6 support
>
> ⚠External Email
>
> Hi, Pankaj,
>
> On 5/25/22 03:40, Pankaj Gupta wrote:
>> 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.
>>
>> Signed-off-by: Pankaj Gupta <pagupta@vmware.com>
>> Reviewed-by: Jochen Behrens <jbehrens@vmware.com>
>> ---
>> doc/guides/rel_notes/release_21_08.rst | 8 +
>> 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 +-
>> 5 files changed, 234 insertions(+), 79 deletions(-)
>>
>> diff --git a/doc/guides/rel_notes/release_21_08.rst b/doc/guides/rel_notes/release_21_08.rst
>> index 4027bd4390..810da2cc1f 100644
>> --- a/doc/guides/rel_notes/release_21_08.rst
>> +++ b/doc/guides/rel_notes/release_21_08.rst
>> @@ -133,6 +133,14 @@ New Features
>>
>> * **Added RETA query and RETA update support for vmxnet3.**
>>
>> +* **Added vmxnet3 version 6 supports with some new features.**
>> +
>> + * 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
>> +
>
> I've realized that I don't understand the last bullet. Could
> you clarify it, please, and I'll update it on applying.
>
> Also, JFYI, you should update release notes for 22.07 release, not old
> release notes for 21.08. Don't worry about it now -
> I'll move and rephrase it on applying.
>
> Thanks,
> Andrew.
>
> ________________________________
>
> ⚠External Email: This email originated from outside of the organization.
> Do not click links or open attachments unless you recognize the sender.
>
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH v6 7/9] net/vmxnet3: advertise RETA size in device info
2022-05-25 0:40 [PATCH v6 0/9] net/vmxnet3: support versions 5 and 6 Pankaj Gupta
` (5 preceding siblings ...)
2022-05-25 0:40 ` [PATCH v6 6/9] net/vmxnet3: add version 6 support Pankaj Gupta
@ 2022-05-25 0:40 ` Pankaj Gupta
2022-05-25 0:40 ` [PATCH v6 8/9] net/vmxnet3: set packet type for fragmented packet Pankaj Gupta
` (2 subsequent siblings)
9 siblings, 0 replies; 19+ messages in thread
From: Pankaj Gupta @ 2022-05-25 0:40 UTC (permalink / raw)
To: jbehrens; +Cc: dev, pagupta
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.
Signed-off-by: Pankaj Gupta <pagupta@vmware.com>
Reviewed-by: Jochen Behrens <jbehrens@vmware.com>
---
drivers/net/vmxnet3/vmxnet3_ethdev.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c
index 52309811e5..c9e352b73a 100644
--- a/drivers/net/vmxnet3/vmxnet3_ethdev.c
+++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c
@@ -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;
}
--
2.17.1
^ permalink raw reply [flat|nested] 19+ messages in thread* [PATCH v6 8/9] net/vmxnet3: set packet type for fragmented packet
2022-05-25 0:40 [PATCH v6 0/9] net/vmxnet3: support versions 5 and 6 Pankaj Gupta
` (6 preceding siblings ...)
2022-05-25 0:40 ` [PATCH v6 7/9] net/vmxnet3: advertise RETA size in device info Pankaj Gupta
@ 2022-05-25 0:40 ` Pankaj Gupta
2022-05-25 0:40 ` [PATCH v6 9/9] net/vmxnet3: fix merge error in Rx data ring initialization Pankaj Gupta
2022-05-31 13:40 ` [PATCH v6 0/9] net/vmxnet3: support versions 5 and 6 Andrew Rybchenko
9 siblings, 0 replies; 19+ messages in thread
From: Pankaj Gupta @ 2022-05-25 0:40 UTC (permalink / raw)
To: jbehrens; +Cc: dev, pagupta
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.
Signed-off-by: Pankaj Gupta <pagupta@vmware.com>
Reviewed-by: Jochen Behrens <jbehrens@vmware.com>
---
drivers/net/vmxnet3/vmxnet3_rxtx.c | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/drivers/net/vmxnet3/vmxnet3_rxtx.c b/drivers/net/vmxnet3/vmxnet3_rxtx.c
index c94e3762e6..a875ffec07 100644
--- a/drivers/net/vmxnet3/vmxnet3_rxtx.c
+++ b/drivers/net/vmxnet3/vmxnet3_rxtx.c
@@ -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;
--
2.17.1
^ permalink raw reply [flat|nested] 19+ messages in thread* [PATCH v6 9/9] net/vmxnet3: fix merge error in Rx data ring initialization
2022-05-25 0:40 [PATCH v6 0/9] net/vmxnet3: support versions 5 and 6 Pankaj Gupta
` (7 preceding siblings ...)
2022-05-25 0:40 ` [PATCH v6 8/9] net/vmxnet3: set packet type for fragmented packet Pankaj Gupta
@ 2022-05-25 0:40 ` Pankaj Gupta
2022-05-31 13:40 ` [PATCH v6 0/9] net/vmxnet3: support versions 5 and 6 Andrew Rybchenko
9 siblings, 0 replies; 19+ messages in thread
From: Pankaj Gupta @ 2022-05-25 0:40 UTC (permalink / raw)
To: jbehrens; +Cc: dev, pagupta, stable
Tested, using testpmd, for different hardware versions on ESXi 7.0
Update 2.
Fixes: 046f11619567 ("net/vmxnet3: support MSI-X interrupt")
Cc: stable@dpdk.org
Signed-off-by: Pankaj Gupta <pagupta@vmware.com>
Reviewed-by: Jochen Behrens <jbehrens@vmware.com>
---
drivers/net/vmxnet3/vmxnet3_ethdev.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c
index c9e352b73a..2af67dc0a3 100644
--- a/drivers/net/vmxnet3/vmxnet3_ethdev.c
+++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c
@@ -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
--
2.17.1
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PATCH v6 0/9] net/vmxnet3: support versions 5 and 6
2022-05-25 0:40 [PATCH v6 0/9] net/vmxnet3: support versions 5 and 6 Pankaj Gupta
` (8 preceding siblings ...)
2022-05-25 0:40 ` [PATCH v6 9/9] net/vmxnet3: fix merge error in Rx data ring initialization Pankaj Gupta
@ 2022-05-31 13:40 ` Andrew Rybchenko
2022-05-31 13:41 ` Andrew Rybchenko
9 siblings, 1 reply; 19+ messages in thread
From: Andrew Rybchenko @ 2022-05-31 13:40 UTC (permalink / raw)
To: Pankaj Gupta, jbehrens; +Cc: dev
On 5/25/22 03:40, Pankaj Gupta wrote:
> 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 andrew.rybchenko@oktetlabs.ru
>
> 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
>
> doc/guides/rel_notes/release_21_08.rst | 12 +
> 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 +++-
> 5 files changed, 400 insertions(+), 88 deletions(-)
>
Applied, thanks.
Please, double-check patches descriptor and release notes.
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PATCH v6 0/9] net/vmxnet3: support versions 5 and 6
2022-05-31 13:40 ` [PATCH v6 0/9] net/vmxnet3: support versions 5 and 6 Andrew Rybchenko
@ 2022-05-31 13:41 ` Andrew Rybchenko
0 siblings, 0 replies; 19+ messages in thread
From: Andrew Rybchenko @ 2022-05-31 13:41 UTC (permalink / raw)
To: Pankaj Gupta, jbehrens; +Cc: dev
On 5/31/22 16:40, Andrew Rybchenko wrote:
> On 5/25/22 03:40, Pankaj Gupta wrote:
>> 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
>> andrew.rybchenko@oktetlabs.ru
>>
>> 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
>>
>> doc/guides/rel_notes/release_21_08.rst | 12 +
>> 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 +++-
>> 5 files changed, 400 insertions(+), 88 deletions(-)
>>
>
> Applied, thanks.
To make it less ambiguous:
Applied to dpdk-next-net/main
>
> Please, double-check patches descriptor and release notes.
>
^ permalink raw reply [flat|nested] 19+ messages in thread