gve PMD enhancement
Subsystems (2)
cover gve PMD enhancement
This patch set includs three main enhancements for gve PMD:
- support basic data path for DQO queue format
- support jumbo frame for GQI queue format
- add new AdminQ cmd to verify driver compatibility
Junfeng Guo (8):
net/gve: add Rx queue setup for DQO
net/gve: support device start and close for DQO net/gve: support queue release and stop for DQO net/gve: support basic Tx data path for DQO net/gve: support basic Rx data path for DQO net/gve: support basic stats for DQO
net/gve: support jumbo frame for GQI
net/gve: add AdminQ command to verify driver compatibility
drivers/net/gve/base/gve_adminq.c | 29 ++- drivers/net/gve/base/gve_adminq.h | 48 +++++ drivers/net/gve/base/gve_osdep.h | 8 + drivers/net/gve/gve_ethdev.c | 184 +++++++++++++++- drivers/net/gve/gve_ethdev.h | 53 +++++ drivers/net/gve/gve_rx.c | 131 +++++++++--- drivers/net/gve/gve_rx_dqo.c | 343 ++++++++++++++++++++++++++++++ drivers/net/gve/gve_tx.c | 3 + drivers/net/gve/gve_tx_dqo.c | 202 ++++++++++++++++++ drivers/net/gve/meson.build | 1 + 10 files changed, 961 insertions(+), 41 deletions(-) create mode 100644 drivers/net/gve/gve_rx_dqo.c
Signature · 1 line
2.34.1
RFC 1/8 net/gve: add Rx queue setup for DQO
Add support for rx_queue_setup_dqo ops.
--- drivers/net/gve/gve_ethdev.c | 1 + drivers/net/gve/gve_ethdev.h | 14 ++++ drivers/net/gve/gve_rx_dqo.c | 148 +++++++++++++++++++++++++++++++++++ drivers/net/gve/meson.build | 1 + 4 files changed, 164 insertions(+) create mode 100644 drivers/net/gve/gve_rx_dqo.c
drivers/net/gve/gve_ethdev.c +1 -0
@@ -366,6 +366,7 @@ gve_eth_dev_ops_override(struct eth_dev_ops *local_eth_dev_ops) {/* override eth_dev ops for DQO */ local_eth_dev_ops->tx_queue_setup = gve_tx_queue_setup_dqo; + local_eth_dev_ops->rx_queue_setup = gve_rx_queue_setup_dqo; } static void
drivers/net/gve/gve_ethdev.h +14 -0
@@ -145,6 +145,7 @@ struct gve_rx_queue {uint16_t nb_rx_desc;uint16_t expected_seqno;/* the next expected seqno */ uint16_t free_thresh; +uint16_t nb_rx_hold;uint32_t next_avail;uint32_t nb_avail;
@@ -163,6 +164,14 @@ struct gve_rx_queue {uint16_t ntfy_id;uint16_t rx_buf_len; +/* newly added for DQO*/ +volatile struct gve_rx_desc_dqo *rx_ring; +struct gve_rx_compl_desc_dqo *compl_ring; +const struct rte_memzone *compl_ring_mz; +uint64_t compl_ring_phys_addr; +uint8_t cur_gen_bit; +uint16_t bufq_tail; +/* Only valid for DQO_RDA queue format */ struct gve_rx_queue *bufq;
@@ -334,6 +343,11 @@ gve_tx_burst(void *txq, struct rte_mbuf **tx_pkts, uint16_t nb_pkts);/* Below functions are used for DQO */ +int +gve_rx_queue_setup_dqo (struct rte_eth_dev *dev,uint16_t queue_id, +uint16_t nb_desc,unsigned int socket_id, +const struct rte_eth_rxconf *conf, +struct rte_mempool *pool); int gve_tx_queue_setup_dqo(struct rte_eth_dev *dev, uint16_t queue_id, uint16_t nb_desc, unsigned int socket_id,
drivers/net/gve/gve_rx_dqo.c new file +148 -0
148 lines not on this page · raw message
drivers/net/gve/meson.build +1 -0
@@ -11,6 +11,7 @@ sources = files( 'base/gve_adminq.c', 'gve_rx.c', 'gve_tx.c', + 'gve_rx_dqo.c', 'gve_tx_dqo.c', 'gve_ethdev.c', )
Signature · 1 line
2.34.1
RFC 2/8 net/gve: support device start and close for DQO
In reply to Junfeng GuoAdd device start and close support for DQO.
--- drivers/net/gve/base/gve_adminq.c | 10 +++---- drivers/net/gve/gve_ethdev.c | 43 ++++++++++++++++++++++++++++++- 2 files changed, 47 insertions(+), 6 deletions(-)
drivers/net/gve/base/gve_adminq.c +5 -5
@@ -497,11 +497,11 @@ static int gve_adminq_create_tx_queue(struct gve_priv *priv, u32 queue_index) cmd.create_tx_queue.queue_page_list_id =cpu_to_be32 (qpl_id); }else { cmd.create_tx_queue.tx_ring_size = -cpu_to_be16 (txq->nb_tx_desc); +cpu_to_be16 (priv->tx_desc_cnt); cmd.create_tx_queue.tx_comp_ring_addr = -cpu_to_be64 (txq->complq->tx_ring_phys_addr); +cpu_to_be64 (txq->compl_ring_phys_addr); cmd.create_tx_queue.tx_comp_ring_size = -cpu_to_be16 (priv->tx_compq_size); +cpu_to_be16 (priv->tx_compq_size *DQO_TX_MULTIPLIER ); }return gve_adminq_issue_cmd (priv, &cmd);
@@ -549,9 +549,9 @@ static int gve_adminq_create_rx_queue(struct gve_priv *priv, u32 queue_index) cmd.create_rx_queue.rx_ring_size =cpu_to_be16 (priv->rx_desc_cnt); cmd.create_rx_queue.rx_desc_ring_addr = -cpu_to_be64 (rxq->rx_ring_phys_addr); +cpu_to_be64 (rxq->compl_ring_phys_addr); cmd.create_rx_queue.rx_data_ring_addr = -cpu_to_be64 (rxq->bufq->rx_ring_phys_addr); +cpu_to_be64 (rxq->rx_ring_phys_addr); cmd.create_rx_queue.packet_buffer_size =cpu_to_be16 (rxq->rx_buf_len); cmd.create_rx_queue.rx_buff_ring_size =
drivers/net/gve/gve_ethdev.c +42 -1
61 lines not on this page · raw message
Signature · 1 line
2.34.1
RFC 3/8 net/gve: support queue release and stop for DQO
In reply to Junfeng GuoAdd support for queue operations:
- gve_tx_queue_release_dqo
- gve_rx_queue_release_dqo
- gve_stop_tx_queues_dqo
- gve_stop_rx_queues_dqo
--- drivers/net/gve/gve_ethdev.c | 18 +++++++++--- drivers/net/gve/gve_ethdev.h | 12 ++++++++ drivers/net/gve/gve_rx.c | 3 ++ drivers/net/gve/gve_rx_dqo.c | 57 ++++++++++++++++++++++++++++++++++++ drivers/net/gve/gve_tx.c | 3 ++ drivers/net/gve/gve_tx_dqo.c | 55 ++++++++++++++++++++++++++++++++++ 6 files changed, 144 insertions(+), 4 deletions(-)
drivers/net/gve/gve_ethdev.c +14 -4
@@ -292,11 +292,19 @@ gve_dev_close(struct rte_eth_dev *dev)PMD_DRV_LOG (ERR ,"Failed to stop dev." ); } -for (i =0 ; i < dev->data->nb_tx_queues; i++) -gve_tx_queue_release (dev, i); +if (gve_is_gqi (priv)) { +for (i =0 ; i < dev->data->nb_tx_queues; i++) +gve_tx_queue_release (dev, i); + +for (i =0 ; i < dev->data->nb_rx_queues; i++) +gve_rx_queue_release (dev, i); + }else { +for (i =0 ; i < dev->data->nb_tx_queues; i++) +gve_tx_queue_release_dqo (dev, i); -for (i =0 ; i < dev->data->nb_rx_queues; i++) -gve_rx_queue_release (dev, i); +for (i =0 ; i < dev->data->nb_rx_queues; i++) +gve_rx_queue_release_dqo (dev, i); + }gve_free_qpls (priv);rte_free (priv->adminq);
@@ -408,6 +416,8 @@ gve_eth_dev_ops_override(struct eth_dev_ops *local_eth_dev_ops)/* override eth_dev ops for DQO */ local_eth_dev_ops->tx_queue_setup = gve_tx_queue_setup_dqo; local_eth_dev_ops->rx_queue_setup = gve_rx_queue_setup_dqo; + local_eth_dev_ops->tx_queue_release = gve_tx_queue_release_dqo; + local_eth_dev_ops->rx_queue_release = gve_rx_queue_release_dqo; } static void
drivers/net/gve/gve_ethdev.h +12 -0
@@ -353,4 +353,16 @@ gve_tx_queue_setup_dqo(struct rte_eth_dev *dev, uint16_t queue_id, uint16_t nb_desc, unsigned int socket_id, const struct rte_eth_txconf *conf); +void +gve_tx_queue_release_dqo (struct rte_eth_dev *dev,uint16_t qid); + +void +gve_rx_queue_release_dqo (struct rte_eth_dev *dev,uint16_t qid); + +void +gve_stop_tx_queues_dqo (struct rte_eth_dev *dev); + +void +gve_stop_rx_queues_dqo (struct rte_eth_dev *dev); +#endif /* _GVE_ETHDEV_H_ */
drivers/net/gve/gve_rx.c +3 -0
@@ -343,6 +343,9 @@ gve_stop_rx_queues(struct rte_eth_dev *dev)uint16_t i;int err; +if (!gve_is_gqi (hw)) +return gve_stop_rx_queues_dqo (dev); + err =gve_adminq_destroy_rx_queues (hw, dev->data->nb_rx_queues);if (err !=0 )PMD_DRV_LOG (WARNING ,"failed to destroy rxqs" );
drivers/net/gve/gve_rx_dqo.c +57 -0
72 lines not on this page · raw message
drivers/net/gve/gve_tx.c +3 -0
@@ -658,6 +658,9 @@ gve_stop_tx_queues(struct rte_eth_dev *dev)uint16_t i;int err; +if (!gve_is_gqi (hw)) +return gve_stop_tx_queues_dqo (dev); + err =gve_adminq_destroy_tx_queues (hw, dev->data->nb_tx_queues);if (err !=0 )PMD_DRV_LOG (WARNING ,"failed to destroy txqs" );
drivers/net/gve/gve_tx_dqo.c +55 -0
70 lines not on this page · raw message
Signature · 1 line
2.34.1
RFC 4/8 net/gve: support basic Tx data path for DQO
In reply to Junfeng GuoAdd basic Tx data path support for DQO.
--- drivers/net/gve/gve_ethdev.c | 1 + drivers/net/gve/gve_ethdev.h | 4 + drivers/net/gve/gve_tx_dqo.c | 141 +++++++++++++++++++++++++++++++++++ 3 files changed, 146 insertions(+)
drivers/net/gve/gve_ethdev.c +1 -0
@@ -703,6 +703,7 @@ gve_dev_init(struct rte_eth_dev *eth_dev) }else {/* override Tx/Rx setup/release eth_dev ops */ gve_eth_dev_ops_override (&gve_local_eth_dev_ops); + eth_dev->tx_pkt_burst = gve_tx_burst_dqo; } eth_dev->dev_ops = &gve_local_eth_dev_ops;
drivers/net/gve/gve_ethdev.h +4 -0
@@ -125,6 +125,7 @@ struct gve_tx_queue {uint8_t cur_gen_bit;uint32_t last_desc_cleaned;void **txqs; +uint16_t re_cnt;/* Only valid for DQO_RDA queue format */ struct gve_tx_queue *complq;
@@ -365,4 +366,7 @@ gve_stop_tx_queues_dqo(struct rte_eth_dev *dev);void gve_stop_rx_queues_dqo (struct rte_eth_dev *dev); +uint16_t +gve_tx_burst_dqo (void *txq,struct rte_mbuf **tx_pkts,uint16_t nb_pkts); +#endif /* _GVE_ETHDEV_H_ */
drivers/net/gve/gve_tx_dqo.c +141 -0
147 lines not on this page · raw message
Signature · 1 line
2.34.1
RFC 5/8 net/gve: support basic Rx data path for DQO
In reply to Junfeng GuoAdd basic Rx data path support for DQO.
--- drivers/net/gve/gve_ethdev.c | 1 + drivers/net/gve/gve_ethdev.h | 3 + drivers/net/gve/gve_rx_dqo.c | 128 +++++++++++++++++++++++++++++++++++ 3 files changed, 132 insertions(+)
drivers/net/gve/gve_ethdev.c +1 -0
@@ -703,6 +703,7 @@ gve_dev_init(struct rte_eth_dev *eth_dev) }else {/* override Tx/Rx setup/release eth_dev ops */ gve_eth_dev_ops_override (&gve_local_eth_dev_ops); + eth_dev->rx_pkt_burst = gve_rx_burst_dqo; eth_dev->tx_pkt_burst = gve_tx_burst_dqo; }
drivers/net/gve/gve_ethdev.h +3 -0
@@ -366,6 +366,9 @@ gve_stop_tx_queues_dqo(struct rte_eth_dev *dev);void gve_stop_rx_queues_dqo (struct rte_eth_dev *dev); +uint16_t +gve_rx_burst_dqo (void *rxq,struct rte_mbuf **rx_pkts,uint16_t nb_pkts); +uint16_t gve_tx_burst_dqo (void *txq,struct rte_mbuf **tx_pkts,uint16_t nb_pkts);
drivers/net/gve/gve_rx_dqo.c +128 -0
134 lines not on this page · raw message
Signature · 1 line
2.34.1
RFC 6/8 net/gve: support basic stats for DQO
In reply to Junfeng GuoAdd basic stats support for DQO.
--- drivers/net/gve/gve_ethdev.c | 60 ++++++++++++++++++++++++++++++++++++ drivers/net/gve/gve_ethdev.h | 11 +++++++ drivers/net/gve/gve_rx_dqo.c | 12 +++++++- drivers/net/gve/gve_tx_dqo.c | 6 ++++ 4 files changed, 88 insertions(+), 1 deletion(-)
drivers/net/gve/gve_ethdev.c +60 -0
@@ -369,6 +369,64 @@ gve_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)return 0 ; } +static int +gve_dev_stats_get (struct rte_eth_dev *dev,struct rte_eth_stats *stats) +{ +uint16_t i; + +for (i =0 ; i < dev->data->nb_tx_queues; i++) { +struct gve_tx_queue *txq = dev->data->tx_queues[i]; +if (txq ==NULL ) +continue ; + + stats->opackets += txq->packets; + stats->obytes += txq->bytes; + stats->oerrors += txq->errors; + } + +for (i =0 ; i < dev->data->nb_rx_queues; i++) { +struct gve_rx_queue *rxq = dev->data->rx_queues[i]; +if (rxq ==NULL ) +continue ; + + stats->ipackets += rxq->packets; + stats->ibytes += rxq->bytes; + stats->ierrors += rxq->errors; + stats->rx_nombuf += rxq->no_mbufs; + } + +return 0 ; +} + +static int +gve_dev_stats_reset (struct rte_eth_dev *dev) +{ +uint16_t i; + +for (i =0 ; i < dev->data->nb_tx_queues; i++) { +struct gve_tx_queue *txq = dev->data->tx_queues[i]; +if (txq ==NULL ) +continue ; + + txq->packets =0 ; + txq->bytes =0 ; + txq->errors =0 ; + } + +for (i =0 ; i < dev->data->nb_rx_queues; i++) { +struct gve_rx_queue *rxq = dev->data->rx_queues[i]; +if (rxq ==NULL ) +continue ; + + rxq->packets =0 ; + rxq->bytes =0 ; + rxq->errors =0 ; + rxq->no_mbufs =0 ; + } + +return 0 ; +} +static int gve_dev_mtu_set (struct rte_eth_dev *dev,uint16_t mtu) {
@@ -407,6 +465,8 @@ static const struct eth_dev_ops gve_eth_dev_ops = { .rx_queue_release = gve_rx_queue_release, .tx_queue_release = gve_tx_queue_release, .link_update = gve_link_update, + .stats_get = gve_dev_stats_get, + .stats_reset = gve_dev_stats_reset, .mtu_set = gve_dev_mtu_set, };
drivers/net/gve/gve_ethdev.h +11 -0
@@ -105,6 +105,11 @@ struct gve_tx_queue {struct gve_queue_page_list *qpl;struct gve_tx_iovec *iov_ring; +/* stats items */ +uint64_t packets; +uint64_t bytes; +uint64_t errors; +uint16_t port_id;uint16_t queue_id;
@@ -156,6 +161,12 @@ struct gve_rx_queue {/* only valid for GQI_QPL queue format */ struct gve_queue_page_list *qpl; +/* stats items */ +uint64_t packets; +uint64_t bytes; +uint64_t errors; +uint64_t no_mbufs; +struct gve_priv *hw;const struct rte_memzone *qres_mz;struct gve_queue_resources *qres;
drivers/net/gve/gve_rx_dqo.c +11 -1
@@ -37,6 +37,7 @@ gve_rx_refill_dqo(struct gve_rx_queue *rxq) next_avail =0 ; rxq->nb_rx_hold -= delta; }else { + rxq->no_mbufs += nb_desc - next_avail; dev = &rte_eth_devices[rxq->port_id]; dev->data->rx_mbuf_alloc_failed += nb_desc - next_avail; PMD_DRV_LOG(DEBUG, "RX mbuf alloc failed port_id=%u queue_id=%u",
@@ -57,6 +58,7 @@ gve_rx_refill_dqo(struct gve_rx_queue *rxq) next_avail += nb_refill; rxq->nb_rx_hold -= nb_refill; }else { + rxq->no_mbufs += nb_desc - next_avail; dev = &rte_eth_devices[rxq->port_id]; dev->data->rx_mbuf_alloc_failed += nb_desc - next_avail; PMD_DRV_LOG(DEBUG, "RX mbuf alloc failed port_id=%u queue_id=%u",
@@ -80,7 +82,9 @@ gve_rx_burst_dqo(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)uint16_t pkt_len;uint16_t rx_id;uint16_t nb_rx; +uint64_t bytes; + bytes =0 ; nb_rx =0 ; rxq = rx_queue; rx_id = rxq->rx_tail;
@@ -94,8 +98,10 @@ gve_rx_burst_dqo(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)if (rx_desc->generation != rxq->cur_gen_bit)break ; -if (unlikely (rx_desc->rx_error)) +if (unlikely (rx_desc->rx_error)) { + rxq->errors++;continue ; + } pkt_len = rx_desc->packet_len;
@@ -120,6 +126,7 @@ gve_rx_burst_dqo(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts) rxm->hash.rss =rte_be_to_cpu_32 (rx_desc->hash); rx_pkts[nb_rx++] = rxm; + bytes += pkt_len; }if (nb_rx >0 ) {
@@ -128,6 +135,9 @@ gve_rx_burst_dqo(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts) rxq->next_avail = rx_id_bufq;gve_rx_refill_dqo (rxq); + + rxq->packets += nb_rx; + rxq->bytes += bytes; }return nb_rx;
drivers/net/gve/gve_tx_dqo.c +6 -0
@@ -80,10 +80,12 @@ gve_tx_burst_dqo(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)uint16_t nb_used;uint16_t tx_id;uint16_t sw_id; +uint64_t bytes; sw_ring = txq->sw_ring; txr = txq->tx_ring; + bytes =0 ; mask = txq->nb_tx_desc -1 ; sw_mask = txq->sw_size -1 ; tx_id = txq->tx_tail;
@@ -118,6 +120,7 @@ gve_tx_burst_dqo(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) tx_id = (tx_id +1 ) & mask; sw_id = (sw_id +1 ) & sw_mask; + bytes += tx_pkt->pkt_len; tx_pkt = tx_pkt->next; }while (tx_pkt);
@@ -141,6 +144,9 @@ gve_tx_burst_dqo(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)rte_write32 (tx_id, txq->qtx_tail); txq->tx_tail = tx_id; txq->sw_tail = sw_id; + + txq->packets += nb_tx; + txq->bytes += bytes; }return nb_tx;
Signature · 1 line
2.34.1
RFC 7/8 net/gve: support jumbo frame for GQI
In reply to Junfeng GuoAdd multi-segment support to enable GQI Rx Jumbo Frame.
--- drivers/net/gve/gve_ethdev.h | 8 +++ drivers/net/gve/gve_rx.c | 128 ++++++++++++++++++++++++++--------- 2 files changed, 105 insertions(+), 31 deletions(-)
drivers/net/gve/gve_ethdev.h +8 -0
@@ -138,6 +138,13 @@ struct gve_tx_queue {uint8_t is_gqi_qpl; }; +struct gve_rx_ctx { +struct rte_mbuf *mbuf_head; +struct rte_mbuf *mbuf_tail; +uint16_t total_frags; +bool drop_pkt; +}; +struct gve_rx_queue {volatile struct gve_rx_desc *rx_desc_ring;volatile union gve_rx_data_slot *rx_data_ring;
@@ -146,6 +153,7 @@ struct gve_rx_queue {uint64_t rx_ring_phys_addr;struct rte_mbuf **sw_ring;struct rte_mempool *mpool; +struct gve_rx_ctx ctx;uint16_t rx_tail;uint16_t nb_rx_desc;
drivers/net/gve/gve_rx.c +97 -31
161 lines not on this page · raw message
Signature · 1 line
2.34.1
RFC 8/8 net/gve: add AdminQ command to verify driver compatibility
In reply to Junfeng GuoCheck whether the driver is compatible with the device presented.
--- drivers/net/gve/base/gve_adminq.c | 19 ++++++++++ drivers/net/gve/base/gve_adminq.h | 48 +++++++++++++++++++++++++ drivers/net/gve/base/gve_osdep.h | 8 +++++ drivers/net/gve/gve_ethdev.c | 60 +++++++++++++++++++++++++++++++ drivers/net/gve/gve_ethdev.h | 1 + 5 files changed, 136 insertions(+)
drivers/net/gve/base/gve_adminq.c +19 -0
@@ -401,6 +401,9 @@ static int gve_adminq_issue_cmd(struct gve_priv *priv,case GVE_ADMINQ_GET_PTYPE_MAP : priv->adminq_get_ptype_map_cnt++;break ; +case GVE_ADMINQ_VERIFY_DRIVER_COMPATIBILITY : + priv->adminq_verify_driver_compatibility_cnt++; +break ;default :PMD_DRV_LOG (ERR ,"unknown AQ command opcode %d" , opcode); }
@@ -859,6 +862,22 @@ int gve_adminq_report_stats(struct gve_priv *priv, u64 stats_report_len,return gve_adminq_execute_cmd (priv, &cmd); } +int gve_adminq_verify_driver_compatibility (struct gve_priv *priv, +u64 driver_info_len, +dma_addr_t driver_info_addr) +{ +union gve_adminq_command cmd; + +memset (&cmd,0 ,sizeof (cmd)); + cmd.opcode =cpu_to_be32 (GVE_ADMINQ_VERIFY_DRIVER_COMPATIBILITY ); + cmd.verify_driver_compatibility = (struct gve_adminq_verify_driver_compatibility ) { + .driver_info_len =cpu_to_be64 (driver_info_len), + .driver_info_addr =cpu_to_be64 (driver_info_addr), + }; + +return gve_adminq_execute_cmd (priv, &cmd); +} +int gve_adminq_report_link_speed (struct gve_priv *priv) {struct gve_dma_mem link_speed_region_dma_mem;
drivers/net/gve/base/gve_adminq.h +48 -0
71 lines not on this page · raw message
drivers/net/gve/base/gve_osdep.h +8 -0
@@ -21,6 +21,9 @@#include <rte_malloc.h> #include <rte_memcpy.h> #include <rte_memzone.h> +#include <rte_version.h> +#include <linux/version.h> +#include <sys/utsname.h> #include "../gve_logs.h"
@@ -82,6 +85,11 @@ typedef rte_iova_t dma_addr_t; { gve_static_assert_##X = (n) / ((sizeof(struct X) == (n)) ? 1 : 0) }#define GVE_CHECK_UNION_LEN (n,X ) enum gve_static_asset_enum_##X \ { gve_static_assert_##X = (n) / ((sizeof(union X) == (n)) ? 1 : 0) } +#ifndef LINUX_VERSION_MAJOR +#define LINUX_VERSION_MAJOR (((LINUX_VERSION_CODE) >> 16) & 0xff) +#define LINUX_VERSION_SUBLEVEL (((LINUX_VERSION_CODE) >> 8) & 0xff) +#define LINUX_VERSION_PATCHLEVEL ((LINUX_VERSION_CODE) & 0xff) +#endif static __rte_always_inline u8readb (volatile void *addr)
drivers/net/gve/gve_ethdev.c +60 -0
72 lines not on this page · raw message
drivers/net/gve/gve_ethdev.h +1 -0
@@ -250,6 +250,7 @@ struct gve_priv {uint32_t adminq_report_stats_cnt;uint32_t adminq_report_link_speed_cnt;uint32_t adminq_get_ptype_map_cnt; +uint32_t adminq_verify_driver_compatibility_cnt;volatile uint32_t state_flags;
Signature · 1 line
2.34.1
Where is tx queue setup?
And I believe that's also why patchwork is complaining code can't be applied.
Quoted 41 lines
-----Original Message-----
From: Guo, Junfeng <[email protected]>
Sent: Wednesday, January 18, 2023 2:54 AM
To: Zhang, Qi Z <[email protected]>; Wu, Jingjing <[email protected]>; [email protected]; Xing, Beilei <[email protected]>
Cc: [email protected]; Li, Xiaoyun <[email protected]>; Zhang, Helin <[email protected]>; Guo, Junfeng <[email protected]>
Subject: [RFC 0/8] gve PMD enhancementThis patch set includs three main enhancements for gve PMD:
- support basic data path for DQO queue format
- support jumbo frame for GQI queue format
- add new AdminQ cmd to verify driver compatibilityJunfeng Guo (8):
net/gve: add Rx queue setup for DQO
net/gve: support device start and close for DQO net/gve: support queue release and stop for DQO net/gve: support basic Tx data path for DQO net/gve: support basic Rx data path for DQO net/gve: support basic stats for DQO
net/gve: support jumbo frame for GQI
net/gve: add AdminQ command to verify driver compatibilitydrivers/net/gve/base/gve_adminq.c | 29 ++- drivers/net/gve/base/gve_adminq.h | 48 +++++ drivers/net/gve/base/gve_osdep.h | 8 + drivers/net/gve/gve_ethdev.c | 184 +++++++++++++++- drivers/net/gve/gve_ethdev.h | 53 +++++ drivers/net/gve/gve_rx.c | 131 +++++++++--- drivers/net/gve/gve_rx_dqo.c | 343 ++++++++++++++++++++++++++++++ drivers/net/gve/gve_tx.c | 3 + drivers/net/gve/gve_tx_dqo.c | 202 ++++++++++++++++++ drivers/net/gve/meson.build | 1 + 10 files changed, 961 insertions(+), 41 deletions(-) create mode 100644
drivers/net/gve/gve_rx_dqo.c--
2.34.1
v2 cover gve PMD enhancement
In reply to Junfeng GuoThis patch set includs three main enhancements for gve PMD:
- support basic data path for DQO queue format
- support jumbo frame for GQI queue format
- add new AdminQ cmd to verify driver compatibility
v2:
- add one missing commit into this patch set.
- add new contributors into the mailmap.
Junfeng Guo (9):
net/gve: add Tx queue setup for DQO
net/gve: add Rx queue setup for DQO
net/gve: support device start and close for DQO net/gve: support queue release and stop for DQO net/gve: support basic Tx data path for DQO net/gve: support basic Rx data path for DQO net/gve: support basic stats for DQO
net/gve: support jumbo frame for GQI
net/gve: add AdminQ command to verify driver compatibility
.mailmap | 3 + MAINTAINERS | 3 + drivers/net/gve/base/gve.h | 1 + drivers/net/gve/base/gve_adminq.c | 29 ++- drivers/net/gve/base/gve_adminq.h | 48 ++++ drivers/net/gve/base/gve_desc_dqo.h | 4 - drivers/net/gve/base/gve_osdep.h | 12 + drivers/net/gve/gve_ethdev.c | 200 ++++++++++++++- drivers/net/gve/gve_ethdev.h | 86 ++++++- drivers/net/gve/gve_rx.c | 131 +++++++--- drivers/net/gve/gve_rx_dqo.c | 343 +++++++++++++++++++++++++ drivers/net/gve/gve_tx.c | 3 + drivers/net/gve/gve_tx_dqo.c | 380 ++++++++++++++++++++++++++++ drivers/net/gve/meson.build | 2 + 14 files changed, 1196 insertions(+), 49 deletions(-) create mode 100644 drivers/net/gve/gve_rx_dqo.c create mode 100644 drivers/net/gve/gve_tx_dqo.c
Signature · 1 line
2.34.1
RFC v2 1/9 net/gve: add Tx queue setup for DQO
Add support for tx_queue_setup_dqo ops.
DQO format has submission and completion queue pair for each Tx/Rx queue. Note that with DQO format all descriptors and doorbells, as well as counters are written in little-endian.
--- .mailmap | 3 + MAINTAINERS | 3 + drivers/net/gve/base/gve.h | 1 + drivers/net/gve/base/gve_desc_dqo.h | 4 - drivers/net/gve/base/gve_osdep.h | 4 + drivers/net/gve/gve_ethdev.c | 16 ++- drivers/net/gve/gve_ethdev.h | 33 +++++- drivers/net/gve/gve_tx_dqo.c | 178 ++++++++++++++++++++++++++++ drivers/net/gve/meson.build | 1 + 9 files changed, 235 insertions(+), 8 deletions(-) create mode 100644 drivers/net/gve/gve_tx_dqo.c
.mailmap +3 -0
@@ -578,6 +578,7 @@ Jens Freimann <[email protected]> <[email protected]> Jeremy Plsek <[email protected]> Jeremy Spewock <[email protected]> Jerin Jacob <[email protected]> <[email protected]> <[email protected]> +Jeroen de Borst <[email protected]> Jerome Jutteau <[email protected]> Jerry Hao OS <[email protected]> Jerry Lilijun <[email protected]>
@@ -642,6 +643,7 @@ Jonathan Erb <[email protected]> Jon DeVree <[email protected]> Jon Loeliger <[email protected]> Joongi Kim <[email protected]> +Jordan Kimbrough <[email protected]> Jørgen Østergaard Sloth <[email protected]> Jörg Thalheim <[email protected]> Joseph Richard <[email protected]>
@@ -1145,6 +1147,7 @@ Roy Franz <[email protected]> Roy Pledge <[email protected]> Roy Shterman <[email protected]> Ruifeng Wang <[email protected]> +Rushil Gupta <[email protected]> Ryan E Hall <[email protected]> Sabyasachi Sengupta <[email protected]> Sachin Saxena <[email protected]> <[email protected]>
MAINTAINERS +3 -0
@@ -703,6 +703,9 @@ F: doc/guides/nics/features/enic.ini Google Virtual Ethernet M: Junfeng Guo <[email protected]> +M: Jeroen de Borst <[email protected]> +M: Rushil Gupta <[email protected]> +M: Jordan Kimbrough <[email protected]> F: drivers/net/gve/ F: doc/guides/nics/gve.rst F: doc/guides/nics/features/gve.ini
drivers/net/gve/base/gve.h +1 -0
@@ -7,6 +7,7 @@#define _GVE_H_#include "gve_desc.h" +#include "gve_desc_dqo.h" #define GVE_VERSION "1.3.0"#define GVE_VERSION_PREFIX "GVE-"
drivers/net/gve/base/gve_desc_dqo.h +0 -4
@@ -13,10 +13,6 @@#define GVE_TX_MAX_HDR_SIZE_DQO 255#define GVE_TX_MIN_TSO_MSS_DQO 88 -#ifndef __LITTLE_ENDIAN_BITFIELD -#error "Only little endian supported" -#endif -/* Basic TX descriptor (DTYPE 0x0C) */ struct gve_tx_pkt_desc_dqo {__le64 buf_addr;
drivers/net/gve/base/gve_osdep.h +4 -0
@@ -35,6 +35,10 @@ typedef rte_be16_t __be16;typedef rte_be32_t __be32 ;typedef rte_be64_t __be64 ; +typedef rte_le16_t __le16 ; +typedef rte_le32_t __le32 ; +typedef rte_le64_t __le64 ; +typedef rte_iova_t dma_addr_t ;#define ETH_MIN_MTU RTE_ETHER_MIN_MTU
drivers/net/gve/gve_ethdev.c +13 -3
@@ -299,6 +299,7 @@ gve_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) dev_info->default_txconf = (struct rte_eth_txconf ) { .tx_free_thresh =GVE_DEFAULT_TX_FREE_THRESH , + .tx_rs_thresh =GVE_DEFAULT_TX_RS_THRESH , .offloads =0 , };
@@ -360,6 +361,13 @@ static const struct eth_dev_ops gve_eth_dev_ops = { .mtu_set = gve_dev_mtu_set, }; +static void +gve_eth_dev_ops_override (struct eth_dev_ops *local_eth_dev_ops) +{ +/* override eth_dev ops for DQO */ + local_eth_dev_ops->tx_queue_setup = gve_tx_queue_setup_dqo; +} +static void gve_free_counter_array (struct gve_priv *priv) {
@@ -595,6 +603,7 @@ gve_teardown_priv_resources(struct gve_priv *priv)static int gve_dev_init (struct rte_eth_dev *eth_dev) { +static struct eth_dev_ops gve_local_eth_dev_ops = gve_eth_dev_ops;struct gve_priv *priv = eth_dev->data->dev_private;int max_tx_queues, max_rx_queues;struct rte_pci_device *pci_dev;
@@ -602,8 +611,6 @@ gve_dev_init(struct rte_eth_dev *eth_dev)rte_be32_t *db_bar;int err; - eth_dev->dev_ops = &gve_eth_dev_ops; -if (rte_eal_process_type () !=RTE_PROC_PRIMARY )return 0 ;
@@ -642,9 +649,12 @@ gve_dev_init(struct rte_eth_dev *eth_dev) eth_dev->rx_pkt_burst = gve_rx_burst; eth_dev->tx_pkt_burst = gve_tx_burst; }else { -PMD_DRV_LOG (ERR ,"DQO_RDA is not implemented and will be added in the future" ); +/* override Tx/Rx setup/release eth_dev ops */ +gve_eth_dev_ops_override (&gve_local_eth_dev_ops); } + eth_dev->dev_ops = &gve_local_eth_dev_ops; + eth_dev->data->mac_addrs = &priv->dev_addr;return 0 ;
drivers/net/gve/gve_ethdev.h +32 -1
@@ -11,6 +11,9 @@#include "base/gve.h" +/* TODO: this is a workaround to ensure that Tx complq is enough */ +#define DQO_TX_MULTIPLIER 4 +/* * Following macros are derived from linux/pci_regs.h, however, * we can't simply include that header here, as there is no such
@@ -25,7 +28,8 @@#define PCI_MSIX_FLAGS_QSIZE 0x07FF/* Table size */ #define GVE_DEFAULT_RX_FREE_THRESH 512 -#define GVE_DEFAULT_TX_FREE_THRESH 256 +#define GVE_DEFAULT_TX_FREE_THRESH 32 +#define GVE_DEFAULT_TX_RS_THRESH 32#define GVE_TX_MAX_FREE_SZ 512#define GVE_MIN_BUF_SIZE 1024
@@ -50,6 +54,13 @@ union gve_tx_desc {struct gve_tx_seg_desc seg;/* subsequent descs for a packet */ }; +/* Tx desc for DQO format */ +union gve_tx_desc_dqo { +struct gve_tx_pkt_desc_dqo pkt; +struct gve_tx_tso_context_desc_dqo tso_ctx; +struct gve_tx_general_context_desc_dqo general_ctx; +}; +/* Offload features */ union gve_tx_offload {uint64_t data;
@@ -78,8 +89,10 @@ struct gve_tx_queue {uint32_t tx_tail;uint16_t nb_tx_desc;uint16_t nb_free; +uint16_t nb_used;uint32_t next_to_clean;uint16_t free_thresh; +uint16_t rs_thresh;/* Only valid for DQO_QPL queue format */ uint16_t sw_tail;
@@ -102,6 +115,17 @@ struct gve_tx_queue {const struct rte_memzone *qres_mz;struct gve_queue_resources *qres; +/* newly added for DQO*/ +volatile union gve_tx_desc_dqo *tx_ring; +struct gve_tx_compl_desc *compl_ring; +const struct rte_memzone *compl_ring_mz; +uint64_t compl_ring_phys_addr; +uint32_t complq_tail; +uint16_t sw_size; +uint8_t cur_gen_bit; +uint32_t last_desc_cleaned; +void **txqs; +/* Only valid for DQO_RDA queue format */ struct gve_tx_queue *complq;
@@ -308,4 +332,11 @@ gve_rx_burst(void *rxq, struct rte_mbuf **rx_pkts, uint16_t nb_pkts);uint16_t gve_tx_burst (void *txq,struct rte_mbuf **tx_pkts,uint16_t nb_pkts); +/* Below functions are used for DQO */ + +int +gve_tx_queue_setup_dqo (struct rte_eth_dev *dev,uint16_t queue_id, +uint16_t nb_desc,unsigned int socket_id, +const struct rte_eth_txconf *conf); +#endif /* _GVE_ETHDEV_H_ */
drivers/net/gve/gve_tx_dqo.c new file +178 -0
178 lines not on this page · raw message
drivers/net/gve/meson.build +1 -0
@@ -11,6 +11,7 @@ sources = files( 'base/gve_adminq.c', 'gve_rx.c', 'gve_tx.c', + 'gve_tx_dqo.c', 'gve_ethdev.c', ) includes += include_directories('base')
Signature · 1 line
2.34.1
RFC v2 2/9 net/gve: add Rx queue setup for DQO
In reply to Junfeng GuoAdd support for rx_queue_setup_dqo ops.
--- drivers/net/gve/gve_ethdev.c | 1 + drivers/net/gve/gve_ethdev.h | 14 ++++ drivers/net/gve/gve_rx_dqo.c | 148 +++++++++++++++++++++++++++++++++++ drivers/net/gve/meson.build | 1 + 4 files changed, 164 insertions(+) create mode 100644 drivers/net/gve/gve_rx_dqo.c
drivers/net/gve/gve_ethdev.c +1 -0
@@ -366,6 +366,7 @@ gve_eth_dev_ops_override(struct eth_dev_ops *local_eth_dev_ops) {/* override eth_dev ops for DQO */ local_eth_dev_ops->tx_queue_setup = gve_tx_queue_setup_dqo; + local_eth_dev_ops->rx_queue_setup = gve_rx_queue_setup_dqo; } static void
drivers/net/gve/gve_ethdev.h +14 -0
@@ -145,6 +145,7 @@ struct gve_rx_queue {uint16_t nb_rx_desc;uint16_t expected_seqno;/* the next expected seqno */ uint16_t free_thresh; +uint16_t nb_rx_hold;uint32_t next_avail;uint32_t nb_avail;
@@ -163,6 +164,14 @@ struct gve_rx_queue {uint16_t ntfy_id;uint16_t rx_buf_len; +/* newly added for DQO*/ +volatile struct gve_rx_desc_dqo *rx_ring; +struct gve_rx_compl_desc_dqo *compl_ring; +const struct rte_memzone *compl_ring_mz; +uint64_t compl_ring_phys_addr; +uint8_t cur_gen_bit; +uint16_t bufq_tail; +/* Only valid for DQO_RDA queue format */ struct gve_rx_queue *bufq;
@@ -334,6 +343,11 @@ gve_tx_burst(void *txq, struct rte_mbuf **tx_pkts, uint16_t nb_pkts);/* Below functions are used for DQO */ +int +gve_rx_queue_setup_dqo (struct rte_eth_dev *dev,uint16_t queue_id, +uint16_t nb_desc,unsigned int socket_id, +const struct rte_eth_rxconf *conf, +struct rte_mempool *pool); int gve_tx_queue_setup_dqo(struct rte_eth_dev *dev, uint16_t queue_id, uint16_t nb_desc, unsigned int socket_id,
drivers/net/gve/gve_rx_dqo.c new file +148 -0
148 lines not on this page · raw message
drivers/net/gve/meson.build +1 -0
@@ -11,6 +11,7 @@ sources = files( 'base/gve_adminq.c', 'gve_rx.c', 'gve_tx.c', + 'gve_rx_dqo.c', 'gve_tx_dqo.c', 'gve_ethdev.c', )
Signature · 1 line
2.34.1
RFC v2 3/9 net/gve: support device start and close for DQO
In reply to Junfeng GuoAdd device start and close support for DQO.
--- drivers/net/gve/base/gve_adminq.c | 10 +++---- drivers/net/gve/gve_ethdev.c | 43 ++++++++++++++++++++++++++++++- 2 files changed, 47 insertions(+), 6 deletions(-)
drivers/net/gve/base/gve_adminq.c +5 -5
@@ -497,11 +497,11 @@ static int gve_adminq_create_tx_queue(struct gve_priv *priv, u32 queue_index) cmd.create_tx_queue.queue_page_list_id =cpu_to_be32 (qpl_id); }else { cmd.create_tx_queue.tx_ring_size = -cpu_to_be16 (txq->nb_tx_desc); +cpu_to_be16 (priv->tx_desc_cnt); cmd.create_tx_queue.tx_comp_ring_addr = -cpu_to_be64 (txq->complq->tx_ring_phys_addr); +cpu_to_be64 (txq->compl_ring_phys_addr); cmd.create_tx_queue.tx_comp_ring_size = -cpu_to_be16 (priv->tx_compq_size); +cpu_to_be16 (priv->tx_compq_size *DQO_TX_MULTIPLIER ); }return gve_adminq_issue_cmd (priv, &cmd);
@@ -549,9 +549,9 @@ static int gve_adminq_create_rx_queue(struct gve_priv *priv, u32 queue_index) cmd.create_rx_queue.rx_ring_size =cpu_to_be16 (priv->rx_desc_cnt); cmd.create_rx_queue.rx_desc_ring_addr = -cpu_to_be64 (rxq->rx_ring_phys_addr); +cpu_to_be64 (rxq->compl_ring_phys_addr); cmd.create_rx_queue.rx_data_ring_addr = -cpu_to_be64 (rxq->bufq->rx_ring_phys_addr); +cpu_to_be64 (rxq->rx_ring_phys_addr); cmd.create_rx_queue.packet_buffer_size =cpu_to_be16 (rxq->rx_buf_len); cmd.create_rx_queue.rx_buff_ring_size =
drivers/net/gve/gve_ethdev.c +42 -1
61 lines not on this page · raw message
Signature · 1 line
2.34.1
RFC v2 4/9 net/gve: support queue release and stop for DQO
In reply to Junfeng GuoAdd support for queue operations:
- gve_tx_queue_release_dqo
- gve_rx_queue_release_dqo
- gve_stop_tx_queues_dqo
- gve_stop_rx_queues_dqo
--- drivers/net/gve/gve_ethdev.c | 18 +++++++++--- drivers/net/gve/gve_ethdev.h | 12 ++++++++ drivers/net/gve/gve_rx.c | 3 ++ drivers/net/gve/gve_rx_dqo.c | 57 ++++++++++++++++++++++++++++++++++++ drivers/net/gve/gve_tx.c | 3 ++ drivers/net/gve/gve_tx_dqo.c | 55 ++++++++++++++++++++++++++++++++++ 6 files changed, 144 insertions(+), 4 deletions(-)
drivers/net/gve/gve_ethdev.c +14 -4
@@ -292,11 +292,19 @@ gve_dev_close(struct rte_eth_dev *dev)PMD_DRV_LOG (ERR ,"Failed to stop dev." ); } -for (i =0 ; i < dev->data->nb_tx_queues; i++) -gve_tx_queue_release (dev, i); +if (gve_is_gqi (priv)) { +for (i =0 ; i < dev->data->nb_tx_queues; i++) +gve_tx_queue_release (dev, i); + +for (i =0 ; i < dev->data->nb_rx_queues; i++) +gve_rx_queue_release (dev, i); + }else { +for (i =0 ; i < dev->data->nb_tx_queues; i++) +gve_tx_queue_release_dqo (dev, i); -for (i =0 ; i < dev->data->nb_rx_queues; i++) -gve_rx_queue_release (dev, i); +for (i =0 ; i < dev->data->nb_rx_queues; i++) +gve_rx_queue_release_dqo (dev, i); + }gve_free_qpls (priv);rte_free (priv->adminq);
@@ -408,6 +416,8 @@ gve_eth_dev_ops_override(struct eth_dev_ops *local_eth_dev_ops)/* override eth_dev ops for DQO */ local_eth_dev_ops->tx_queue_setup = gve_tx_queue_setup_dqo; local_eth_dev_ops->rx_queue_setup = gve_rx_queue_setup_dqo; + local_eth_dev_ops->tx_queue_release = gve_tx_queue_release_dqo; + local_eth_dev_ops->rx_queue_release = gve_rx_queue_release_dqo; } static void
drivers/net/gve/gve_ethdev.h +12 -0
@@ -353,4 +353,16 @@ gve_tx_queue_setup_dqo(struct rte_eth_dev *dev, uint16_t queue_id, uint16_t nb_desc, unsigned int socket_id, const struct rte_eth_txconf *conf); +void +gve_tx_queue_release_dqo (struct rte_eth_dev *dev,uint16_t qid); + +void +gve_rx_queue_release_dqo (struct rte_eth_dev *dev,uint16_t qid); + +void +gve_stop_tx_queues_dqo (struct rte_eth_dev *dev); + +void +gve_stop_rx_queues_dqo (struct rte_eth_dev *dev); +#endif /* _GVE_ETHDEV_H_ */
drivers/net/gve/gve_rx.c +3 -0
@@ -343,6 +343,9 @@ gve_stop_rx_queues(struct rte_eth_dev *dev)uint16_t i;int err; +if (!gve_is_gqi (hw)) +return gve_stop_rx_queues_dqo (dev); + err =gve_adminq_destroy_rx_queues (hw, dev->data->nb_rx_queues);if (err !=0 )PMD_DRV_LOG (WARNING ,"failed to destroy rxqs" );
drivers/net/gve/gve_rx_dqo.c +57 -0
72 lines not on this page · raw message
drivers/net/gve/gve_tx.c +3 -0
@@ -658,6 +658,9 @@ gve_stop_tx_queues(struct rte_eth_dev *dev)uint16_t i;int err; +if (!gve_is_gqi (hw)) +return gve_stop_tx_queues_dqo (dev); + err =gve_adminq_destroy_tx_queues (hw, dev->data->nb_tx_queues);if (err !=0 )PMD_DRV_LOG (WARNING ,"failed to destroy txqs" );
drivers/net/gve/gve_tx_dqo.c +55 -0
70 lines not on this page · raw message
Signature · 1 line
2.34.1
RFC v2 5/9 net/gve: support basic Tx data path for DQO
In reply to Junfeng GuoAdd basic Tx data path support for DQO.
--- drivers/net/gve/gve_ethdev.c | 1 + drivers/net/gve/gve_ethdev.h | 4 + drivers/net/gve/gve_tx_dqo.c | 141 +++++++++++++++++++++++++++++++++++ 3 files changed, 146 insertions(+)
drivers/net/gve/gve_ethdev.c +1 -0
@@ -703,6 +703,7 @@ gve_dev_init(struct rte_eth_dev *eth_dev) }else {/* override Tx/Rx setup/release eth_dev ops */ gve_eth_dev_ops_override (&gve_local_eth_dev_ops); + eth_dev->tx_pkt_burst = gve_tx_burst_dqo; } eth_dev->dev_ops = &gve_local_eth_dev_ops;
drivers/net/gve/gve_ethdev.h +4 -0
@@ -125,6 +125,7 @@ struct gve_tx_queue {uint8_t cur_gen_bit;uint32_t last_desc_cleaned;void **txqs; +uint16_t re_cnt;/* Only valid for DQO_RDA queue format */ struct gve_tx_queue *complq;
@@ -365,4 +366,7 @@ gve_stop_tx_queues_dqo(struct rte_eth_dev *dev);void gve_stop_rx_queues_dqo (struct rte_eth_dev *dev); +uint16_t +gve_tx_burst_dqo (void *txq,struct rte_mbuf **tx_pkts,uint16_t nb_pkts); +#endif /* _GVE_ETHDEV_H_ */
drivers/net/gve/gve_tx_dqo.c +141 -0
147 lines not on this page · raw message
Signature · 1 line
2.34.1
RFC v2 6/9 net/gve: support basic Rx data path for DQO
In reply to Junfeng GuoAdd basic Rx data path support for DQO.
--- drivers/net/gve/gve_ethdev.c | 1 + drivers/net/gve/gve_ethdev.h | 3 + drivers/net/gve/gve_rx_dqo.c | 128 +++++++++++++++++++++++++++++++++++ 3 files changed, 132 insertions(+)
drivers/net/gve/gve_ethdev.c +1 -0
@@ -703,6 +703,7 @@ gve_dev_init(struct rte_eth_dev *eth_dev) }else {/* override Tx/Rx setup/release eth_dev ops */ gve_eth_dev_ops_override (&gve_local_eth_dev_ops); + eth_dev->rx_pkt_burst = gve_rx_burst_dqo; eth_dev->tx_pkt_burst = gve_tx_burst_dqo; }
drivers/net/gve/gve_ethdev.h +3 -0
@@ -366,6 +366,9 @@ gve_stop_tx_queues_dqo(struct rte_eth_dev *dev);void gve_stop_rx_queues_dqo (struct rte_eth_dev *dev); +uint16_t +gve_rx_burst_dqo (void *rxq,struct rte_mbuf **rx_pkts,uint16_t nb_pkts); +uint16_t gve_tx_burst_dqo (void *txq,struct rte_mbuf **tx_pkts,uint16_t nb_pkts);
drivers/net/gve/gve_rx_dqo.c +128 -0
134 lines not on this page · raw message
Signature · 1 line
2.34.1
RE: [RFC v2 6/9] net/gve: support basic Rx data path for DQO
Quoted 143 lines
-----Original Message-----
From: Junfeng Guo <[email protected]>
Sent: Monday, January 30, 2023 12:27 AM
To: [email protected]; [email protected]; [email protected]; [email protected]
Cc: [email protected]; [email protected]; [email protected]; Junfeng Guo <[email protected]>; Rushil Gupta <[email protected]>; Jordan Kimbrough <[email protected]>; Jeroen de Borst <[email protected]>
Subject: [RFC v2 6/9] net/gve: support basic Rx data path for DQOAdd basic Rx data path support for DQO.
Signed-off-by Junfeng Guo <[email protected]>Signed-off-by Rushil Gupta <[email protected]>Signed-off-by Jordan Kimbrough <[email protected]>Signed-off-by Jeroen de Borst <[email protected]>--- drivers/net/gve/gve_ethdev.c | 1 + drivers/net/gve/gve_ethdev.h | 3 + drivers/net/gve/gve_rx_dqo.c | 128 +++++++++++++++++++++++++++++++++++ 3 files changed, 132 insertions(+)drivers/net/gve/gve_ethdev.c index renamed from drivers/net/gve/gve_ethdev.c +0
-0
512a038968..89e3f09c37100644drivers/net/gve/gve_ethdev.c +1
-0@@ -703,6 +703,7 @@ gve_dev_init(struct rte_eth_dev *eth_dev) }else {/* override Tx/Rx setup/release eth_dev ops */ gve_eth_dev_ops_override (&gve_local_eth_dev_ops); + eth_dev->rx_pkt_burst = gve_rx_burst_dqo; eth_dev->tx_pkt_burst = gve_tx_burst_dqo; }drivers/net/gve/gve_ethdev.h index renamed from drivers/net/gve/gve_ethdev.h +0
-0
ba657dd6c1..d434f9babe100644drivers/net/gve/gve_ethdev.h +4
-0@@ -366,6 +366,9 @@ gve_stop_tx_queues_dqo(struct rte_eth_dev *dev);void gve_stop_rx_queues_dqo (struct rte_eth_dev *dev); +uint16_t +gve_rx_burst_dqo (void *rxq,struct rte_mbuf **rx_pkts,uint16_t +nb_pkts); +uint16_t gve_tx_burst_dqo (void *txq,struct rte_mbuf **tx_pkts,uint16_t nb_pkts);drivers/net/gve/gve_rx_dqo.c index renamed from drivers/net/gve/gve_rx_dqo.c +0
-0
aca6f8ea2d..244517ce5d100644drivers/net/gve/gve_rx_dqo.c +34
-0@@ -5,6 +5,134 @@#include "gve_ethdev.h" #include "base/gve_adminq.h" +static inline void +gve_rx_refill_dqo (struct gve_rx_queue *rxq) { +volatile struct gve_rx_desc_dqo *rx_buf_ring; +volatile struct gve_rx_desc_dqo *rx_buf_desc; +struct rte_mbuf *nmb[rxq->free_thresh]; +uint16_t nb_refill = rxq->free_thresh; +uint16_t nb_desc = rxq->nb_rx_desc; +uint16_t next_avail = rxq->bufq_tail; +struct rte_eth_dev *dev; +uint64_t dma_addr; +uint16_t delta; +int i; + +if (rxq->nb_rx_hold < rxq->free_thresh) +return ; + + rx_buf_ring = rxq->rx_ring; + delta = nb_desc - next_avail; +if (unlikely (delta < nb_refill)) { +if (likely (rte_pktmbuf_alloc_bulk (rxq->mpool, nmb, delta) ==0 )) { +for (i =0 ; i < delta; i++) { + rx_buf_desc = &rx_buf_ring[next_avail + i]; + rxq->sw_ring[next_avail + i] = nmb[i]; + dma_addr =rte_cpu_to_le_64 (rte_mbuf_data_iova_default (nmb[i])); + rx_buf_desc->header_buf_addr =0 ; + rx_buf_desc->buf_addr = dma_addr; + } + nb_refill -= delta; + next_avail =0 ; + rxq->nb_rx_hold -= delta; + }else { + dev = &rte_eth_devices[rxq->port_id]; + dev->data->rx_mbuf_alloc_failed += nb_desc - next_avail; + PMD_DRV_LOG(DEBUG, "RX mbuf alloc failedport_id=%u queue_id=%u",
drivers/net/gve/gve_rx_dqo.c +7
-0+ rxq->port_id, rxq->queue_id); +return ; + } + } + +if (nb_desc - next_avail >= nb_refill) { + if (likely(rte_pktmbuf_alloc_bulk(rxq->mpool, nmb, nb_refill)== 0)) {
drivers/net/gve/gve_rx_dqo.c +4
-0+for (i =0 ; i < nb_refill; i++) { + rx_buf_desc = &rx_buf_ring[next_avail + i]; + rxq->sw_ring[next_avail + i] = nmb[i]; + dma_addr =rte_cpu_to_le_64(rte_mbuf_data_iova_default(nmb[i]));
drivers/net/gve/gve_rx_dqo.c +8
-0+ rx_buf_desc->header_buf_addr =0 ; + rx_buf_desc->buf_addr = dma_addr; + } + next_avail += nb_refill; + rxq->nb_rx_hold -= nb_refill; + }else { + dev = &rte_eth_devices[rxq->port_id]; + dev->data->rx_mbuf_alloc_failed += nb_desc -
next_avail;drivers/net/gve/gve_rx_dqo.c +1
-0+ PMD_DRV_LOG(DEBUG, "RX mbuf alloc failedport_id=%u queue_id=%u",
drivers/net/gve/gve_rx_dqo.c +23
-0+ rxq->port_id, rxq->queue_id); + } + } + +rte_write32 (next_avail, rxq->qrx_tail); + + rxq->bufq_tail = next_avail; +} + +uint16_t +gve_rx_burst_dqo (void *rx_queue,struct rte_mbuf **rx_pkts,uint16_t +nb_pkts) { +volatile struct gve_rx_compl_desc_dqo *rx_compl_ring; +volatile struct gve_rx_compl_desc_dqo *rx_desc; +struct gve_rx_queue *rxq; +struct rte_mbuf *rxm; +uint16_t rx_id_bufq; +uint16_t pkt_len; +uint16_t rx_id; +uint16_t nb_rx; + + nb_rx =0 ; + rxq = rx_queue;
drivers/net/gve/gve_rx_dqo.c line 95
Quoted 10 lines
drivers/net/gve/gve_rx_dqo.c +10
-0+ rx_id = rxq->rx_tail; + rx_id_bufq = rxq->next_avail; + rx_compl_ring = rxq->compl_ring; + +while (nb_rx < nb_pkts) { + rx_desc = &rx_compl_ring[rx_id]; + +/* check status */ +if (rx_desc->generation != rxq->cur_gen_bit) +break ;
From my experience with other PMDs, I think an IO read barrier is needed here to ensure other parts of descriptors are not loaded before loading rx_desc->generation.
Quoted 44 lines
drivers/net/gve/gve_rx_dqo.c +40
-1+ +if (unlikely (rx_desc->rx_error)) +continue ; + + pkt_len = rx_desc->packet_len; + + rx_id++; +if (rx_id == rxq->nb_rx_desc) { + rx_id =0 ; + rxq->cur_gen_bit ^=1 ; + } + + rxm = rxq->sw_ring[rx_id_bufq]; + rx_id_bufq++; +if (rx_id_bufq == rxq->nb_rx_desc) + rx_id_bufq =0 ; + rxq->nb_rx_hold++; + + rxm->pkt_len = pkt_len; + rxm->data_len = pkt_len; + rxm->port = rxq->port_id; + rxm->ol_flags =0 ; + + rxm->ol_flags |=RTE_MBUF_F_RX_RSS_HASH ; + rxm->hash.rss =rte_be_to_cpu_32 (rx_desc->hash); + + rx_pkts[nb_rx++] = rxm; + } + +if (nb_rx >0 ) { + rxq->rx_tail = rx_id; +if (rx_id_bufq != rxq->next_avail) + rxq->next_avail = rx_id_bufq; + +gve_rx_refill_dqo (rxq); + } + +return nb_rx; +} +static inline void gve_release_rxq_mbufs_dqo (struct gve_rx_queue *rxq) { --2.34.1
RFC v2 7/9 net/gve: support basic stats for DQO
In reply to Junfeng GuoAdd basic stats support for DQO.
--- drivers/net/gve/gve_ethdev.c | 60 ++++++++++++++++++++++++++++++++++++ drivers/net/gve/gve_ethdev.h | 11 +++++++ drivers/net/gve/gve_rx_dqo.c | 12 +++++++- drivers/net/gve/gve_tx_dqo.c | 6 ++++ 4 files changed, 88 insertions(+), 1 deletion(-)
drivers/net/gve/gve_ethdev.c +60 -0
@@ -369,6 +369,64 @@ gve_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)return 0 ; } +static int +gve_dev_stats_get (struct rte_eth_dev *dev,struct rte_eth_stats *stats) +{ +uint16_t i; + +for (i =0 ; i < dev->data->nb_tx_queues; i++) { +struct gve_tx_queue *txq = dev->data->tx_queues[i]; +if (txq ==NULL ) +continue ; + + stats->opackets += txq->packets; + stats->obytes += txq->bytes; + stats->oerrors += txq->errors; + } + +for (i =0 ; i < dev->data->nb_rx_queues; i++) { +struct gve_rx_queue *rxq = dev->data->rx_queues[i]; +if (rxq ==NULL ) +continue ; + + stats->ipackets += rxq->packets; + stats->ibytes += rxq->bytes; + stats->ierrors += rxq->errors; + stats->rx_nombuf += rxq->no_mbufs; + } + +return 0 ; +} + +static int +gve_dev_stats_reset (struct rte_eth_dev *dev) +{ +uint16_t i; + +for (i =0 ; i < dev->data->nb_tx_queues; i++) { +struct gve_tx_queue *txq = dev->data->tx_queues[i]; +if (txq ==NULL ) +continue ; + + txq->packets =0 ; + txq->bytes =0 ; + txq->errors =0 ; + } + +for (i =0 ; i < dev->data->nb_rx_queues; i++) { +struct gve_rx_queue *rxq = dev->data->rx_queues[i]; +if (rxq ==NULL ) +continue ; + + rxq->packets =0 ; + rxq->bytes =0 ; + rxq->errors =0 ; + rxq->no_mbufs =0 ; + } + +return 0 ; +} +static int gve_dev_mtu_set (struct rte_eth_dev *dev,uint16_t mtu) {
@@ -407,6 +465,8 @@ static const struct eth_dev_ops gve_eth_dev_ops = { .rx_queue_release = gve_rx_queue_release, .tx_queue_release = gve_tx_queue_release, .link_update = gve_link_update, + .stats_get = gve_dev_stats_get, + .stats_reset = gve_dev_stats_reset, .mtu_set = gve_dev_mtu_set, };
drivers/net/gve/gve_ethdev.h +11 -0
@@ -105,6 +105,11 @@ struct gve_tx_queue {struct gve_queue_page_list *qpl;struct gve_tx_iovec *iov_ring; +/* stats items */ +uint64_t packets; +uint64_t bytes; +uint64_t errors; +uint16_t port_id;uint16_t queue_id;
@@ -156,6 +161,12 @@ struct gve_rx_queue {/* only valid for GQI_QPL queue format */ struct gve_queue_page_list *qpl; +/* stats items */ +uint64_t packets; +uint64_t bytes; +uint64_t errors; +uint64_t no_mbufs; +struct gve_priv *hw;const struct rte_memzone *qres_mz;struct gve_queue_resources *qres;
drivers/net/gve/gve_rx_dqo.c +11 -1
@@ -37,6 +37,7 @@ gve_rx_refill_dqo(struct gve_rx_queue *rxq) next_avail =0 ; rxq->nb_rx_hold -= delta; }else { + rxq->no_mbufs += nb_desc - next_avail; dev = &rte_eth_devices[rxq->port_id]; dev->data->rx_mbuf_alloc_failed += nb_desc - next_avail; PMD_DRV_LOG(DEBUG, "RX mbuf alloc failed port_id=%u queue_id=%u",
@@ -57,6 +58,7 @@ gve_rx_refill_dqo(struct gve_rx_queue *rxq) next_avail += nb_refill; rxq->nb_rx_hold -= nb_refill; }else { + rxq->no_mbufs += nb_desc - next_avail; dev = &rte_eth_devices[rxq->port_id]; dev->data->rx_mbuf_alloc_failed += nb_desc - next_avail; PMD_DRV_LOG(DEBUG, "RX mbuf alloc failed port_id=%u queue_id=%u",
@@ -80,7 +82,9 @@ gve_rx_burst_dqo(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)uint16_t pkt_len;uint16_t rx_id;uint16_t nb_rx; +uint64_t bytes; + bytes =0 ; nb_rx =0 ; rxq = rx_queue; rx_id = rxq->rx_tail;
@@ -94,8 +98,10 @@ gve_rx_burst_dqo(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)if (rx_desc->generation != rxq->cur_gen_bit)break ; -if (unlikely (rx_desc->rx_error)) +if (unlikely (rx_desc->rx_error)) { + rxq->errors++;continue ; + } pkt_len = rx_desc->packet_len;
@@ -120,6 +126,7 @@ gve_rx_burst_dqo(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts) rxm->hash.rss =rte_be_to_cpu_32 (rx_desc->hash); rx_pkts[nb_rx++] = rxm; + bytes += pkt_len; }if (nb_rx >0 ) {
@@ -128,6 +135,9 @@ gve_rx_burst_dqo(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts) rxq->next_avail = rx_id_bufq;gve_rx_refill_dqo (rxq); + + rxq->packets += nb_rx; + rxq->bytes += bytes; }return nb_rx;
drivers/net/gve/gve_tx_dqo.c +6 -0
@@ -80,10 +80,12 @@ gve_tx_burst_dqo(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)uint16_t nb_used;uint16_t tx_id;uint16_t sw_id; +uint64_t bytes; sw_ring = txq->sw_ring; txr = txq->tx_ring; + bytes =0 ; mask = txq->nb_tx_desc -1 ; sw_mask = txq->sw_size -1 ; tx_id = txq->tx_tail;
@@ -118,6 +120,7 @@ gve_tx_burst_dqo(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) tx_id = (tx_id +1 ) & mask; sw_id = (sw_id +1 ) & sw_mask; + bytes += tx_pkt->pkt_len; tx_pkt = tx_pkt->next; }while (tx_pkt);
@@ -141,6 +144,9 @@ gve_tx_burst_dqo(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)rte_write32 (tx_id, txq->qtx_tail); txq->tx_tail = tx_id; txq->sw_tail = sw_id; + + txq->packets += nb_tx; + txq->bytes += bytes; }return nb_tx;
Signature · 1 line
2.34.1
RE: [RFC v2 7/9] net/gve: support basic stats for DQO
Few comments inline
Quoted 62 lines
-----Original Message-----
From: Junfeng Guo <[email protected]>
Sent: Monday, January 30, 2023 12:27 AM
To: [email protected]; [email protected]; [email protected]; [email protected]
Cc: [email protected]; [email protected]; [email protected]; Junfeng Guo <[email protected]>; Rushil Gupta <[email protected]>; Jordan Kimbrough <[email protected]>; Jeroen de Borst <[email protected]>
Subject: [RFC v2 7/9] net/gve: support basic stats for DQOAdd basic stats support for DQO.
Signed-off-by Junfeng Guo <[email protected]>Signed-off-by Rushil Gupta <[email protected]>Signed-off-by Jordan Kimbrough <[email protected]>Signed-off-by Jeroen de Borst <[email protected]>--- drivers/net/gve/gve_ethdev.c | 60 ++++++++++++++++++++++++++++++++++++ drivers/net/gve/gve_ethdev.h | 11 +++++++ drivers/net/gve/gve_rx_dqo.c | 12 +++++++- drivers/net/gve/gve_tx_dqo.c | 6 ++++ 4 files changed, 88 insertions(+), 1 deletion(-)drivers/net/gve/gve_ethdev.c index renamed from drivers/net/gve/gve_ethdev.c +0
-0
89e3f09c37..fae00305f9100644drivers/net/gve/gve_ethdev.c +31
-0@@ -369,6 +369,64 @@ gve_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)return 0 ; } +static int +gve_dev_stats_get (struct rte_eth_dev *dev,struct rte_eth_stats *stats) +{ +uint16_t i; + +for (i =0 ; i < dev->data->nb_tx_queues; i++) { +struct gve_tx_queue *txq = dev->data->tx_queues[i]; +if (txq ==NULL ) +continue ; + + stats->opackets += txq->packets; + stats->obytes += txq->bytes; + stats->oerrors += txq->errors; + } + +for (i =0 ; i < dev->data->nb_rx_queues; i++) { +struct gve_rx_queue *rxq = dev->data->rx_queues[i]; +if (rxq ==NULL ) +continue ; + + stats->ipackets += rxq->packets; + stats->ibytes += rxq->bytes; + stats->ierrors += rxq->errors; + stats->rx_nombuf += rxq->no_mbufs; + } + +return 0 ; +} + +static int +gve_dev_stats_reset (struct rte_eth_dev *dev) {
drivers/net/gve/gve_ethdev.c gve_dev_info_get(struct rte_eth_dev *dev, struct · line 413
Quoted 10 lines
drivers/net/gve/gve_ethdev.c +10
-0+uint16_t i; + +for (i =0 ; i < dev->data->nb_tx_queues; i++) { +struct gve_tx_queue *txq = dev->data->tx_queues[i]; +if (txq ==NULL ) +continue ; + + txq->packets =0 ; + txq->bytes =0 ; + txq->errors =0 ;
Do these (similar ones elsewhere) need to be atomic operations? These statistics are being accessed from PMD and the control plane threads.
Quoted 113 lines
drivers/net/gve/gve_ethdev.c +16
-0+ } + +for (i =0 ; i < dev->data->nb_rx_queues; i++) { +struct gve_rx_queue *rxq = dev->data->rx_queues[i]; +if (rxq ==NULL ) +continue ; + + rxq->packets =0 ; + rxq->bytes =0 ; + rxq->errors =0 ; + rxq->no_mbufs =0 ; + } + +return 0 ; +} +static int gve_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu) { @@ -407,6 +465,8@@ static const struct
eth_dev_opsgve_eth_dev_ops= {drivers/net/gve/gve_ethdev.c +2
-0.rx_queue_release = gve_rx_queue_release, .tx_queue_release = gve_tx_queue_release, .link_update = gve_link_update, + .stats_get = gve_dev_stats_get, + .stats_reset = gve_dev_stats_reset, .mtu_set = gve_dev_mtu_set, };drivers/net/gve/gve_ethdev.h index renamed from drivers/net/gve/gve_ethdev.h +0
-0
d434f9babe..2e0f96499d100644drivers/net/gve/gve_ethdev.h +11
-0@@ -105,6 +105,11 @@ struct gve_tx_queue {struct gve_queue_page_list *qpl;struct gve_tx_iovec *iov_ring; +/* stats items */ +uint64_t packets; +uint64_t bytes; +uint64_t errors; +uint16_t port_id;uint16_t queue_id;@@ -156,6 +161,12 @@ struct gve_rx_queue {/* only valid for GQI_QPL queue format */ struct gve_queue_page_list *qpl; +/* stats items */ +uint64_t packets; +uint64_t bytes; +uint64_t errors; +uint64_t no_mbufs; +struct gve_priv *hw;const struct rte_memzone *qres_mz;struct gve_queue_resources *qres;drivers/net/gve/gve_rx_dqo.c index renamed from drivers/net/gve/gve_rx_dqo.c +0
-0
244517ce5d..41ead5bd98100644drivers/net/gve/gve_rx_dqo.c +1
-0@@ -37,6 +37,7 @@ gve_rx_refill_dqo(struct gve_rx_queue *rxq) next_avail =0 ; rxq->nb_rx_hold -= delta; }else { + rxq->no_mbufs += nb_desc - next_avail; dev = &rte_eth_devices[rxq->port_id]; dev->data->rx_mbuf_alloc_failed += nb_desc - next_avail;PMD_DRV_LOG(DEBUG, "RX mbuf alloc failed
port_id=%u queue_id=%u", @@ -57,6 +58,7 @@gve_rx_refill_dqo(struct gve_rx_queue *rxq)drivers/net/gve/gve_rx_dqo.c +1
-0next_avail += nb_refill; rxq->nb_rx_hold -= nb_refill; }else { + rxq->no_mbufs += nb_desc - next_avail; dev = &rte_eth_devices[rxq->port_id]; dev->data->rx_mbuf_alloc_failed += nb_desc -
next_avail;
PMD_DRV_LOG(DEBUG, "RX mbuf alloc failed
port_id=%u queue_id=%u", @@ -80,7 +82,9 @@gve_rx_burst_dqo(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)drivers/net/gve/gve_rx_dqo.c +6
-1uint16_t pkt_len;uint16_t rx_id;uint16_t nb_rx; +uint64_t bytes; + bytes =0 ; nb_rx =0 ; rxq = rx_queue; rx_id = rxq->rx_tail;@@ -94,8 +98,10 @@ gve_rx_burst_dqo(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)if (rx_desc->generation != rxq->cur_gen_bit)break ; -if (unlikely (rx_desc->rx_error)) +if (unlikely (rx_desc->rx_error)) { + rxq->errors++;continue ; + } pkt_len = rx_desc->packet_len;@@ -120,6 +126,7 @@ gve_rx_burst_dqo(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts) rxm->hash.rss =rte_be_to_cpu_32 (rx_desc->hash); rx_pkts[nb_rx++] = rxm; + bytes += pkt_len; }drivers/net/gve/gve_rx_dqo.c +0
-0if (nb_rx >0 ) {
drivers/net/gve/gve_rx_dqo.c gve_rx_burst_dqo(void *rx_queue, struct rte_mbuf · line 141
Quoted 7 lines
drivers/net/gve/gve_rx_dqo.c +3
-0@@ -128,6 +135,9 @@ gve_rx_burst_dqo(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts) rxq->next_avail = rx_id_bufq;gve_rx_refill_dqo (rxq); + + rxq->packets += nb_rx; + rxq->bytes += bytes;
Similarly here, these should be atomic operations.
Quoted 43 lines
drivers/net/gve/gve_rx_dqo.c +0
-0}drivers/net/gve/gve_rx_dqo.c +0
-0return nb_rx;drivers/net/gve/gve_tx_dqo.c index renamed from drivers/net/gve/gve_tx_dqo.c +0
-0
3583c82246..9c1361c894100644drivers/net/gve/gve_tx_dqo.c +2
-0@@ -80,10 +80,12 @@ gve_tx_burst_dqo(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)uint16_t nb_used;uint16_t tx_id;uint16_t sw_id; +uint64_t bytes; sw_ring = txq->sw_ring; txr = txq->tx_ring; + bytes =0 ; mask = txq->nb_tx_desc -1 ; sw_mask = txq->sw_size -1 ;drivers/net/gve/gve_tx_dqo.c +4
-0tx_id = txq->tx_tail;@@ -118,6 +120,7 @@ gve_tx_burst_dqo(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) tx_id = (tx_id +1 ) & mask; sw_id = (sw_id +1 ) & sw_mask; + bytes += tx_pkt->pkt_len; tx_pkt = tx_pkt->next; }while (tx_pkt);@@ -141,6 +144,9 @@ gve_tx_burst_dqo(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)rte_write32 (tx_id, txq->qtx_tail); txq->tx_tail = tx_id; txq->sw_tail = sw_id; + + txq->packets += nb_tx; + txq->bytes += bytes; }return
nb_tx;
--
2.34.1
RFC v2 8/9 net/gve: support jumbo frame for GQI
In reply to Junfeng GuoAdd multi-segment support to enable GQI Rx Jumbo Frame.
--- drivers/net/gve/gve_ethdev.h | 8 +++ drivers/net/gve/gve_rx.c | 128 ++++++++++++++++++++++++++--------- 2 files changed, 105 insertions(+), 31 deletions(-)
drivers/net/gve/gve_ethdev.h +8 -0
@@ -138,6 +138,13 @@ struct gve_tx_queue {uint8_t is_gqi_qpl; }; +struct gve_rx_ctx { +struct rte_mbuf *mbuf_head; +struct rte_mbuf *mbuf_tail; +uint16_t total_frags; +bool drop_pkt; +}; +struct gve_rx_queue {volatile struct gve_rx_desc *rx_desc_ring;volatile union gve_rx_data_slot *rx_data_ring;
@@ -146,6 +153,7 @@ struct gve_rx_queue {uint64_t rx_ring_phys_addr;struct rte_mbuf **sw_ring;struct rte_mempool *mpool; +struct gve_rx_ctx ctx;uint16_t rx_tail;uint16_t nb_rx_desc;
drivers/net/gve/gve_rx.c +97 -31
161 lines not on this page · raw message
Signature · 1 line
2.34.1
RFC v2 9/9 net/gve: add AdminQ command to verify driver compatibility
In reply to Junfeng GuoCheck whether the driver is compatible with the device presented.
--- drivers/net/gve/base/gve_adminq.c | 19 ++++++++++ drivers/net/gve/base/gve_adminq.h | 48 +++++++++++++++++++++++++ drivers/net/gve/base/gve_osdep.h | 8 +++++ drivers/net/gve/gve_ethdev.c | 60 +++++++++++++++++++++++++++++++ drivers/net/gve/gve_ethdev.h | 1 + 5 files changed, 136 insertions(+)
drivers/net/gve/base/gve_adminq.c +19 -0
@@ -401,6 +401,9 @@ static int gve_adminq_issue_cmd(struct gve_priv *priv,case GVE_ADMINQ_GET_PTYPE_MAP : priv->adminq_get_ptype_map_cnt++;break ; +case GVE_ADMINQ_VERIFY_DRIVER_COMPATIBILITY : + priv->adminq_verify_driver_compatibility_cnt++; +break ;default :PMD_DRV_LOG (ERR ,"unknown AQ command opcode %d" , opcode); }
@@ -859,6 +862,22 @@ int gve_adminq_report_stats(struct gve_priv *priv, u64 stats_report_len,return gve_adminq_execute_cmd (priv, &cmd); } +int gve_adminq_verify_driver_compatibility (struct gve_priv *priv, +u64 driver_info_len, +dma_addr_t driver_info_addr) +{ +union gve_adminq_command cmd; + +memset (&cmd,0 ,sizeof (cmd)); + cmd.opcode =cpu_to_be32 (GVE_ADMINQ_VERIFY_DRIVER_COMPATIBILITY ); + cmd.verify_driver_compatibility = (struct gve_adminq_verify_driver_compatibility ) { + .driver_info_len =cpu_to_be64 (driver_info_len), + .driver_info_addr =cpu_to_be64 (driver_info_addr), + }; + +return gve_adminq_execute_cmd (priv, &cmd); +} +int gve_adminq_report_link_speed (struct gve_priv *priv) {struct gve_dma_mem link_speed_region_dma_mem;
drivers/net/gve/base/gve_adminq.h +48 -0
71 lines not on this page · raw message
drivers/net/gve/base/gve_osdep.h +8 -0
@@ -21,6 +21,9 @@#include <rte_malloc.h> #include <rte_memcpy.h> #include <rte_memzone.h> +#include <rte_version.h> +#include <linux/version.h> +#include <sys/utsname.h> #include "../gve_logs.h"
@@ -82,6 +85,11 @@ typedef rte_iova_t dma_addr_t; { gve_static_assert_##X = (n) / ((sizeof(struct X) == (n)) ? 1 : 0) }#define GVE_CHECK_UNION_LEN (n,X ) enum gve_static_asset_enum_##X \ { gve_static_assert_##X = (n) / ((sizeof(union X) == (n)) ? 1 : 0) } +#ifndef LINUX_VERSION_MAJOR +#define LINUX_VERSION_MAJOR (((LINUX_VERSION_CODE) >> 16) & 0xff) +#define LINUX_VERSION_SUBLEVEL (((LINUX_VERSION_CODE) >> 8) & 0xff) +#define LINUX_VERSION_PATCHLEVEL ((LINUX_VERSION_CODE) & 0xff) +#endif static __rte_always_inline u8readb (volatile void *addr)
drivers/net/gve/gve_ethdev.c +60 -0
72 lines not on this page · raw message
drivers/net/gve/gve_ethdev.h +1 -0
@@ -250,6 +250,7 @@ struct gve_priv {uint32_t adminq_report_stats_cnt;uint32_t adminq_report_link_speed_cnt;uint32_t adminq_get_ptype_map_cnt; +uint32_t adminq_verify_driver_compatibility_cnt;volatile uint32_t state_flags;
Signature · 1 line
2.34.1
v3 cover gve PMD enhancement
In reply to Junfeng GuoThis patch set includs three main enhancements for gve PMD:
- support basic data path for DQO queue format
- support jumbo frame for GQI queue format
- add new AdminQ cmd to verify driver compatibility
v3:
- refactor the dev_ops override for DQO.
- add support for L4 Tx checksum.
- update driver and OS version logging.
- code rebased to the latest.
v2:
- add one missing commit into this patch set.
- add new contributors into the mailmap.
Junfeng Guo (10):
net/gve: add Tx queue setup for DQO
net/gve: add Rx queue setup for DQO
net/gve: support device start and close for DQO net/gve: support queue release and stop for DQO net/gve: support basic Tx data path for DQO net/gve: support basic Rx data path for DQO net/gve: support basic stats for DQO
net/gve: enable Tx checksum offload for DQO net/gve: support jumbo frame for GQI
net/gve: add AdminQ command to verify driver compatibility
.mailmap | 3 + MAINTAINERS | 3 + drivers/net/gve/base/gve.h | 6 +- drivers/net/gve/base/gve_adminq.c | 31 ++- drivers/net/gve/base/gve_adminq.h | 49 +++- drivers/net/gve/base/gve_desc_dqo.h | 6 +- drivers/net/gve/base/gve_osdep.h | 40 ++- drivers/net/gve/gve_ethdev.c | 151 +++++++++-- drivers/net/gve/gve_ethdev.h | 81 +++++- drivers/net/gve/gve_rx.c | 142 +++++++--- drivers/net/gve/gve_rx_dqo.c | 349 +++++++++++++++++++++++++ drivers/net/gve/gve_tx.c | 5 +- drivers/net/gve/gve_tx_dqo.c | 391 ++++++++++++++++++++++++++++ drivers/net/gve/gve_version.c | 14 + drivers/net/gve/gve_version.h | 25 ++ drivers/net/gve/meson.build | 5 +- 16 files changed, 1222 insertions(+), 79 deletions(-) create mode 100644 drivers/net/gve/gve_rx_dqo.c create mode 100644 drivers/net/gve/gve_tx_dqo.c create mode 100644 drivers/net/gve/gve_version.c create mode 100644 drivers/net/gve/gve_version.h
Signature · 1 line
2.34.1
RFC v3 1/10 net/gve: add Tx queue setup for DQO
Add support for tx_queue_setup_dqo ops.
DQO format has submission and completion queue pair for each Tx/Rx queue. Note that with DQO format all descriptors and doorbells, as well as counters are written in little-endian.
--- .mailmap | 3 + MAINTAINERS | 3 + drivers/net/gve/base/gve.h | 3 +- drivers/net/gve/base/gve_desc_dqo.h | 6 +- drivers/net/gve/base/gve_osdep.h | 6 +- drivers/net/gve/gve_ethdev.c | 19 ++- drivers/net/gve/gve_ethdev.h | 35 +++++- drivers/net/gve/gve_tx_dqo.c | 184 ++++++++++++++++++++++++++++ drivers/net/gve/meson.build | 3 +- 9 files changed, 248 insertions(+), 14 deletions(-) create mode 100644 drivers/net/gve/gve_tx_dqo.c
.mailmap +3 -0
@@ -579,6 +579,7 @@ Jens Freimann <[email protected]> <[email protected]> Jeremy Plsek <[email protected]> Jeremy Spewock <[email protected]> Jerin Jacob <[email protected]> <[email protected]> <[email protected]> +Jeroen de Borst <[email protected]> Jerome Jutteau <[email protected]> Jerry Hao OS <[email protected]> Jerry Lilijun <[email protected]>
@@ -643,6 +644,7 @@ Jonathan Erb <[email protected]> Jon DeVree <[email protected]> Jon Loeliger <[email protected]> Joongi Kim <[email protected]> +Jordan Kimbrough <[email protected]> Jørgen Østergaard Sloth <[email protected]> Jörg Thalheim <[email protected]> Joseph Richard <[email protected]>
@@ -1148,6 +1150,7 @@ Roy Franz <[email protected]> Roy Pledge <[email protected]> Roy Shterman <[email protected]> Ruifeng Wang <[email protected]> +Rushil Gupta <[email protected]> Ryan E Hall <[email protected]> Sabyasachi Sengupta <[email protected]> Sachin Saxena <[email protected]> <[email protected]>
MAINTAINERS +3 -0
@@ -703,6 +703,9 @@ F: doc/guides/nics/features/enic.ini Google Virtual Ethernet M: Junfeng Guo <[email protected]> +M: Jeroen de Borst <[email protected]> +M: Rushil Gupta <[email protected]> +M: Jordan Kimbrough <[email protected]> F: drivers/net/gve/ F: doc/guides/nics/gve.rst F: doc/guides/nics/features/gve.ini
drivers/net/gve/base/gve.h +2 -1
@@ -1,12 +1,13 @@/* SPDX-License-Identifier: MIT * Google Virtual Ethernet (gve) driver -* Copyright (C) 2015-2022 Google, Inc. +* Copyright (C) 2015-2023 Google, Inc. */ #ifndef _GVE_H_#define _GVE_H_#include "gve_desc.h" +#include "gve_desc_dqo.h" #define GVE_VERSION "1.3.0"#define GVE_VERSION_PREFIX "GVE-"
drivers/net/gve/base/gve_desc_dqo.h +1 -5
@@ -1,6 +1,6 @@/* SPDX-License-Identifier: MIT * Google Virtual Ethernet (gve) driver -* Copyright (C) 2015-2022 Google, Inc. +* Copyright (C) 2015-2023 Google, Inc. */ /* GVE DQO Descriptor formats */
@@ -13,10 +13,6 @@#define GVE_TX_MAX_HDR_SIZE_DQO 255#define GVE_TX_MIN_TSO_MSS_DQO 88 -#ifndef __LITTLE_ENDIAN_BITFIELD -#error "Only little endian supported" -#endif -/* Basic TX descriptor (DTYPE 0x0C) */ struct gve_tx_pkt_desc_dqo {__le64 buf_addr;
drivers/net/gve/base/gve_osdep.h +5 -1
@@ -1,5 +1,5 @@/* SPDX-License-Identifier: BSD-3-Clause -* Copyright(C) 2022 Intel Corporation +* Copyright(C) 2022-2023 Intel Corporation */ #ifndef _GVE_OSDEP_H_
@@ -35,6 +35,10 @@ typedef rte_be16_t __be16;typedef rte_be32_t __be32 ;typedef rte_be64_t __be64 ; +typedef rte_le16_t __le16 ; +typedef rte_le32_t __le32 ; +typedef rte_le64_t __le64 ; +typedef rte_iova_t dma_addr_t ;#define ETH_MIN_MTU RTE_ETHER_MIN_MTU
drivers/net/gve/gve_ethdev.c +15 -4
@@ -1,5 +1,5 @@/* SPDX-License-Identifier: BSD-3-Clause -* Copyright(C) 2022 Intel Corporation +* Copyright(C) 2022-2023 Intel Corporation */ #include "gve_ethdev.h"
@@ -299,6 +299,7 @@ gve_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) dev_info->default_txconf = (struct rte_eth_txconf ) { .tx_free_thresh =GVE_DEFAULT_TX_FREE_THRESH , + .tx_rs_thresh =GVE_DEFAULT_TX_RS_THRESH , .offloads =0 , };
@@ -420,6 +421,17 @@ static const struct eth_dev_ops gve_eth_dev_ops = { .mtu_set = gve_dev_mtu_set, }; +static const struct eth_dev_ops gve_eth_dev_ops_dqo = { + .dev_configure = gve_dev_configure, + .dev_start = gve_dev_start, + .dev_stop = gve_dev_stop, + .dev_close = gve_dev_close, + .dev_infos_get = gve_dev_info_get, + .tx_queue_setup = gve_tx_queue_setup_dqo, + .link_update = gve_link_update, + .mtu_set = gve_dev_mtu_set, +}; +static void gve_free_counter_array (struct gve_priv *priv) {
@@ -662,8 +674,6 @@ gve_dev_init(struct rte_eth_dev *eth_dev)rte_be32_t *db_bar;int err; - eth_dev->dev_ops = &gve_eth_dev_ops; -if (rte_eal_process_type () !=RTE_PROC_PRIMARY )return 0 ;
@@ -699,10 +709,11 @@ gve_dev_init(struct rte_eth_dev *eth_dev)return err;if (gve_is_gqi (priv)) { + eth_dev->dev_ops = &gve_eth_dev_ops; eth_dev->rx_pkt_burst = gve_rx_burst; eth_dev->tx_pkt_burst = gve_tx_burst; }else { -PMD_DRV_LOG (ERR ,"DQO_RDA is not implemented and will be added in the future" ); + eth_dev->dev_ops = &gve_eth_dev_ops_dqo; } eth_dev->data->mac_addrs = &priv->dev_addr;
drivers/net/gve/gve_ethdev.h +33 -2
@@ -1,5 +1,5 @@/* SPDX-License-Identifier: BSD-3-Clause -* Copyright(C) 2022 Intel Corporation +* Copyright(C) 2022-2023 Intel Corporation */ #ifndef _GVE_ETHDEV_H_
@@ -11,6 +11,9 @@#include "base/gve.h" +/* TODO: this is a workaround to ensure that Tx complq is enough */ +#define DQO_TX_MULTIPLIER 4 +/* * Following macros are derived from linux/pci_regs.h, however, * we can't simply include that header here, as there is no such
@@ -25,7 +28,8 @@#define PCI_MSIX_FLAGS_QSIZE 0x07FF/* Table size */ #define GVE_DEFAULT_RX_FREE_THRESH 512 -#define GVE_DEFAULT_TX_FREE_THRESH 256 +#define GVE_DEFAULT_TX_FREE_THRESH 32 +#define GVE_DEFAULT_TX_RS_THRESH 32#define GVE_TX_MAX_FREE_SZ 512#define GVE_MIN_BUF_SIZE 1024
@@ -50,6 +54,13 @@ union gve_tx_desc {struct gve_tx_seg_desc seg;/* subsequent descs for a packet */ }; +/* Tx desc for DQO format */ +union gve_tx_desc_dqo { +struct gve_tx_pkt_desc_dqo pkt; +struct gve_tx_tso_context_desc_dqo tso_ctx; +struct gve_tx_general_context_desc_dqo general_ctx; +}; +/* Offload features */ union gve_tx_offload {uint64_t data;
@@ -78,8 +89,10 @@ struct gve_tx_queue {uint32_t tx_tail;uint16_t nb_tx_desc;uint16_t nb_free; +uint16_t nb_used;uint32_t next_to_clean;uint16_t free_thresh; +uint16_t rs_thresh;/* Only valid for DQO_QPL queue format */ uint16_t sw_tail;
@@ -107,6 +120,17 @@ struct gve_tx_queue {const struct rte_memzone *qres_mz;struct gve_queue_resources *qres; +/* newly added for DQO */ +volatile union gve_tx_desc_dqo *tx_ring; +struct gve_tx_compl_desc *compl_ring; +const struct rte_memzone *compl_ring_mz; +uint64_t compl_ring_phys_addr; +uint32_t complq_tail; +uint16_t sw_size; +uint8_t cur_gen_bit; +uint32_t last_desc_cleaned; +void **txqs; +/* Only valid for DQO_RDA queue format */ struct gve_tx_queue *complq;
@@ -319,4 +343,11 @@ gve_rx_burst(void *rxq, struct rte_mbuf **rx_pkts, uint16_t nb_pkts);uint16_t gve_tx_burst (void *txq,struct rte_mbuf **tx_pkts,uint16_t nb_pkts); +/* Below functions are used for DQO */ + +int +gve_tx_queue_setup_dqo (struct rte_eth_dev *dev,uint16_t queue_id, +uint16_t nb_desc,unsigned int socket_id, +const struct rte_eth_txconf *conf); +#endif /* _GVE_ETHDEV_H_ */
drivers/net/gve/gve_tx_dqo.c new file +184 -0
184 lines not on this page · raw message
drivers/net/gve/meson.build +2 -1
@@ -1,5 +1,5 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright(C) 2022 Intel Corporation +# Copyright(C) 2022-2023 Intel Corporation if is_windows build = false
@@ -11,6 +11,7 @@ sources = files( 'base/gve_adminq.c', 'gve_rx.c', 'gve_tx.c', + 'gve_tx_dqo.c', 'gve_ethdev.c', ) includes += include_directories('base')
Signature · 1 line
2.34.1
RFC v3 2/10 net/gve: add Rx queue setup for DQO
In reply to Junfeng GuoAdd support for rx_queue_setup_dqo ops.
--- drivers/net/gve/gve_ethdev.c | 1 + drivers/net/gve/gve_ethdev.h | 14 ++++ drivers/net/gve/gve_rx_dqo.c | 154 +++++++++++++++++++++++++++++++++++ drivers/net/gve/meson.build | 1 + 4 files changed, 170 insertions(+) create mode 100644 drivers/net/gve/gve_rx_dqo.c
drivers/net/gve/gve_ethdev.c +1 -0
@@ -427,6 +427,7 @@ static const struct eth_dev_ops gve_eth_dev_ops_dqo = { .dev_stop = gve_dev_stop, .dev_close = gve_dev_close, .dev_infos_get = gve_dev_info_get, + .rx_queue_setup = gve_rx_queue_setup_dqo, .tx_queue_setup = gve_tx_queue_setup_dqo, .link_update = gve_link_update, .mtu_set = gve_dev_mtu_set,
drivers/net/gve/gve_ethdev.h +14 -0
@@ -150,6 +150,7 @@ struct gve_rx_queue {uint16_t nb_rx_desc;uint16_t expected_seqno;/* the next expected seqno */ uint16_t free_thresh; +uint16_t nb_rx_hold;uint32_t next_avail;uint32_t nb_avail;
@@ -174,6 +175,14 @@ struct gve_rx_queue {uint16_t ntfy_id;uint16_t rx_buf_len; +/* newly added for DQO */ +volatile struct gve_rx_desc_dqo *rx_ring; +struct gve_rx_compl_desc_dqo *compl_ring; +const struct rte_memzone *compl_ring_mz; +uint64_t compl_ring_phys_addr; +uint8_t cur_gen_bit; +uint16_t bufq_tail; +/* Only valid for DQO_RDA queue format */ struct gve_rx_queue *bufq;
@@ -345,6 +354,11 @@ gve_tx_burst(void *txq, struct rte_mbuf **tx_pkts, uint16_t nb_pkts);/* Below functions are used for DQO */ +int +gve_rx_queue_setup_dqo (struct rte_eth_dev *dev,uint16_t queue_id, +uint16_t nb_desc,unsigned int socket_id, +const struct rte_eth_rxconf *conf, +struct rte_mempool *pool); int gve_tx_queue_setup_dqo(struct rte_eth_dev *dev, uint16_t queue_id, uint16_t nb_desc, unsigned int socket_id,
drivers/net/gve/gve_rx_dqo.c new file +154 -0
154 lines not on this page · raw message
drivers/net/gve/meson.build +1 -0
@@ -11,6 +11,7 @@ sources = files( 'base/gve_adminq.c', 'gve_rx.c', 'gve_tx.c', + 'gve_rx_dqo.c', 'gve_tx_dqo.c', 'gve_ethdev.c', )
Signature · 1 line
2.34.1
RFC v3 3/10 net/gve: support device start and close for DQO
In reply to Junfeng GuoAdd device start and close support for DQO.
--- drivers/net/gve/base/gve_adminq.c | 12 ++++----- drivers/net/gve/gve_ethdev.c | 43 ++++++++++++++++++++++++++++++- 2 files changed, 48 insertions(+), 7 deletions(-)
drivers/net/gve/base/gve_adminq.c +6 -6
@@ -1,6 +1,6 @@/* SPDX-License-Identifier: MIT * Google Virtual Ethernet (gve) driver -* Copyright (C) 2015-2022 Google, Inc. +* Copyright (C) 2015-2023 Google, Inc. */ #include "../gve_ethdev.h"
@@ -497,11 +497,11 @@ static int gve_adminq_create_tx_queue(struct gve_priv *priv, u32 queue_index) cmd.create_tx_queue.queue_page_list_id =cpu_to_be32 (qpl_id); }else { cmd.create_tx_queue.tx_ring_size = -cpu_to_be16 (txq->nb_tx_desc); +cpu_to_be16 (priv->tx_desc_cnt); cmd.create_tx_queue.tx_comp_ring_addr = -cpu_to_be64 (txq->complq->tx_ring_phys_addr); +cpu_to_be64 (txq->compl_ring_phys_addr); cmd.create_tx_queue.tx_comp_ring_size = -cpu_to_be16 (priv->tx_compq_size); +cpu_to_be16 (priv->tx_compq_size *DQO_TX_MULTIPLIER ); }return gve_adminq_issue_cmd (priv, &cmd);
@@ -549,9 +549,9 @@ static int gve_adminq_create_rx_queue(struct gve_priv *priv, u32 queue_index) cmd.create_rx_queue.rx_ring_size =cpu_to_be16 (priv->rx_desc_cnt); cmd.create_rx_queue.rx_desc_ring_addr = -cpu_to_be64 (rxq->rx_ring_phys_addr); +cpu_to_be64 (rxq->compl_ring_phys_addr); cmd.create_rx_queue.rx_data_ring_addr = -cpu_to_be64 (rxq->bufq->rx_ring_phys_addr); +cpu_to_be64 (rxq->rx_ring_phys_addr); cmd.create_rx_queue.packet_buffer_size =cpu_to_be16 (rxq->rx_buf_len); cmd.create_rx_queue.rx_buff_ring_size =
drivers/net/gve/gve_ethdev.c +42 -1
61 lines not on this page · raw message
Signature · 1 line
2.34.1
RFC v3 4/10 net/gve: support queue release and stop for DQO
In reply to Junfeng GuoAdd support for queue operations:
- gve_tx_queue_release_dqo
- gve_rx_queue_release_dqo
- gve_stop_tx_queues_dqo
- gve_stop_rx_queues_dqo
--- drivers/net/gve/gve_ethdev.c | 18 +++++++++--- drivers/net/gve/gve_ethdev.h | 12 ++++++++ drivers/net/gve/gve_rx.c | 5 +++- drivers/net/gve/gve_rx_dqo.c | 57 ++++++++++++++++++++++++++++++++++++ drivers/net/gve/gve_tx.c | 5 +++- drivers/net/gve/gve_tx_dqo.c | 55 ++++++++++++++++++++++++++++++++++ 6 files changed, 146 insertions(+), 6 deletions(-)
drivers/net/gve/gve_ethdev.c +14 -4
@@ -292,11 +292,19 @@ gve_dev_close(struct rte_eth_dev *dev)PMD_DRV_LOG (ERR ,"Failed to stop dev." ); } -for (i =0 ; i < dev->data->nb_tx_queues; i++) -gve_tx_queue_release (dev, i); +if (gve_is_gqi (priv)) { +for (i =0 ; i < dev->data->nb_tx_queues; i++) +gve_tx_queue_release (dev, i); + +for (i =0 ; i < dev->data->nb_rx_queues; i++) +gve_rx_queue_release (dev, i); + }else { +for (i =0 ; i < dev->data->nb_tx_queues; i++) +gve_tx_queue_release_dqo (dev, i); -for (i =0 ; i < dev->data->nb_rx_queues; i++) -gve_rx_queue_release (dev, i); +for (i =0 ; i < dev->data->nb_rx_queues; i++) +gve_rx_queue_release_dqo (dev, i); + }gve_free_qpls (priv);rte_free (priv->adminq);
@@ -470,6 +478,8 @@ static const struct eth_dev_ops gve_eth_dev_ops_dqo = { .dev_infos_get = gve_dev_info_get, .rx_queue_setup = gve_rx_queue_setup_dqo, .tx_queue_setup = gve_tx_queue_setup_dqo, + .rx_queue_release = gve_rx_queue_release_dqo, + .tx_queue_release = gve_tx_queue_release_dqo, .link_update = gve_link_update, .mtu_set = gve_dev_mtu_set, };
drivers/net/gve/gve_ethdev.h +12 -0
@@ -364,4 +364,16 @@ gve_tx_queue_setup_dqo(struct rte_eth_dev *dev, uint16_t queue_id, uint16_t nb_desc, unsigned int socket_id, const struct rte_eth_txconf *conf); +void +gve_tx_queue_release_dqo (struct rte_eth_dev *dev,uint16_t qid); + +void +gve_rx_queue_release_dqo (struct rte_eth_dev *dev,uint16_t qid); + +void +gve_stop_tx_queues_dqo (struct rte_eth_dev *dev); + +void +gve_stop_rx_queues_dqo (struct rte_eth_dev *dev); +#endif /* _GVE_ETHDEV_H_ */
drivers/net/gve/gve_rx.c +4 -1
@@ -1,5 +1,5 @@/* SPDX-License-Identifier: BSD-3-Clause -* Copyright(C) 2022 Intel Corporation +* Copyright(C) 2022-2023 Intel Corporation */ #include "gve_ethdev.h"
@@ -354,6 +354,9 @@ gve_stop_rx_queues(struct rte_eth_dev *dev)uint16_t i;int err; +if (!gve_is_gqi (hw)) +return gve_stop_rx_queues_dqo (dev); + err =gve_adminq_destroy_rx_queues (hw, dev->data->nb_rx_queues);if (err !=0 )PMD_DRV_LOG (WARNING ,"failed to destroy rxqs" );
drivers/net/gve/gve_rx_dqo.c +57 -0
72 lines not on this page · raw message
drivers/net/gve/gve_tx.c +4 -1
@@ -1,5 +1,5 @@/* SPDX-License-Identifier: BSD-3-Clause -* Copyright(C) 2022 Intel Corporation +* Copyright(C) 2022-2023 Intel Corporation */ #include "gve_ethdev.h"
@@ -671,6 +671,9 @@ gve_stop_tx_queues(struct rte_eth_dev *dev)uint16_t i;int err; +if (!gve_is_gqi (hw)) +return gve_stop_tx_queues_dqo (dev); + err =gve_adminq_destroy_tx_queues (hw, dev->data->nb_tx_queues);if (err !=0 )PMD_DRV_LOG (WARNING ,"failed to destroy txqs" );
drivers/net/gve/gve_tx_dqo.c +55 -0
70 lines not on this page · raw message
Signature · 1 line
2.34.1
RFC v3 5/10 net/gve: support basic Tx data path for DQO
In reply to Junfeng GuoAdd basic Tx data path support for DQO.
--- drivers/net/gve/gve_ethdev.c | 1 + drivers/net/gve/gve_ethdev.h | 4 + drivers/net/gve/gve_tx_dqo.c | 141 +++++++++++++++++++++++++++++++++++ 3 files changed, 146 insertions(+)
drivers/net/gve/gve_ethdev.c +1 -0
@@ -766,6 +766,7 @@ gve_dev_init(struct rte_eth_dev *eth_dev) eth_dev->tx_pkt_burst = gve_tx_burst; }else { eth_dev->dev_ops = &gve_eth_dev_ops_dqo; + eth_dev->tx_pkt_burst = gve_tx_burst_dqo; } eth_dev->data->mac_addrs = &priv->dev_addr;
drivers/net/gve/gve_ethdev.h +4 -0
@@ -130,6 +130,7 @@ struct gve_tx_queue {uint8_t cur_gen_bit;uint32_t last_desc_cleaned;void **txqs; +uint16_t re_cnt;/* Only valid for DQO_RDA queue format */ struct gve_tx_queue *complq;
@@ -376,4 +377,7 @@ gve_stop_tx_queues_dqo(struct rte_eth_dev *dev);void gve_stop_rx_queues_dqo (struct rte_eth_dev *dev); +uint16_t +gve_tx_burst_dqo (void *txq,struct rte_mbuf **tx_pkts,uint16_t nb_pkts); +#endif /* _GVE_ETHDEV_H_ */
drivers/net/gve/gve_tx_dqo.c +141 -0
147 lines not on this page · raw message
Signature · 1 line
2.34.1
RFC v3 6/10 net/gve: support basic Rx data path for DQO
In reply to Junfeng GuoAdd basic Rx data path support for DQO.
--- drivers/net/gve/gve_ethdev.c | 1 + drivers/net/gve/gve_ethdev.h | 3 + drivers/net/gve/gve_rx_dqo.c | 128 +++++++++++++++++++++++++++++++++++ 3 files changed, 132 insertions(+)
drivers/net/gve/gve_ethdev.c +1 -0
@@ -766,6 +766,7 @@ gve_dev_init(struct rte_eth_dev *eth_dev) eth_dev->tx_pkt_burst = gve_tx_burst; }else { eth_dev->dev_ops = &gve_eth_dev_ops_dqo; + eth_dev->rx_pkt_burst = gve_rx_burst_dqo; eth_dev->tx_pkt_burst = gve_tx_burst_dqo; }
drivers/net/gve/gve_ethdev.h +3 -0
@@ -377,6 +377,9 @@ gve_stop_tx_queues_dqo(struct rte_eth_dev *dev);void gve_stop_rx_queues_dqo (struct rte_eth_dev *dev); +uint16_t +gve_rx_burst_dqo (void *rxq,struct rte_mbuf **rx_pkts,uint16_t nb_pkts); +uint16_t gve_tx_burst_dqo (void *txq,struct rte_mbuf **tx_pkts,uint16_t nb_pkts);
drivers/net/gve/gve_rx_dqo.c +128 -0
134 lines not on this page · raw message
Signature · 1 line
2.34.1
RE: [RFC v3 06/10] net/gve: support basic Rx data path for DQO
Quoted 144 lines
-----Original Message-----
From: Junfeng Guo <[email protected]>
Sent: Friday, February 17, 2023 1:32 AM
To: [email protected]; [email protected]; [email protected]; [email protected]
Cc: [email protected]; [email protected]; [email protected]; Junfeng Guo <[email protected]>; Rushil Gupta <[email protected]>; Jordan Kimbrough <[email protected]>; Jeroen de Borst <[email protected]>
Subject: [RFC v3 06/10] net/gve: support basic Rx data path for DQOAdd basic Rx data path support for DQO.
Signed-off-by Junfeng Guo <[email protected]>Signed-off-by Rushil Gupta <[email protected]>Signed-off-by Jordan Kimbrough <[email protected]>Signed-off-by Jeroen de Borst <[email protected]>--- drivers/net/gve/gve_ethdev.c | 1 + drivers/net/gve/gve_ethdev.h | 3 + drivers/net/gve/gve_rx_dqo.c | 128 +++++++++++++++++++++++++++++++++++ 3 files changed, 132 insertions(+)drivers/net/gve/gve_ethdev.c +1
-0@@ -766,6 +766,7 @@ gve_dev_init(struct rte_eth_dev *eth_dev) eth_dev->tx_pkt_burst = gve_tx_burst; }else { eth_dev->dev_ops = &gve_eth_dev_ops_dqo; + eth_dev->rx_pkt_burst = gve_rx_burst_dqo; eth_dev->tx_pkt_burst = gve_tx_burst_dqo; }drivers/net/gve/gve_ethdev.h +4
-0@@ -377,6 +377,9 @@ gve_stop_tx_queues_dqo(struct rte_eth_dev *dev);void gve_stop_rx_queues_dqo (struct rte_eth_dev *dev); +uint16_t +gve_rx_burst_dqo (void *rxq,struct rte_mbuf **rx_pkts,uint16_t +nb_pkts); +uint16_t gve_tx_burst_dqo (void *txq,struct rte_mbuf **tx_pkts,uint16_t nb_pkts);drivers/net/gve/gve_rx_dqo.c +34
-0@@ -5,6 +5,134 @@#include "gve_ethdev.h" #include "base/gve_adminq.h" +static inline void +gve_rx_refill_dqo (struct gve_rx_queue *rxq) { +volatile struct gve_rx_desc_dqo *rx_buf_ring; +volatile struct gve_rx_desc_dqo *rx_buf_desc; +struct rte_mbuf *nmb[rxq->free_thresh]; +uint16_t nb_refill = rxq->free_thresh; +uint16_t nb_desc = rxq->nb_rx_desc; +uint16_t next_avail = rxq->bufq_tail; +struct rte_eth_dev *dev; +uint64_t dma_addr; +uint16_t delta; +int i; + +if (rxq->nb_rx_hold < rxq->free_thresh) +return ; + + rx_buf_ring = rxq->rx_ring; + delta = nb_desc - next_avail; +if (unlikely (delta < nb_refill)) { +if (likely (rte_pktmbuf_alloc_bulk (rxq->mpool, nmb, delta) ==0 )) { +for (i =0 ; i < delta; i++) { + rx_buf_desc = &rx_buf_ring[next_avail + i]; + rxq->sw_ring[next_avail + i] = nmb[i]; + dma_addr =rte_cpu_to_le_64 (rte_mbuf_data_iova_default (nmb[i])); + rx_buf_desc->header_buf_addr =0 ; + rx_buf_desc->buf_addr = dma_addr; + } + nb_refill -= delta; + next_avail =0 ; + rxq->nb_rx_hold -= delta; + }else { + dev = &rte_eth_devices[rxq->port_id]; + dev->data->rx_mbuf_alloc_failed += nb_desc - next_avail; + PMD_DRV_LOG(DEBUG, "RX mbuf alloc failedport_id=%u queue_id=%u",
drivers/net/gve/gve_rx_dqo.c +7
-0+ rxq->port_id, rxq->queue_id); +return ; + } + } + +if (nb_desc - next_avail >= nb_refill) { + if (likely(rte_pktmbuf_alloc_bulk(rxq->mpool, nmb, nb_refill)== 0)) {
drivers/net/gve/gve_rx_dqo.c +4
-0+for (i =0 ; i < nb_refill; i++) { + rx_buf_desc = &rx_buf_ring[next_avail + i]; + rxq->sw_ring[next_avail + i] = nmb[i]; + dma_addr =rte_cpu_to_le_64(rte_mbuf_data_iova_default(nmb[i]));
drivers/net/gve/gve_rx_dqo.c +8
-0+ rx_buf_desc->header_buf_addr =0 ; + rx_buf_desc->buf_addr = dma_addr; + } + next_avail += nb_refill; + rxq->nb_rx_hold -= nb_refill; + }else { + dev = &rte_eth_devices[rxq->port_id]; + dev->data->rx_mbuf_alloc_failed += nb_desc -
next_avail;drivers/net/gve/gve_rx_dqo.c +1
-0+ PMD_DRV_LOG(DEBUG, "RX mbuf alloc failedport_id=%u queue_id=%u",
drivers/net/gve/gve_rx_dqo.c +23
-0+ rxq->port_id, rxq->queue_id); + } + } + +rte_write32 (next_avail, rxq->qrx_tail); + + rxq->bufq_tail = next_avail; +} + +uint16_t +gve_rx_burst_dqo (void *rx_queue,struct rte_mbuf **rx_pkts,uint16_t +nb_pkts) { +volatile struct gve_rx_compl_desc_dqo *rx_compl_ring; +volatile struct gve_rx_compl_desc_dqo *rx_desc; +struct gve_rx_queue *rxq; +struct rte_mbuf *rxm; +uint16_t rx_id_bufq; +uint16_t pkt_len; +uint16_t rx_id; +uint16_t nb_rx; + + nb_rx =0 ; + rxq = rx_queue;
drivers/net/gve/gve_rx_dqo.c line 95
Quoted 10 lines
drivers/net/gve/gve_rx_dqo.c +10
-0+ rx_id = rxq->rx_tail; + rx_id_bufq = rxq->next_avail; + rx_compl_ring = rxq->compl_ring; + +while (nb_rx < nb_pkts) { + rx_desc = &rx_compl_ring[rx_id]; + +/* check status */ +if (rx_desc->generation != rxq->cur_gen_bit) +break ;
From my experience with other PMDs, I think an IO read barrier is needed here to ensure other parts of descriptors are not loaded before loading rx_desc->generation.
Quoted 44 lines
drivers/net/gve/gve_rx_dqo.c +40
-1+ +if (unlikely (rx_desc->rx_error)) +continue ; + + pkt_len = rx_desc->packet_len; + + rx_id++; +if (rx_id == rxq->nb_rx_desc) { + rx_id =0 ; + rxq->cur_gen_bit ^=1 ; + } + + rxm = rxq->sw_ring[rx_id_bufq]; + rx_id_bufq++; +if (rx_id_bufq == rxq->nb_rx_desc) + rx_id_bufq =0 ; + rxq->nb_rx_hold++; + + rxm->pkt_len = pkt_len; + rxm->data_len = pkt_len; + rxm->port = rxq->port_id; + rxm->ol_flags =0 ; + + rxm->ol_flags |=RTE_MBUF_F_RX_RSS_HASH ; + rxm->hash.rss =rte_be_to_cpu_32 (rx_desc->hash); + + rx_pkts[nb_rx++] = rxm; + } + +if (nb_rx >0 ) { + rxq->rx_tail = rx_id; +if (rx_id_bufq != rxq->next_avail) + rxq->next_avail = rx_id_bufq; + +gve_rx_refill_dqo (rxq); + } + +return nb_rx; +} +static inline void gve_release_rxq_mbufs_dqo (struct gve_rx_queue *rxq) { --2.34.1
RE: [RFC v3 06/10] net/gve: support basic Rx data path for DQO
Quoted 177 lines
-----Original Message-----
From: Honnappa Nagarahalli <[email protected]>
Sent: Friday, February 17, 2023 23:18
To: Guo, Junfeng <[email protected]>; Zhang, Qi Z <[email protected]>; Wu, Jingjing <[email protected]>; [email protected]; Xing, Beilei <[email protected]>
Cc: [email protected]; Li, Xiaoyun <[email protected]>; Zhang, Helin <[email protected]>; Rushil Gupta <[email protected]>; Jordan Kimbrough <[email protected]>; Jeroen de Borst <[email protected]>; nd <[email protected]>; Honnappa Nagarahalli <[email protected]>; nd <[email protected]>
Subject: RE: [RFC v3 06/10] net/gve: support basic Rx data path for DQOQuoted 4 lines
-----Original Message-----
From: Junfeng Guo <[email protected]>
Sent: Friday, February 17, 2023 1:32 AM
To: [email protected]; [email protected];Quoted 2 lines
[email protected]
Cc: [email protected]; [email protected]; [email protected];Junfeng
Quoted 1 line
Guo <[email protected]>; Rushil Gupta <[email protected]>;
Jordan
Quoted 1 line
Kimbrough <[email protected]>; Jeroen de Borst
Quoted 8 lines
Subject: [RFC v3 06/10] net/gve: support basic Rx data path for DQO
Add basic Rx data path support for DQO.
Signed-off-by Junfeng Guo <[email protected]>Signed-off-by Rushil Gupta <[email protected]>Signed-off-by Jordan Kimbrough <[email protected]>Signed-off-by Jeroen de Borst <[email protected]>Review
Quoted 8 lines
--- drivers/net/gve/gve_ethdev.c | 1 + drivers/net/gve/gve_ethdev.h | 3 + drivers/net/gve/gve_rx_dqo.c | 128 +++++++++++++++++++++++++++++++++++ 3 files changed, 132 insertions(+)(quoted diff) +0
-0
b/drivers/net/gve/gve_ethdev.cReview
Quoted 12 lines
index
1197194e41..1c9d272c2b100644drivers/net/gve/gve_ethdev.c +1
-0@@ -766,6 +766,7 @@ gve_dev_init(struct rte_eth_dev *eth_dev) eth_dev->tx_pkt_burst = gve_tx_burst; }else { eth_dev->dev_ops = &gve_eth_dev_ops_dqo; + eth_dev->rx_pkt_burst = gve_rx_burst_dqo; eth_dev->tx_pkt_burst = gve_tx_burst_dqo; }(quoted diff) +0
-0
b/drivers/net/gve/gve_ethdev.hdrivers/net/gve/gve_ethdev.h gve_stop_tx_queues_dqo(struct rte_eth_dev
Quoted 4 lines
index
f39a0884f2..a8e0dd5f3d100644drivers/net/gve/gve_ethdev.h +0
-0@@ -377,6 +377,9 @@ gve_stop_tx_queues_dqo(struct rte_eth_dev*dev);
drivers/net/gve/gve_ethdev.h gve_stop_tx_queues_dqo(struct rte_eth_dev *dev);
Quoted 8 lines
drivers/net/gve/gve_ethdev.h +4
-0void gve_stop_rx_queues_dqo (struct rte_eth_dev *dev); +uint16_t +gve_rx_burst_dqo (void *rxq,struct rte_mbuf **rx_pkts,uint16_t +nb_pkts); +uint16_t gve_tx_burst_dqo(void *txq, struct rte_mbuf **tx_pkts, uint16_t
nb_pkts);Review
Quoted 2 lines
(quoted diff) +0
-0
b/drivers/net/gve/gve_rx_dqo.cQuoted 17 lines
index
8236cd7b50..a281b237a4100644drivers/net/gve/gve_rx_dqo.c +10
-0@@ -5,6 +5,134 @@#include "gve_ethdev.h" #include "base/gve_adminq.h" +static inline void +gve_rx_refill_dqo (struct gve_rx_queue *rxq) { +volatile struct gve_rx_desc_dqo *rx_buf_ring; +volatile struct gve_rx_desc_dqo *rx_buf_desc; +struct rte_mbuf *nmb[rxq->free_thresh]; +uint16_t nb_refill = rxq->free_thresh; +uint16_t nb_desc = rxq->nb_rx_desc; +uint16_t next_avail = rxq->bufq_tail; +struct rte_eth_dev *dev; +uint64_t dma_addr;drivers/net/gve/gve_rx_dqo.c line 27
Quoted 10 lines
drivers/net/gve/gve_rx_dqo.c +10
-0+uint16_t delta; +int i; + +if (rxq->nb_rx_hold < rxq->free_thresh) +return ; + + rx_buf_ring = rxq->rx_ring; + delta = nb_desc - next_avail; +if (unlikely (delta < nb_refill)) { + if (likely(rte_pktmbuf_alloc_bulk(rxq->mpool, nmb, delta)==
drivers/net/gve/gve_rx_dqo.c line 30
Quoted 3 lines
drivers/net/gve/gve_rx_dqo.c +2
-00)) { +for (i =0 ; i < delta; i++) { + rx_buf_desc = &rx_buf_ring[next_avail +i];
Quoted 15 lines
drivers/net/gve/gve_rx_dqo.c +12
-0+ rxq->sw_ring[next_avail + i] = nmb[i]; + dma_addr =rte_cpu_to_le_64 (rte_mbuf_data_iova_default (nmb[i])); + rx_buf_desc->header_buf_addr =0 ; + rx_buf_desc->buf_addr = dma_addr; + } + nb_refill -= delta; + next_avail =0 ; + rxq->nb_rx_hold -= delta; + }else { + dev = &rte_eth_devices[rxq->port_id]; + dev->data->rx_mbuf_alloc_failed += nb_desc - next_avail; + PMD_DRV_LOG(DEBUG, "RX mbuf alloc failedport_id=%u queue_id=%u",
drivers/net/gve/gve_rx_dqo.c
Quoted 7 lines
drivers/net/gve/gve_rx_dqo.c +7
-0+ rxq->port_id, rxq->queue_id); +return ; + } + } + +if (nb_desc - next_avail >= nb_refill) { + if (likely(rte_pktmbuf_alloc_bulk(rxq->mpool, nmb,
nb_refill)drivers/net/gve/gve_rx_dqo.c
Quoted 3 lines
== 0)) {
drivers/net/gve/gve_rx_dqo.c +2
-0+for (i =0 ; i < nb_refill; i++) { + rx_buf_desc = &rx_buf_ring[next_avail +i];
Quoted 42 lines
drivers/net/gve/gve_rx_dqo.c +2
-0+ rxq->sw_ring[next_avail + i] = nmb[i]; + dma_addr =rte_cpu_to_le_64(rte_mbuf_data_iova_default(nmb[i]));
drivers/net/gve/gve_rx_dqo.c +8
-0+ rx_buf_desc->header_buf_addr =0 ; + rx_buf_desc->buf_addr = dma_addr; + } + next_avail += nb_refill; + rxq->nb_rx_hold -= nb_refill; + }else { + dev = &rte_eth_devices[rxq->port_id]; + dev->data->rx_mbuf_alloc_failed += nb_desc -
next_avail;drivers/net/gve/gve_rx_dqo.c +1
-0+ PMD_DRV_LOG(DEBUG, "RX mbuf alloc failedport_id=%u queue_id=%u",
drivers/net/gve/gve_rx_dqo.c +28
-0+ rxq->port_id, rxq->queue_id); + } + } + +rte_write32 (next_avail, rxq->qrx_tail); + + rxq->bufq_tail = next_avail; +} + +uint16_t +gve_rx_burst_dqo (void *rx_queue,struct rte_mbuf **rx_pkts,uint16_t +nb_pkts) { +volatile struct gve_rx_compl_desc_dqo *rx_compl_ring; +volatile struct gve_rx_compl_desc_dqo *rx_desc; +struct gve_rx_queue *rxq; +struct rte_mbuf *rxm; +uint16_t rx_id_bufq; +uint16_t pkt_len; +uint16_t rx_id; +uint16_t nb_rx; + + nb_rx =0 ; + rxq = rx_queue; + rx_id = rxq->rx_tail; + rx_id_bufq = rxq->next_avail; + rx_compl_ring = rxq->compl_ring; + +while (nb_rx < nb_pkts) {
Quoted 8 lines
drivers/net/gve/gve_rx_dqo.c line 95
Quoted 5 lines
drivers/net/gve/gve_rx_dqo.c +5
-0+ rx_desc = &rx_compl_ring[rx_id]; + +/* check status */ +if (rx_desc->generation != rxq->cur_gen_bit) +break ;From my experience with other PMDs, I think an IO read barrier is needed here to ensure other parts of descriptors are not loaded before loading
rx_desc->generation.
Yes, the memory barrier should be added here to prevent the code lines being reordered by the compiler for some optimizations.
We will refine this in the coming versions. Thanks a lot!
Quoted 45 lines
Quoted 45 lines
drivers/net/gve/gve_rx_dqo.c +40
-1+ +if (unlikely (rx_desc->rx_error)) +continue ; + + pkt_len = rx_desc->packet_len; + + rx_id++; +if (rx_id == rxq->nb_rx_desc) { + rx_id =0 ; + rxq->cur_gen_bit ^=1 ; + } + + rxm = rxq->sw_ring[rx_id_bufq]; + rx_id_bufq++; +if (rx_id_bufq == rxq->nb_rx_desc) + rx_id_bufq =0 ; + rxq->nb_rx_hold++; + + rxm->pkt_len = pkt_len; + rxm->data_len = pkt_len; + rxm->port = rxq->port_id; + rxm->ol_flags =0 ; + + rxm->ol_flags |=RTE_MBUF_F_RX_RSS_HASH ; + rxm->hash.rss =rte_be_to_cpu_32 (rx_desc->hash); + + rx_pkts[nb_rx++] = rxm; + } + +if (nb_rx >0 ) { + rxq->rx_tail = rx_id; +if (rx_id_bufq != rxq->next_avail) + rxq->next_avail = rx_id_bufq; + +gve_rx_refill_dqo (rxq); + } + +return nb_rx; +} +static inline void gve_release_rxq_mbufs_dqo (struct gve_rx_queue *rxq) { --2.34.1
RFC v3 7/10 net/gve: support basic stats for DQO
In reply to Junfeng GuoAdd basic stats support for DQO.
--- drivers/net/gve/gve_ethdev.c | 2 ++ drivers/net/gve/gve_rx_dqo.c | 12 +++++++++++- drivers/net/gve/gve_tx_dqo.c | 6 ++++++ 3 files changed, 19 insertions(+), 1 deletion(-)
drivers/net/gve/gve_ethdev.c +2 -0
@@ -481,6 +481,8 @@ static const struct eth_dev_ops gve_eth_dev_ops_dqo = { .rx_queue_release = gve_rx_queue_release_dqo, .tx_queue_release = gve_tx_queue_release_dqo, .link_update = gve_link_update, + .stats_get = gve_dev_stats_get, + .stats_reset = gve_dev_stats_reset, .mtu_set = gve_dev_mtu_set, };
drivers/net/gve/gve_rx_dqo.c +11 -1
@@ -37,6 +37,7 @@ gve_rx_refill_dqo(struct gve_rx_queue *rxq) next_avail =0 ; rxq->nb_rx_hold -= delta; }else { + rxq->no_mbufs += nb_desc - next_avail; dev = &rte_eth_devices[rxq->port_id]; dev->data->rx_mbuf_alloc_failed += nb_desc - next_avail; PMD_DRV_LOG(DEBUG, "RX mbuf alloc failed port_id=%u queue_id=%u",
@@ -57,6 +58,7 @@ gve_rx_refill_dqo(struct gve_rx_queue *rxq) next_avail += nb_refill; rxq->nb_rx_hold -= nb_refill; }else { + rxq->no_mbufs += nb_desc - next_avail; dev = &rte_eth_devices[rxq->port_id]; dev->data->rx_mbuf_alloc_failed += nb_desc - next_avail; PMD_DRV_LOG(DEBUG, "RX mbuf alloc failed port_id=%u queue_id=%u",
@@ -80,7 +82,9 @@ gve_rx_burst_dqo(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)uint16_t pkt_len;uint16_t rx_id;uint16_t nb_rx; +uint64_t bytes; + bytes =0 ; nb_rx =0 ; rxq = rx_queue; rx_id = rxq->rx_tail;
@@ -94,8 +98,10 @@ gve_rx_burst_dqo(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)if (rx_desc->generation != rxq->cur_gen_bit)break ; -if (unlikely (rx_desc->rx_error)) +if (unlikely (rx_desc->rx_error)) { + rxq->errors++;continue ; + } pkt_len = rx_desc->packet_len;
@@ -120,6 +126,7 @@ gve_rx_burst_dqo(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts) rxm->hash.rss =rte_be_to_cpu_32 (rx_desc->hash); rx_pkts[nb_rx++] = rxm; + bytes += pkt_len; }if (nb_rx >0 ) {
@@ -128,6 +135,9 @@ gve_rx_burst_dqo(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts) rxq->next_avail = rx_id_bufq;gve_rx_refill_dqo (rxq); + + rxq->packets += nb_rx; + rxq->bytes += bytes; }return nb_rx;
drivers/net/gve/gve_tx_dqo.c +6 -0
@@ -80,10 +80,12 @@ gve_tx_burst_dqo(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)uint16_t nb_used;uint16_t tx_id;uint16_t sw_id; +uint64_t bytes; sw_ring = txq->sw_ring; txr = txq->tx_ring; + bytes =0 ; mask = txq->nb_tx_desc -1 ; sw_mask = txq->sw_size -1 ; tx_id = txq->tx_tail;
@@ -118,6 +120,7 @@ gve_tx_burst_dqo(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) tx_id = (tx_id +1 ) & mask; sw_id = (sw_id +1 ) & sw_mask; + bytes += tx_pkt->pkt_len; tx_pkt = tx_pkt->next; }while (tx_pkt);
@@ -141,6 +144,9 @@ gve_tx_burst_dqo(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)rte_write32 (tx_id, txq->qtx_tail); txq->tx_tail = tx_id; txq->sw_tail = sw_id; + + txq->packets += nb_tx; + txq->bytes += bytes; }return nb_tx;
Signature · 1 line
2.34.1
RE: [RFC v3 07/10] net/gve: support basic stats for DQO
Quoted 29 lines
-----Original Message-----
From: Junfeng Guo <[email protected]>
Sent: Friday, February 17, 2023 1:32 AM
To: [email protected]; [email protected]; [email protected]; [email protected]
Cc: [email protected]; [email protected]; [email protected]; Junfeng Guo <[email protected]>; Rushil Gupta <[email protected]>; Jordan Kimbrough <[email protected]>; Jeroen de Borst <[email protected]>
Subject: [RFC v3 07/10] net/gve: support basic stats for DQOAdd basic stats support for DQO.
Signed-off-by Junfeng Guo <[email protected]>Signed-off-by Rushil Gupta <[email protected]>Signed-off-by Jordan Kimbrough <[email protected]>Signed-off-by Jeroen de Borst <[email protected]>--- drivers/net/gve/gve_ethdev.c | 2 ++ drivers/net/gve/gve_rx_dqo.c | 12 +++++++++++- drivers/net/gve/gve_tx_dqo.c | 6 ++++++ 3 files changed, 19 insertions(+), 1 deletion(-)drivers/net/gve/gve_ethdev.c +0
-0
drivers/net/gve/gve_ethdev.c static const struct eth_dev_ops · line 486
Quoted 6 lines
drivers/net/gve/gve_ethdev.c +2
-0@@ -481,6 +481,8 @@ static const struct eth_dev_ops gve_eth_dev_ops_dqo = { .rx_queue_release = gve_rx_queue_release_dqo, .tx_queue_release = gve_tx_queue_release_dqo, .link_update = gve_link_update, + .stats_get = gve_dev_stats_get, + .stats_reset = gve_dev_stats_reset,
^^^^^^^^^^^^^^^^^^ I do not see this function in this patch
Quoted 110 lines
drivers/net/gve/gve_ethdev.c +0
-0.mtu_set = gve_dev_mtu_set, };drivers/net/gve/gve_rx_dqo.c +1
-0@@ -37,6 +37,7 @@ gve_rx_refill_dqo(struct gve_rx_queue *rxq) next_avail =0 ; rxq->nb_rx_hold -= delta; }else { + rxq->no_mbufs += nb_desc - next_avail; dev = &rte_eth_devices[rxq->port_id]; dev->data->rx_mbuf_alloc_failed += nb_desc - next_avail;PMD_DRV_LOG(DEBUG, "RX mbuf alloc failed
port_id=%u queue_id=%u", @@ -57,6 +58,7 @@gve_rx_refill_dqo(struct gve_rx_queue *rxq)drivers/net/gve/gve_rx_dqo.c +1
-0next_avail += nb_refill; rxq->nb_rx_hold -= nb_refill; }else { + rxq->no_mbufs += nb_desc - next_avail; dev = &rte_eth_devices[rxq->port_id]; dev->data->rx_mbuf_alloc_failed += nb_desc -
next_avail;
PMD_DRV_LOG(DEBUG, "RX mbuf alloc failed
port_id=%u queue_id=%u", @@ -80,7 +82,9 @@gve_rx_burst_dqo(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)drivers/net/gve/gve_rx_dqo.c +6
-1uint16_t pkt_len;uint16_t rx_id;uint16_t nb_rx; +uint64_t bytes; + bytes =0 ; nb_rx =0 ; rxq = rx_queue; rx_id = rxq->rx_tail;@@ -94,8 +98,10 @@ gve_rx_burst_dqo(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)if (rx_desc->generation != rxq->cur_gen_bit)break ; -if (unlikely (rx_desc->rx_error)) +if (unlikely (rx_desc->rx_error)) { + rxq->errors++;continue ; + } pkt_len = rx_desc->packet_len;@@ -120,6 +126,7 @@ gve_rx_burst_dqo(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts) rxm->hash.rss =rte_be_to_cpu_32 (rx_desc->hash); rx_pkts[nb_rx++] = rxm; + bytes += pkt_len; }drivers/net/gve/gve_rx_dqo.c +3
-0if (nb_rx >0 ) {@@ -128,6 +135,9 @@ gve_rx_burst_dqo(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts) rxq->next_avail = rx_id_bufq;gve_rx_refill_dqo (rxq); + + rxq->packets += nb_rx; + rxq->bytes += bytes; }drivers/net/gve/gve_rx_dqo.c +0
-0return nb_rx;drivers/net/gve/gve_tx_dqo.c +2
-0@@ -80,10 +80,12 @@ gve_tx_burst_dqo(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)uint16_t nb_used;uint16_t tx_id;uint16_t sw_id; +uint64_t bytes; sw_ring = txq->sw_ring; txr = txq->tx_ring; + bytes =0 ; mask = txq->nb_tx_desc -1 ; sw_mask = txq->sw_size -1 ;drivers/net/gve/gve_tx_dqo.c +4
-0tx_id = txq->tx_tail;@@ -118,6 +120,7 @@ gve_tx_burst_dqo(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) tx_id = (tx_id +1 ) & mask; sw_id = (sw_id +1 ) & sw_mask; + bytes += tx_pkt->pkt_len; tx_pkt = tx_pkt->next; }while (tx_pkt);@@ -141,6 +144,9 @@ gve_tx_burst_dqo(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)rte_write32 (tx_id, txq->qtx_tail); txq->tx_tail = tx_id; txq->sw_tail = sw_id; + + txq->packets += nb_tx; + txq->bytes += bytes; }return
nb_tx;
--
2.34.1
RFC v3 8/10 net/gve: enable Tx checksum offload for DQO
In reply to Junfeng GuoEnable Tx checksum offload once any flag of L4 checksum is set.
--- drivers/net/gve/gve_ethdev.h | 4 ++++ drivers/net/gve/gve_tx_dqo.c | 5 +++++ 2 files changed, 9 insertions(+)
drivers/net/gve/gve_ethdev.h +4 -0
@@ -38,6 +38,10 @@#define GVE_MAX_MTU RTE_ETHER_MTU#define GVE_MIN_MTU RTE_ETHER_MIN_MTU +#define GVE_TX_CKSUM_OFFLOAD_MASK ( \ + RTE_MBUF_F_TX_L4_MASK | \ + RTE_MBUF_F_TX_TCP_SEG) +/* A list of pages registered with the device during setup and used by a queue * as buffers */
drivers/net/gve/gve_tx_dqo.c +5 -0
@@ -77,6 +77,7 @@ gve_tx_burst_dqo(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)uint16_t mask, sw_mask;uint16_t nb_to_clean;uint16_t nb_tx =0 ; +uint64_t ol_flags;uint16_t nb_used;uint16_t tx_id;uint16_t sw_id;
@@ -103,6 +104,7 @@ gve_tx_burst_dqo(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)if (txq->nb_free < tx_pkt->nb_segs)break ; + ol_flags = tx_pkt->ol_flags; nb_used = tx_pkt->nb_segs; do {
@@ -127,6 +129,9 @@ gve_tx_burst_dqo(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)/* fill the last descriptor with End of Packet (EOP) bit */ txd->pkt.end_of_packet =1 ; +if (ol_flags &GVE_TX_CKSUM_OFFLOAD_MASK ) + txd->pkt.checksum_offload_enable =1 ; + txq->nb_free -= nb_used; txq->nb_used += nb_used; }
Signature · 1 line
2.34.1
RFC v3 9/10 net/gve: support jumbo frame for GQI
In reply to Junfeng GuoAdd multi-segment support to enable GQI Rx Jumbo Frame.
--- drivers/net/gve/gve_ethdev.h | 8 ++ drivers/net/gve/gve_rx.c | 137 +++++++++++++++++++++++++---------- 2 files changed, 108 insertions(+), 37 deletions(-)
drivers/net/gve/gve_ethdev.h +8 -0
@@ -142,6 +142,13 @@ struct gve_tx_queue {uint8_t is_gqi_qpl; }; +struct gve_rx_ctx { +struct rte_mbuf *mbuf_head; +struct rte_mbuf *mbuf_tail; +uint16_t total_frags; +bool drop_pkt; +}; +struct gve_rx_queue {volatile struct gve_rx_desc *rx_desc_ring;volatile union gve_rx_data_slot *rx_data_ring;
@@ -150,6 +157,7 @@ struct gve_rx_queue {uint64_t rx_ring_phys_addr;struct rte_mbuf **sw_ring;struct rte_mempool *mpool; +struct gve_rx_ctx ctx;uint16_t rx_tail;uint16_t nb_rx_desc;
drivers/net/gve/gve_rx.c +100 -37
177 lines not on this page · raw message
Signature · 1 line
2.34.1
RFC v3 10/10 net/gve: add AdminQ command to verify driver compatibility
In reply to Junfeng GuoCheck whether the driver is compatible with the device presented.
Change gve_driver_info fields to report DPDK as OS type and DPDK RTE version as OS version, reserving driver_version fields for GVE driver version based on features.
--- drivers/net/gve/base/gve.h | 3 -- drivers/net/gve/base/gve_adminq.c | 19 +++++++++ drivers/net/gve/base/gve_adminq.h | 49 ++++++++++++++++++++++- drivers/net/gve/base/gve_osdep.h | 34 ++++++++++++++++ drivers/net/gve/gve_ethdev.c | 66 +++++++++++++++++++++++++------ drivers/net/gve/gve_ethdev.h | 1 + drivers/net/gve/gve_version.c | 14 +++++++ drivers/net/gve/gve_version.h | 25 ++++++++++++ drivers/net/gve/meson.build | 1 + 9 files changed, 197 insertions(+), 15 deletions(-) create mode 100644 drivers/net/gve/gve_version.c create mode 100644 drivers/net/gve/gve_version.h
drivers/net/gve/base/gve.h +0 -3
@@ -9,9 +9,6 @@#include "gve_desc.h" #include "gve_desc_dqo.h" -#define GVE_VERSION "1.3.0" -#define GVE_VERSION_PREFIX "GVE-" -#ifndef GOOGLE_VENDOR_ID #define GOOGLE_VENDOR_ID 0x1ae0#endif
drivers/net/gve/base/gve_adminq.c +19 -0
@@ -401,6 +401,9 @@ static int gve_adminq_issue_cmd(struct gve_priv *priv,case GVE_ADMINQ_GET_PTYPE_MAP : priv->adminq_get_ptype_map_cnt++;break ; +case GVE_ADMINQ_VERIFY_DRIVER_COMPATIBILITY : + priv->adminq_verify_driver_compatibility_cnt++; +break ;default :PMD_DRV_LOG (ERR ,"unknown AQ command opcode %d" , opcode); }
@@ -859,6 +862,22 @@ int gve_adminq_report_stats(struct gve_priv *priv, u64 stats_report_len,return gve_adminq_execute_cmd (priv, &cmd); } +int gve_adminq_verify_driver_compatibility (struct gve_priv *priv, +u64 driver_info_len, +dma_addr_t driver_info_addr) +{ +union gve_adminq_command cmd; + +memset (&cmd,0 ,sizeof (cmd)); + cmd.opcode =cpu_to_be32 (GVE_ADMINQ_VERIFY_DRIVER_COMPATIBILITY ); + cmd.verify_driver_compatibility = (struct gve_adminq_verify_driver_compatibility ) { + .driver_info_len =cpu_to_be64 (driver_info_len), + .driver_info_addr =cpu_to_be64 (driver_info_addr), + }; + +return gve_adminq_execute_cmd (priv, &cmd); +} +int gve_adminq_report_link_speed (struct gve_priv *priv) {struct gve_dma_mem link_speed_region_dma_mem;
drivers/net/gve/base/gve_adminq.h +48 -1
77 lines not on this page · raw message
drivers/net/gve/base/gve_osdep.h +34 -0
@@ -21,9 +21,14 @@#include <rte_malloc.h> #include <rte_memcpy.h> #include <rte_memzone.h> +#include <rte_version.h> #include "../gve_logs.h" +#ifdef __linux__ +#include <sys/utsname.h> +#endif +typedef uint8_t u8 ;typedef uint16_t u16 ;typedef uint32_t u32 ;
@@ -73,6 +78,12 @@ typedef rte_iova_t dma_addr_t;#define msleep (ms) rte_delay_ms(ms) +#define OS_VERSION_STRLEN 128 +struct os_version_string { +char os_version_str1[OS_VERSION_STRLEN ]; +char os_version_str2[OS_VERSION_STRLEN ]; +}; +/* These macros are used to generate compilation errors if a struct/union * is not exactly the correct length. It gives a divide by zero error if * the struct/union is not of the correct size, otherwise it creates an
@@ -82,6 +93,11 @@ typedef rte_iova_t dma_addr_t; { gve_static_assert_##X = (n) / ((sizeof(struct X) == (n)) ? 1 : 0) }#define GVE_CHECK_UNION_LEN (n,X ) enum gve_static_asset_enum_##X \ { gve_static_assert_##X = (n) / ((sizeof(union X) == (n)) ? 1 : 0) } +#ifndef LINUX_VERSION_MAJOR +#define LINUX_VERSION_MAJOR (((LINUX_VERSION_CODE) >> 16) & 0xff) +#define LINUX_VERSION_SUBLEVEL (((LINUX_VERSION_CODE) >> 8) & 0xff) +#define LINUX_VERSION_PATCHLEVEL ((LINUX_VERSION_CODE) & 0xff) +#endif static __rte_always_inline u8readb (volatile void *addr)
@@ -160,4 +176,22 @@ gve_free_dma_mem(struct gve_dma_mem *mem) mem->pa = 0; } + +static inline void +populate_driver_version_strings (struct os_version_string *os_version_str) +{ +#ifdef __linux__ +struct utsname uts; +if (uname (&uts) >=0 ) { +/* OS version */ +rte_strscpy (os_version_str->os_version_str1, uts.release, +sizeof (os_version_str->os_version_str1)); +/* DPDK version */ +rte_strscpy (os_version_str->os_version_str2, uts.version, +sizeof (os_version_str->os_version_str2)); + } +#endif +} + +#endif /* _GVE_OSDEP_H_ */
drivers/net/gve/gve_ethdev.c +55 -11
88 lines not on this page · raw message
drivers/net/gve/gve_ethdev.h +1 -0
@@ -254,6 +254,7 @@ struct gve_priv {uint32_t adminq_report_stats_cnt;uint32_t adminq_report_link_speed_cnt;uint32_t adminq_get_ptype_map_cnt; +uint32_t adminq_verify_driver_compatibility_cnt;volatile uint32_t state_flags;
drivers/net/gve/gve_version.c new file +14 -0
@@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: MIT +* Google Virtual Ethernet (gve) driver +* Copyright (C) 2015-2023 Google, Inc. +*/ +#include "gve_version.h" + +const char *gve_version_string (void ) +{ +static char gve_version[10 ]; +snprintf (gve_version,sizeof (gve_version),"%s%d.%d.%d" , +GVE_VERSION_PREFIX ,GVE_VERSION_MAJOR ,GVE_VERSION_MINOR , +GVE_VERSION_SUB ); +return gve_version; +}
drivers/net/gve/gve_version.h new file +25 -0
@@ -0,0 +1,25 @@ +/* SPDX-License-Identifier: MIT +* Google Virtual Ethernet (gve) driver +* Copyright (C) 2015-2023 Google, Inc. +*/ + +#ifndef _GVE_VERSION_H_ +#define _GVE_VERSION_H_ + +#include <rte_version.h> + +#define GVE_VERSION_PREFIX "GVE-" +#define GVE_VERSION_MAJOR 0 +#define GVE_VERSION_MINOR 9 +#define GVE_VERSION_SUB 0 + +#define DPDK_VERSION_MAJOR (100 * RTE_VER_YEAR + RTE_VER_MONTH) +#define DPDK_VERSION_MINOR RTE_VER_MINOR +#define DPDK_VERSION_SUB RTE_VER_RELEASE + + +const char * +gve_version_string (void ); + + +#endif /* GVE_VERSION_H */
drivers/net/gve/meson.build +1 -0
@@ -14,5 +14,6 @@ sources = files( 'gve_rx_dqo.c', 'gve_tx_dqo.c', 'gve_ethdev.c', + 'gve_version.c', ) includes += include_directories('base')
Signature · 1 line
2.34.1