net/vmxnet3: support versions 5 and 6
Subsystems (2)
v6 cover net/vmxnet3: support versions 5 and 6
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
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(-)
Signature · 1 line
2.17.1
PATCH v6 1/9 net/vmxnet3: add version 5 support
Add VMXNET3 v5 support.
Tested, using testpmd, for different hardware versions on ESXi 7.0 Update 2.
--- 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(-)
doc/guides/rel_notes/release_21_08.rst +2 -0
@@ -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 -----------
drivers/net/vmxnet3/vmxnet3_ethdev.c +5 -2
@@ -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
@@ -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
PATCH v6 2/9 net/vmxnet3: implement RETA query and RETA update
In reply to Pankaj GuptaAdd RETA query and RETA update support for VMXNET3.
Tested, using testpmd, for different hardware versions on ESXi 7.0 Update 2.
--- doc/guides/rel_notes/release_21_08.rst | 2 + drivers/net/vmxnet3/vmxnet3_ethdev.c | 67 ++++++++++++++++++++++++++ 2 files changed, 69 insertions(+)
doc/guides/rel_notes/release_21_08.rst +2 -0
@@ -131,6 +131,8 @@ New Features * **Added vmxnet3 version 5 support.** +* **Added RETA query and RETA update support for vmxnet3.** + API Changes -----------
drivers/net/vmxnet3/vmxnet3_ethdev.c +67 -0
82 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH v6 3/9 net/vmxnet3: add Rx queue usage count utility
In reply to Pankaj GuptaCount 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
@@ -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
@@ -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
@@ -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
PATCH v6 4/9 net/vmxnet3: fix ethdev callbacks init order
In reply to Pankaj GuptaDriver 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
@@ -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.17.1
PATCH v6 5/9 net/vmxnet3: report HW version on FW version get
In reply to Pankaj GuptaSupport 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
@@ -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.17.1
PATCH v6 6/9 net/vmxnet3: add version 6 support
In reply to Pankaj GuptaVMXNET3 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.
--- 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(-)
doc/guides/rel_notes/release_21_08.rst +8 -0
@@ -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 -----------
drivers/net/vmxnet3/base/vmxnet3_defs.h +60 -13
109 lines not on this page · raw message
drivers/net/vmxnet3/vmxnet3_ethdev.c +159 -61
339 lines not on this page · raw message
drivers/net/vmxnet3/vmxnet3_ethdev.h +6 -4
@@ -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
@@ -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.17.1
Re: [PATCH v6 6/9] net/vmxnet3: add version 6 support
Hi, Pankaj,
Quoted 26 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
- Removes power-of-two limitations
- Extended interrupt structures, required implementation for additional number of queuesTested, using testpmd, for different hardware versions on ESXi 7.0 Update 2.
Signed-off-by Pankaj Gupta <[email protected]>Reviewed-by Jochen Behrens <[email protected]>--- 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(-)doc/guides/rel_notes/release_21_08.rst +0
-0@@ -133,6 +133,14 @@ New Features
doc/guides/rel_notes/release_21_08.rst New Features · line 143
Quoted 10 lines
doc/guides/rel_notes/release_21_08.rst +8
-0* **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.
Re: [PATCH v6 6/9] net/vmxnet3: add version 6 support
Hi Andrew,
Quoted 1 line
Quoted 1 line
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 <[email protected]>
Date: Wednesday, May 25, 2022 at 1:46 AM
To: Pankaj Gupta <[email protected]>, Jochen Behrens <[email protected]>
Cc: [email protected] <[email protected]>
Subject: Re: [PATCH v6 6/9] net/vmxnet3: add version 6 support ⚠ External Email
Hi, Pankaj,
Quoted 26 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
- Removes power-of-two limitations
- Extended interrupt structures, required implementation for additional number of queuesTested, using testpmd, for different hardware versions on ESXi 7.0 Update 2.
Signed-off-by Pankaj Gupta <[email protected]>Reviewed-by Jochen Behrens <[email protected]>--- 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(-)doc/guides/rel_notes/release_21_08.rst +0
-0@@ -133,6 +133,14 @@ New Features
doc/guides/rel_notes/release_21_08.rst New Features · line 143
Quoted 10 lines
doc/guides/rel_notes/release_21_08.rst +8
-0* **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.
Re: [PATCH v6 6/9] net/vmxnet3: add version 6 support
Hi Pankaj,
Quoted 10 lines · Pankaj Gupta
Hi Andrew,
Quoted 1 line
Quoted 1 line
Extended interrupt structures, required implementation for additional number of queues
It is about
Vmxnet3_IntrConfExt.
Vmxnet3_IntrConfExtis a control data structure shared with ESX.ESX introduced it for this version to increase the number of queues that can be used.
Vmxnet3_IntrConfwas used for older hardware versions
Thanks, I see.
Andrew.
Quoted 67 lines
Thanks,
Pankaj
*From: *Andrew Rybchenko <[email protected]>
*Date: *Wednesday, May 25, 2022 at 1:46 AM
*To: *Pankaj Gupta <[email protected]>, Jochen Behrens <[email protected]> *Cc: *[email protected] <[email protected]>
*Subject: *Re: [PATCH v6 6/9] net/vmxnet3: add version 6 support⚠External Email
Hi, Pankaj,
Quoted 26 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
- Removes power-of-two limitations
- Extended interrupt structures, required implementation for additional number of queuesTested, using testpmd, for different hardware versions on ESXi 7.0 Update 2.
Signed-off-by Pankaj Gupta <[email protected]>Reviewed-by Jochen Behrens <[email protected]>---
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(-)doc/guides/rel_notes/release_21_08.rst +0
-0@@ -133,6 +133,14 @@ New Featuresdoc/guides/rel_notes/release_21_08.rst New Features · line 143
Quoted 10 lines
doc/guides/rel_notes/release_21_08.rst +8
-0* **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.
PATCH v6 7/9 net/vmxnet3: advertise RETA size in device info
In reply to Pankaj GuptaCurrently 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
@@ -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.17.1
PATCH v6 8/9 net/vmxnet3: set packet type for fragmented packet
In reply to Pankaj GuptaThe 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
@@ -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
PATCH v6 9/9 net/vmxnet3: fix merge error in Rx data ring initialization
In reply to Pankaj GuptaTested, using testpmd, for different hardware versions 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
@@ -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.17.1
Andrew Rybchenko
AppliedQuoted 33 lines · 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 getv5:
UseRTE_MINinstead of defining MIN indrivers/net/vmxnet3/vmxnet3_ethdev.cUser RETA instead of reta in commit message
Fix the issue thrown bycheckpatches.shin filedrivers/net/vmxnet3/vmxnet3_ethdev.cv4:
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 patchesv2:
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 7 lines
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.
Quoted 42 lines · Andrew Rybchenko
Quoted 33 lines · 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 getv5:
UseRTE_MINinstead of defining MIN indrivers/net/vmxnet3/vmxnet3_ethdev.cUser RETA instead of reta in commit message
Fix the issue thrown bycheckpatches.shin filedrivers/net/vmxnet3/vmxnet3_ethdev.cv4:
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 patchesv2:
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 initializationQuoted 7 lines
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(-)
Quoted 1 line
Applied, thanks.
To make it less ambiguous:
Applied to dpdk-next-net/main
Quoted 3 lines
Please, double-check patches descriptor and release notes.