net/gve: change offloading capability
PATCH 1/2 net/gve: change offloading capability
Google Virtual NIC is not doing IPv4 checksummimg. Removed that capability from PMD.
--- drivers/net/gve/gve_ethdev.c | 1 - 1 file changed, 1 deletion(-)
drivers/net/gve/gve_ethdev.c +0 -1
@@ -282,7 +282,6 @@ gve_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) dev_info->rx_offload_capa =0 ; dev_info->tx_offload_capa =RTE_ETH_TX_OFFLOAD_MULTI_SEGS | -RTE_ETH_TX_OFFLOAD_IPV4_CKSUM |RTE_ETH_TX_OFFLOAD_UDP_CKSUM |RTE_ETH_TX_OFFLOAD_TCP_CKSUM | RTE_ETH_TX_OFFLOAD_SCTP_CKSUM |
Signature · 1 line
2.37.1 (Apple Git-137.1)
PATCH 2/2 net/gve: add extended statistics
Google Virtual NIC PMD is enriched with extended statistics info. eth_dev_ops callback names are also synched with eth_dev_ops field names
--- drivers/net/gve/gve_ethdev.c | 152 ++++++++++++++++++++++++++++++----- drivers/net/gve/gve_rx.c | 8 +- 2 files changed, 138 insertions(+), 22 deletions(-)
drivers/net/gve/gve_ethdev.c +132 -20
@@ -266,7 +266,7 @@ gve_dev_close(struct rte_eth_dev *dev) }static int -gve_dev_info_get (struct rte_eth_dev *dev,struct rte_eth_dev_info *dev_info) +gve_dev_infos_get (struct rte_eth_dev *dev,struct rte_eth_dev_info *dev_info) {struct gve_priv *priv = dev->data->dev_private;
@@ -319,15 +319,12 @@ gve_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) }static int -gve_dev_stats_get (struct rte_eth_dev *dev,struct rte_eth_stats *stats) +gve_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;
@@ -335,9 +332,6 @@ gve_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)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;
@@ -348,15 +342,12 @@ gve_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats) }static int -gve_dev_stats_reset (struct rte_eth_dev *dev) +gve_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 ;
@@ -364,9 +355,6 @@ gve_dev_stats_reset(struct rte_eth_dev *dev)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 ;
@@ -377,7 +365,7 @@ gve_dev_stats_reset(struct rte_eth_dev *dev) }static int -gve_dev_mtu_set (struct rte_eth_dev *dev,uint16_t mtu) +gve_mtu_set (struct rte_eth_dev *dev,uint16_t mtu) {struct gve_priv *priv = dev->data->dev_private;int err;
@@ -403,20 +391,144 @@ gve_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)return 0 ; } +static int +gve_xstats_get (struct rte_eth_dev *dev,struct rte_eth_xstat *xstats,unsigned int n) +{ +if (xstats) { +uint requested = n; +uint64_t indx =0 ; +struct rte_eth_xstat *xstat = xstats; +uint16_t i; + +for (i =0 ; i < dev->data->nb_rx_queues; i++) { +struct gve_rx_queue *rxq = dev->data->rx_queues[i]; + xstat->id = indx++; + xstat->value = rxq->packets; +if (--requested ==0 ) +return n; + xstat++; + + xstat->id = indx++; + xstat->value = rxq->bytes; +if (--requested ==0 ) +return n; + xstat++; + + xstat->id = indx++; + xstat->value = rxq->errors; +if (--requested ==0 ) +return n; + xstat++; + + xstat->id = indx++; + xstat->value = rxq->no_mbufs; +if (--requested ==0 ) +return n; + xstat++; + } + +for (i =0 ; i < dev->data->nb_tx_queues; i++) { +struct gve_tx_queue *txq = dev->data->tx_queues[i]; + xstat->id = indx++; + xstat->value = txq->packets; +if (--requested ==0 ) +return n; + xstat++; + + xstat->id = indx++; + xstat->value = txq->bytes; +if (--requested ==0 ) +return n; + xstat++; + + xstat->id = indx++; + xstat->value = txq->errors; +if (--requested ==0 ) +return n; + xstat++; + } + } + +return (dev->data->nb_rx_queues *4 ) + (dev->data->nb_tx_queues *3 ); +} + +static int +gve_xstats_reset (struct rte_eth_dev *dev) +{ +return gve_stats_reset (dev); +} + +static int +gve_xstats_get_names (struct rte_eth_dev *dev,struct rte_eth_xstat_name *xstats_names, +unsigned int n) +{ +if (xstats_names) { +uint requested = n; +struct rte_eth_xstat_name *xstats_name = xstats_names; +uint16_t i; + +for (i =0 ; i < dev->data->nb_rx_queues; i++) { +snprintf (xstats_name->name,sizeof (xstats_name->name), +"rx_q%d_packets" , i); +if (--requested ==0 ) +return n; + xstats_name++; +snprintf (xstats_name->name,sizeof (xstats_name->name), +"rx_q%d_bytes" , i); +if (--requested ==0 ) +return n; + xstats_name++; +snprintf (xstats_name->name,sizeof (xstats_name->name), +"rx_q%d_errors" , i); +if (--requested ==0 ) +return n; + xstats_name++; +snprintf (xstats_name->name,sizeof (xstats_name->name), +"rx_q%d_no_mbufs" , i); +if (--requested ==0 ) +return n; + xstats_name++; + } + +for (i =0 ; i < dev->data->nb_tx_queues; i++) { +snprintf (xstats_name->name,sizeof (xstats_name->name), +"tx_q%d_packets" , i); +if (--requested ==0 ) +return n; + xstats_name++; +snprintf (xstats_name->name,sizeof (xstats_name->name), +"tx_q%d_bytes" , i); +if (--requested ==0 ) +return n; + xstats_name++; +snprintf (xstats_name->name,sizeof (xstats_name->name), +"tx_q%d_errors" , i); +if (--requested ==0 ) +return n; + xstats_name++; + } + } + +return (dev->data->nb_rx_queues *4 ) + (dev->data->nb_tx_queues *3 ); +} +static const struct eth_dev_ops gve_eth_dev_ops = { .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, + .dev_infos_get = gve_dev_infos_get, .rx_queue_setup = gve_rx_queue_setup, .tx_queue_setup = gve_tx_queue_setup, .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, + .stats_get = gve_stats_get, + .stats_reset = gve_stats_reset, + .mtu_set = gve_mtu_set, + .xstats_get = gve_xstats_get, + .xstats_reset = gve_xstats_reset, + .xstats_get_names = gve_xstats_get_names, }; static void
drivers/net/gve/gve_rx.c +6 -2
@@ -22,8 +22,10 @@ gve_rx_refill(struct gve_rx_queue *rxq)if (diag <0 ) {for (i =0 ; i < nb_alloc; i++) { nmb =rte_pktmbuf_alloc (rxq->mpool); -if (!nmb) +if (!nmb) { + rxq->no_mbufs++;break ; + } rxq->sw_ring[idx + i] = nmb; }if (i != nb_alloc) {
@@ -57,8 +59,10 @@ gve_rx_refill(struct gve_rx_queue *rxq)if (diag <0 ) {for (i =0 ; i < nb_alloc; i++) { nmb =rte_pktmbuf_alloc (rxq->mpool); -if (!nmb) +if (!nmb) { + rxq->no_mbufs++;break ; + } rxq->sw_ring[idx + i] = nmb; } nb_alloc = i;
Signature · 1 line
2.37.1 (Apple Git-137.1)
Re: [PATCH 2/2] net/gve: add extended statistics
Quoted 1 line · Levend Sayar
Google Virtual NIC PMD is enriched with extended statistics info.
Only queue stats added to xstats, can you please highlight this in the commit log?
Quoted 2 lines
eth_dev_opscallback names are also synched witheth_dev_opsfield names
Renaming eth_dev_ops is not related to xstats, and I am not sure if the change is necessary, can you please drop it from this patch?
Quoted 23 lines
Signed-off-by Levend Sayar <[email protected]>--- drivers/net/gve/gve_ethdev.c | 152 ++++++++++++++++++++++++++++++----- drivers/net/gve/gve_rx.c | 8 +- 2 files changed, 138 insertions(+), 22 deletions(-)drivers/net/gve/gve_ethdev.c +1
-1@@ -266,7 +266,7 @@ gve_dev_close(struct rte_eth_dev *dev) }static int -gve_dev_info_get (struct rte_eth_dev *dev,struct rte_eth_dev_info *dev_info) +gve_dev_infos_get (struct rte_eth_dev *dev,struct rte_eth_dev_info *dev_info) {struct gve_priv *priv = dev->data->dev_private;@@ -319,15 +319,12 @@ gve_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) } static int
drivers/net/gve/gve_ethdev.c gve_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) · line 330
Quoted 10 lines
drivers/net/gve/gve_ethdev.c +1
-4-gve_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats) +gve_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 ; -
I assume check is removed because it is unnecessary, but again not directly related with the patch, can you also drop these from the patch to reduce the noise.
Quoted 50 lines
drivers/net/gve/gve_ethdev.c +2
-11stats->opackets += txq->packets; stats->obytes += txq->bytes; stats->oerrors += txq->errors;@@ -335,9 +332,6 @@ gve_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)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;@@ -348,15 +342,12 @@ gve_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats) }static int -gve_dev_stats_reset (struct rte_eth_dev *dev) +gve_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 ;@@ -364,9 +355,6 @@ gve_dev_stats_reset(struct rte_eth_dev *dev)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 ;@@ -377,7 +365,7 @@ gve_dev_stats_reset(struct rte_eth_dev *dev) }static int -gve_dev_mtu_set (struct rte_eth_dev *dev,uint16_t mtu) +gve_mtu_set (struct rte_eth_dev *dev,uint16_t mtu) {struct gve_priv *priv = dev->data->dev_private;int err;
drivers/net/gve/gve_ethdev.c gve_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu) · line 397
Quoted 7 lines
drivers/net/gve/gve_ethdev.c +4
-0@@ -403,20 +391,144 @@ gve_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)return 0 ; } +static int +gve_xstats_get (struct rte_eth_dev *dev,struct rte_eth_xstat *xstats,unsigned int n) +{ +if (xstats) {
To reduce indentation (and increase readability) you can prefer:
``
if !xstats
return count;
<put rest of logic here>
``
drivers/net/gve/gve_ethdev.c gve_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu) · line 398
Quoted 1 line
drivers/net/gve/gve_ethdev.c +1
-0+uint requested = n;
uint? C#? Please prefer standard "unsigned int" type.
drivers/net/gve/gve_ethdev.c gve_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu) · line 408
Quoted 10 lines
drivers/net/gve/gve_ethdev.c +10
-0+uint64_t indx =0 ; +struct rte_eth_xstat *xstat = xstats; +uint16_t i; + +for (i =0 ; i < dev->data->nb_rx_queues; i++) { +struct gve_rx_queue *rxq = dev->data->rx_queues[i]; + xstat->id = indx++; + xstat->value = rxq->packets; +if (--requested ==0 ) +return n;
And in this case, ethdev layer does the checks and return accordingly, so need to try to fill the stats as much as possible, can you please double check the ethdev API?
Quoted 31 lines
drivers/net/gve/gve_ethdev.c +31
-0+ xstat++; + + xstat->id = indx++; + xstat->value = rxq->bytes; +if (--requested ==0 ) +return n; + xstat++; + + xstat->id = indx++; + xstat->value = rxq->errors; +if (--requested ==0 ) +return n; + xstat++; + + xstat->id = indx++; + xstat->value = rxq->no_mbufs; +if (--requested ==0 ) +return n; + xstat++; + } + +for (i =0 ; i < dev->data->nb_tx_queues; i++) { +struct gve_tx_queue *txq = dev->data->tx_queues[i]; + xstat->id = indx++; + xstat->value = txq->packets; +if (--requested ==0 ) +return n; + xstat++; + + xstat->id = indx++; + xstat->value = txq->bytes;
drivers/net/gve/gve_ethdev.c gve_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu) · line 449
Quoted 10 lines
drivers/net/gve/gve_ethdev.c +10
-0+if (--requested ==0 ) +return n; + xstat++; + + xstat->id = indx++; + xstat->value = txq->errors; +if (--requested ==0 ) +return n; + xstat++; + }
This approach is error to prone and close to extension, many inplementations prefer to have an itnernal struct to link between names and values, something like:
struct name_offset {
char name[RTE_ETH_XSTATS_NAME_SIZE];
uint32_t offset;
};'name' holds the xstat name, for this patch it will be only repeating part of name like 'packets', 'bytes', etc.. and you need to construct the full name on the fly, that is why it you may prefer to add type to above struct to diffrenciate Rx and Tx and use it for name creation, up to you.
'offset' holds the offset of corresponding value in a struct, for you it is "struct gve_rx_queue" & "struct gve_tx_queue", since there are two different structs it helps to create helper macro that gets offset from correct struct.
struct name_offset rx_name_offset[] = {
{ "packets", offsetof(struct gve_rx_queue, packets) },
....
}for (i = 0; i < dev->data->nb_rx_queues; i++) {
struct gve_rx_queue *rxq = dev->data->rx_queues[i];
addr = (char *)rxq + rx_name_offset[i].offset;
xstats[index++].value = *addr;
}
for (i = 0; i < dev->data->nb_tx_queues; i++) {
struct gve_tx_queue *txq = dev->data->tx_queues[i];
addr = (char *)txq + tx_name_offset[i].offset;
xstats[index++].value = *addr;
}There are many sample of this in other drivers.
And since for this case instead of having fixed numbe of names, there are dynamiccaly changing queue names,
drivers/net/gve/gve_ethdev.c gve_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu) · line 452
Quoted 3 lines
drivers/net/gve/gve_ethdev.c +3
-0+ } + +return (dev->data->nb_rx_queues *4 ) + (dev->data->nb_tx_queues *3 );
When above suggested 'name_offset' struct used, you can use size of it instead of hardcoded 4 & 3 values.
With above sample, it becomes:
return (dev->data->nb_rx_queues * RTE_DIM(rx_name_offset)) +
(dev->data->nb_tx_queues * RTE_DIM(tx_name_offset));
Quoted 30 lines
drivers/net/gve/gve_ethdev.c +30
-0+} + +static int +gve_xstats_reset (struct rte_eth_dev *dev) +{ +return gve_stats_reset (dev); +} + +static int +gve_xstats_get_names (struct rte_eth_dev *dev,struct rte_eth_xstat_name *xstats_names, +unsigned int n) +{ +if (xstats_names) { +uint requested = n; +struct rte_eth_xstat_name *xstats_name = xstats_names; +uint16_t i; + +for (i =0 ; i < dev->data->nb_rx_queues; i++) { +snprintf (xstats_name->name,sizeof (xstats_name->name), +"rx_q%d_packets" , i); +if (--requested ==0 ) +return n; + xstats_name++; +snprintf (xstats_name->name,sizeof (xstats_name->name), +"rx_q%d_bytes" , i); +if (--requested ==0 ) +return n; + xstats_name++; +snprintf (xstats_name->name,sizeof (xstats_name->name), +"rx_q%d_errors" , i);
drivers/net/gve/gve_ethdev.c gve_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu) · line 492
Quoted 10 lines
drivers/net/gve/gve_ethdev.c +10
-0+if (--requested ==0 ) +return n; + xstats_name++; +snprintf (xstats_name->name,sizeof (xstats_name->name), +"rx_q%d_no_mbufs" , i); +if (--requested ==0 ) +return n; + xstats_name++; + } +
And again according above samples this becomes:
for (i = 0; i < dev->data->nb_rx_queues; i++) {
for (j = 0; j < RTE_DIM(rx_name_offset); j++) {
snprintf(xstats_names[index++].name, sizeof(), "rx_q%d_%s",
i, rx_name_offset[j].name);
}Quoted 51 lines
drivers/net/gve/gve_ethdev.c +29
-4+for (i =0 ; i < dev->data->nb_tx_queues; i++) { +snprintf (xstats_name->name,sizeof (xstats_name->name), +"tx_q%d_packets" , i); +if (--requested ==0 ) +return n; + xstats_name++; +snprintf (xstats_name->name,sizeof (xstats_name->name), +"tx_q%d_bytes" , i); +if (--requested ==0 ) +return n; + xstats_name++; +snprintf (xstats_name->name,sizeof (xstats_name->name), +"tx_q%d_errors" , i); +if (--requested ==0 ) +return n; + xstats_name++; + } + } + +return (dev->data->nb_rx_queues *4 ) + (dev->data->nb_tx_queues *3 ); +} +static const struct eth_dev_ops gve_eth_dev_ops = { .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, + .dev_infos_get = gve_dev_infos_get, .rx_queue_setup = gve_rx_queue_setup, .tx_queue_setup = gve_tx_queue_setup, .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, + .stats_get = gve_stats_get, + .stats_reset = gve_stats_reset, + .mtu_set = gve_mtu_set, + .xstats_get = gve_xstats_get, + .xstats_reset = gve_xstats_reset, + .xstats_get_names = gve_xstats_get_names, }; static voiddrivers/net/gve/gve_rx.c +0
-0
drivers/net/gve/gve_rx.c gve_rx_refill(struct gve_rx_queue *rxq) · line 26
Quoted 6 lines
drivers/net/gve/gve_rx.c +2
-1@@ -22,8 +22,10 @@ gve_rx_refill(struct gve_rx_queue *rxq)if (diag <0 ) {for (i =0 ; i < nb_alloc; i++) { nmb =rte_pktmbuf_alloc (rxq->mpool); -if (!nmb) +if (!nmb) { + rxq->no_mbufs++;
Why this is needed, original code is as following:
``
for (i = 0; i < nb_alloc; i++) {
nmb = rte_pktmbuf_alloc(rxq->mpool);
if (!nmb)
break;
rxq->sw_ring[idx + i] = nmb;
}
if (i != nb_alloc) {
rxq->no_mbufs += nb_alloc - i;
nb_alloc = i;
}``
"if (i != nb_alloc)" block already takes care of 'rxq->no_mbufs' value, is an additional increment required in the for loop?
And change is unrelated with the patch anyway.
Quoted 17 lines
drivers/net/gve/gve_rx.c +4
-1break ; + } rxq->sw_ring[idx + i] = nmb; }if (i != nb_alloc) {@@ -57,8 +59,10 @@ gve_rx_refill(struct gve_rx_queue *rxq)if (diag <0 ) {for (i =0 ; i < nb_alloc; i++) { nmb =rte_pktmbuf_alloc (rxq->mpool); -if (!nmb) +if (!nmb) { + rxq->no_mbufs++;break ; + } rxq->sw_ring[idx + i] = nmb; } nb_alloc = i;
Re: [PATCH 2/2] net/gve: add extended statistics
Ferruh,
Thanks for this detailed review.
I am setting superseded this patch and create a new one.
You’re right at all points.
For rx.no_mbufs counting, I probably overlooked while rebasing my patch and it is mixed with newly came patch.
When I check ethdev layer again, I noticed that when dev_flags has RTE_ETH_DEV_AUTOFILL_QUEUE_XSTATS Rx/tx queue stats are already added. I am pushing a fresh patch for adding rx/tx queue stats.
And also noticed a missing part at rx no_mbufs counting.
Best,
Levend
Quoted 382 lines · Ferruh Yigit
Quoted 1 line · Levend Sayar
Google Virtual NIC PMD is enriched with extended statistics info.
Only queue stats added to xstats, can you please highlight this in the commit log?
Quoted 2 lines
eth_dev_opscallback names are also synched witheth_dev_opsfield namesRenaming
eth_dev_opsis not related to xstats, and I am not sure if the change is necessary, can you please drop it from this patch?Quoted 30 lines
Signed-off-by Levend Sayar <[email protected]>---
drivers/net/gve/gve_ethdev.c| 152 ++++++++++++++++++++++++++++++-----drivers/net/gve/gve_rx.c| 8 +-2 files changed, 138 insertions(+), 22 deletions(-)drivers/net/gve/gve_ethdev.c +0
-0@@ -266,7 +266,7 @@ gve_dev_close(struct rte_eth_dev *dev) }static int
drivers/net/gve/gve_ethdev.c +1
-1-gve_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) +gve_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info){ struct gve_priv *priv = dev->data->dev_private;drivers/net/gve/gve_ethdev.c +0
-0@@ -319,15 +319,12 @@ gve_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) }static int
drivers/net/gve/gve_ethdev.c +1
-1-gve_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats) +gve_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];drivers/net/gve/gve_ethdev.c gve_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) · line 330
Quoted 3 lines
drivers/net/gve/gve_ethdev.c +0
-3-if (txq ==NULL ) -continue ; -I assume check is removed because it is unnecessary, but again not directly related with the patch, can you also drop these from the patch to reduce the noise.
Quoted 50 lines
stats->opackets += txq->packets; stats->obytes += txq->bytes; stats->oerrors += txq->errors;drivers/net/gve/gve_ethdev.c +0
-3@@ -335,9 +332,6 @@ gve_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)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;@@ -348,15 +342,12 @@ gve_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats) }static int
drivers/net/gve/gve_ethdev.c +1
-1-gve_dev_stats_reset(struct rte_eth_dev *dev) +gve_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];drivers/net/gve/gve_ethdev.c +0
-3-if (txq ==NULL ) -continue ; -txq->packets = 0; txq->bytes = 0; txq->errors = 0;drivers/net/gve/gve_ethdev.c +0
-3@@ -364,9 +355,6 @@ gve_dev_stats_reset(struct rte_eth_dev *dev)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 ;@@ -377,7 +365,7 @@ gve_dev_stats_reset(struct rte_eth_dev *dev) }static int
drivers/net/gve/gve_ethdev.c +1
-1-gve_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu) +gve_mtu_set(struct rte_eth_dev *dev, uint16_t mtu){ struct gve_priv *priv = dev->data->dev_private; int err;drivers/net/gve/gve_ethdev.c gve_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu) · line 397
Quoted 7 lines
drivers/net/gve/gve_ethdev.c +4
-0@@ -403,20 +391,144 @@ gve_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)return 0 ; } +static int +gve_xstats_get (struct rte_eth_dev *dev,struct rte_eth_xstat *xstats,unsigned int n) +{ +if (xstats) {To reduce indentation (and increase readability) you can prefer:
``
if !xstatsreturn count;<put rest of logic here>
``drivers/net/gve/gve_ethdev.c gve_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu) · line 398
Quoted 1 line
drivers/net/gve/gve_ethdev.c +1
-0+uint requested = n;uint? C#? Please prefer standard "unsigned int" type.
drivers/net/gve/gve_ethdev.c gve_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu) · line 408
Quoted 10 lines
drivers/net/gve/gve_ethdev.c +10
-0+uint64_t indx =0 ; +struct rte_eth_xstat *xstat = xstats; +uint16_t i; + +for (i =0 ; i < dev->data->nb_rx_queues; i++) { +struct gve_rx_queue *rxq = dev->data->rx_queues[i]; + xstat->id = indx++; + xstat->value = rxq->packets; +if (--requested ==0 ) +return n;And in this case, ethdev layer does the checks and return accordingly, so need to try to fill the stats as much as possible, can you please double check the ethdev API?
Quoted 31 lines
drivers/net/gve/gve_ethdev.c +31
-0+ xstat++; + + xstat->id = indx++; + xstat->value = rxq->bytes; +if (--requested ==0 ) +return n; + xstat++; + + xstat->id = indx++; + xstat->value = rxq->errors; +if (--requested ==0 ) +return n; + xstat++; + + xstat->id = indx++; + xstat->value = rxq->no_mbufs; +if (--requested ==0 ) +return n; + xstat++; + } + +for (i =0 ; i < dev->data->nb_tx_queues; i++) { +struct gve_tx_queue *txq = dev->data->tx_queues[i]; + xstat->id = indx++; + xstat->value = txq->packets; +if (--requested ==0 ) +return n; + xstat++; + + xstat->id = indx++; + xstat->value = txq->bytes;drivers/net/gve/gve_ethdev.c gve_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu) · line 449
Quoted 10 lines
drivers/net/gve/gve_ethdev.c +10
-0+if (--requested ==0 ) +return n; + xstat++; + + xstat->id = indx++; + xstat->value = txq->errors; +if (--requested ==0 ) +return n; + xstat++; + }This approach is error to prone and close to extension, many inplementations prefer to have an itnernal struct to link between names and values, something like:
struct name_offset { char name[RTE_ETH_XSTATS_NAME_SIZE]; uint32_t offset; };'name' holds the xstat name, for this patch it will be only repeating part of name like 'packets', 'bytes', etc.. and you need to construct the full name on the fly, that is why it you may prefer to add type to above struct to diffrenciate Rx and Tx and use it for name creation, up to you.
'offset' holds the offset of corresponding value in a struct, for you it is "struct
gve_rx_queue" & "structgve_tx_queue", since there are two different structs it helps to create helper macro that gets offset from correct struct.struct name_offset rx_name_offset[] = { { "packets", offsetof(struct gve_rx_queue, packets) }, .... }for (i = 0; i < dev->data->nb_rx_queues; i++) { struct gve_rx_queue *rxq = dev->data->rx_queues[i]; addr = (char *)rxq + rx_name_offset[i].offset; xstats[index++].value = *addr; } for (i = 0; i < dev->data->nb_tx_queues; i++) { struct gve_tx_queue *txq = dev->data->tx_queues[i]; addr = (char *)txq + tx_name_offset[i].offset; xstats[index++].value = *addr; }There are many sample of this in other drivers.
And since for this case instead of having fixed numbe of names, there are dynamiccaly changing queue names,
drivers/net/gve/gve_ethdev.c gve_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu) · line 452
Quoted 3 lines
drivers/net/gve/gve_ethdev.c +3
-0+ } + +return (dev->data->nb_rx_queues *4 ) + (dev->data->nb_tx_queues *3 );When above suggested '
name_offset' struct used, you can use size of it instead of hardcoded 4 & 3 values.With above sample, it becomes:
return (
dev->data->nb_rx_queues*RTE_DIM(rx_name_offset)) +(dev->data->nb_tx_queues * RTE_DIM(tx_name_offset));Quoted 30 lines
drivers/net/gve/gve_ethdev.c +30
-0+} + +static int +gve_xstats_reset (struct rte_eth_dev *dev) +{ +return gve_stats_reset (dev); +} + +static int +gve_xstats_get_names (struct rte_eth_dev *dev,struct rte_eth_xstat_name *xstats_names, +unsigned int n) +{ +if (xstats_names) { +uint requested = n; +struct rte_eth_xstat_name *xstats_name = xstats_names; +uint16_t i; + +for (i =0 ; i < dev->data->nb_rx_queues; i++) { +snprintf (xstats_name->name,sizeof (xstats_name->name), +"rx_q%d_packets" , i); +if (--requested ==0 ) +return n; + xstats_name++; +snprintf (xstats_name->name,sizeof (xstats_name->name), +"rx_q%d_bytes" , i); +if (--requested ==0 ) +return n; + xstats_name++; +snprintf (xstats_name->name,sizeof (xstats_name->name), +"rx_q%d_errors" , i);drivers/net/gve/gve_ethdev.c gve_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu) · line 492
Quoted 10 lines
drivers/net/gve/gve_ethdev.c +10
-0+if (--requested ==0 ) +return n; + xstats_name++; +snprintf (xstats_name->name,sizeof (xstats_name->name), +"rx_q%d_no_mbufs" , i); +if (--requested ==0 ) +return n; + xstats_name++; + } +And again according above samples this becomes:
for (i = 0; i < dev->data->nb_rx_queues; i++) { for (j = 0; j < RTE_DIM(rx_name_offset); j++) { snprintf(xstats_names[index++].name, sizeof(), "rx_q%d_%s", i, rx_name_offset[j].name); }Quoted 51 lines
drivers/net/gve/gve_ethdev.c +29
-4+for (i =0 ; i < dev->data->nb_tx_queues; i++) { +snprintf (xstats_name->name,sizeof (xstats_name->name), +"tx_q%d_packets" , i); +if (--requested ==0 ) +return n; + xstats_name++; +snprintf (xstats_name->name,sizeof (xstats_name->name), +"tx_q%d_bytes" , i); +if (--requested ==0 ) +return n; + xstats_name++; +snprintf (xstats_name->name,sizeof (xstats_name->name), +"tx_q%d_errors" , i); +if (--requested ==0 ) +return n; + xstats_name++; + } + } + +return (dev->data->nb_rx_queues *4 ) + (dev->data->nb_tx_queues *3 ); +} +static const struct eth_dev_ops gve_eth_dev_ops = { .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, + .dev_infos_get = gve_dev_infos_get, .rx_queue_setup = gve_rx_queue_setup, .tx_queue_setup = gve_tx_queue_setup, .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, + .stats_get = gve_stats_get, + .stats_reset = gve_stats_reset, + .mtu_set = gve_mtu_set, + .xstats_get = gve_xstats_get, + .xstats_reset = gve_xstats_reset, + .xstats_get_names = gve_xstats_get_names, };static void
drivers/net/gve/gve_rx.c +0
-0drivers/net/gve/gve_rx.c gve_rx_refill(struct gve_rx_queue *rxq) · line 26
Quoted 6 lines
drivers/net/gve/gve_rx.c +2
-1@@ -22,8 +22,10 @@ gve_rx_refill(struct gve_rx_queue *rxq)if (diag <0 ) {for (i =0 ; i < nb_alloc; i++) { nmb =rte_pktmbuf_alloc (rxq->mpool); -if (!nmb) +if (!nmb) { + rxq->no_mbufs++;Why this is needed, original code is as following:
``
for (i = 0; i < nb_alloc; i++) { nmb = rte_pktmbuf_alloc(rxq->mpool); if (!nmb) break; rxq->sw_ring[idx + i] = nmb; } if (i != nb_alloc) { rxq->no_mbufs += nb_alloc - i; nb_alloc = i; }``
"if (i !=
nb_alloc)" block already takes care of 'rxq->no_mbufs' value, is an additional increment required in the for loop?And change is unrelated with the patch anyway.
Quoted 17 lines
drivers/net/gve/gve_rx.c +4
-1break ; + } rxq->sw_ring[idx + i] = nmb; }if (i != nb_alloc) {@@ -57,8 +59,10 @@ gve_rx_refill(struct gve_rx_queue *rxq)if (diag <0 ) {for (i =0 ; i < nb_alloc; i++) { nmb =rte_pktmbuf_alloc (rxq->mpool); -if (!nmb) +if (!nmb) { + rxq->no_mbufs++;break ; + } rxq->sw_ring[idx + i] = nmb; } nb_alloc = i;
Re: [PATCH 2/2] net/gve: add extended statistics
Quoted 8 lines · Levend Sayar
Ferruh,
Thanks for this detailed review.
I am setting superseded this patch and create a new one. You’re right at all points.
For rx.no_mbufs counting, I probably overlooked while rebasing my patch and it is mixed with newly came patch.
Quoted 5 lines
When I check ethdev layer again, I noticed that when
dev_flagshas RTE_ETH_DEV_AUTOFILL_QUEUE_XSTATS
Rx/tx queue stats are already added. I am pushing a fresh patch for adding rx/tx queue stats.
Hi Levend,
You are right BUT, 'RTE_ETH_DEV_AUTOFILL_QUEUE_XSTATS' is a temporary solution and plan is to remove it [1].
Background is, queue stats in "struct rte_eth_stats" has fixed size and as number of queues supported by devices increase these fields getting bigger and bigger, the solution we came was to completely remove these fields from stats struct and get queue statistics via xstats.
During transition 'RTE_ETH_DEV_AUTOFILL_QUEUE_XSTATS' is introduced until all drivers implement queue stats in xstats. We are not pushing hard for existing drivers to update but at least requiring new drivers to implement xstats method.
That is why for net/gve updating queue stats in 'gve_dev_stats_get()' rejected before, and xstats implementation is requested.
[1]
https://elixir.bootlin.com/dpdk/v22.11.1/source/doc/guides/rel_notes/deprecation.rst#L88
Quoted 397 lines
And also noticed a missing part at rx
no_mbufscounting.Best,
LevendQuoted 390 lines · Ferruh Yigit
Quoted 1 line · Levend Sayar
Google Virtual NIC PMD is enriched with extended statistics info.
Only queue stats added to xstats, can you please highlight this in the commit log?
Quoted 2 lines
eth_dev_opscallback names are also synched witheth_dev_opsfield namesRenaming
eth_dev_opsis not related to xstats, and I am not sure if the change is necessary, can you please drop it from this patch?Quoted 33 lines
Signed-off-by Levend Sayar <[email protected]>---
drivers/net/gve/gve_ethdev.c| 152 ++++++++++++++++++++++++++++++-----drivers/net/gve/gve_rx.c| 8 +-2 files changed, 138 insertions(+), 22 deletions(-)drivers/net/gve/gve_ethdev.c +0
-0@@ -266,7 +266,7 @@ gve_dev_close(struct rte_eth_dev *dev) }static int
-gve_dev_info_get(structrte_eth_dev*dev, structrte_eth_dev_info*dev_info)
+gve_dev_infos_get(structrte_eth_dev*dev, structrte_eth_dev_info*dev_info)
{
structgve_priv*priv =dev->data->dev_private;drivers/net/gve/gve_ethdev.c +0
-0@@ -319,15 +319,12 @@ gve_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) }static int
drivers/net/gve/gve_ethdev.c +1
-1-gve_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats) +gve_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats){
uint16_ti;for (i = 0; i <
dev->data->nb_tx_queues; i++) { structgve_tx_queue*txq = dev->data->tx_queues[i];drivers/net/gve/gve_ethdev.c gve_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) · line 330
Quoted 3 lines
drivers/net/gve/gve_ethdev.c +0
-3-if (txq ==NULL ) -continue ; -I assume check is removed because it is unnecessary, but again not directly related with the patch, can you also drop these from the patch to reduce the noise.
Quoted 52 lines
stats->opackets+=txq->packets;stats->obytes+=txq->bytes;stats->oerrors+=txq->errors;drivers/net/gve/gve_ethdev.c +0
-3@@ -335,9 +332,6 @@ gve_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)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;drivers/net/gve/gve_ethdev.c +0
-0@@ -348,15 +342,12 @@ gve_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats) }static int
drivers/net/gve/gve_ethdev.c +1
-1-gve_dev_stats_reset(struct rte_eth_dev *dev) +gve_stats_reset(struct rte_eth_dev *dev){
uint16_ti;for (i = 0; i <
dev->data->nb_tx_queues; i++) { structgve_tx_queue*txq = dev->data->tx_queues[i];drivers/net/gve/gve_ethdev.c +0
-3-if (txq ==NULL ) -continue ; -
txq->packets= 0;txq->bytes= 0;txq->errors= 0;drivers/net/gve/gve_ethdev.c +0
-3@@ -364,9 +355,6 @@ gve_dev_stats_reset(struct rte_eth_dev *dev)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 ;@@ -377,7 +365,7 @@ gve_dev_stats_reset(struct rte_eth_dev *dev) }static int
drivers/net/gve/gve_ethdev.c +1
-1-gve_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu) +gve_mtu_set(struct rte_eth_dev *dev, uint16_t mtu){
structgve_priv*priv =dev->data->dev_private;
int err;drivers/net/gve/gve_ethdev.c gve_dev_mtu_set(struct rte_eth_dev *dev, · line 399
Quoted 9 lines
drivers/net/gve/gve_ethdev.c +4
-0@@ -403,20 +391,144 @@ gve_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)return 0 ; } +static int +gve_xstats_get (struct rte_eth_dev *dev,struct rte_eth_xstat *xstats,unsigned int n) +{ +if (xstats) {To reduce indentation (and increase readability) you can prefer:
``
if !xstats
return count;<put rest of logic here>
``drivers/net/gve/gve_ethdev.c gve_dev_mtu_set(struct rte_eth_dev *dev, · line 400
Quoted 1 line
drivers/net/gve/gve_ethdev.c +1
-0+uint requested = n;uint? C#? Please prefer standard "unsigned int" type.
drivers/net/gve/gve_ethdev.c gve_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu) · line 408
Quoted 10 lines
drivers/net/gve/gve_ethdev.c +10
-0+uint64_t indx =0 ; +struct rte_eth_xstat *xstat = xstats; +uint16_t i; + +for (i =0 ; i < dev->data->nb_rx_queues; i++) { +struct gve_rx_queue *rxq = dev->data->rx_queues[i]; +xstat->id = indx++; +xstat->value = rxq->packets; +if (--requested ==0 ) +return n;And in this case, ethdev layer does the checks and return accordingly, so need to try to fill the stats as much as possible, can you please double check the ethdev API?
Quoted 31 lines
drivers/net/gve/gve_ethdev.c +31
-0+xstat++; + +xstat->id = indx++; +xstat->value = rxq->bytes; +if (--requested ==0 ) +return n; +xstat++; + +xstat->id = indx++; +xstat->value = rxq->errors; +if (--requested ==0 ) +return n; +xstat++; + +xstat->id = indx++; +xstat->value = rxq->no_mbufs; +if (--requested ==0 ) +return n; +xstat++; +} + +for (i =0 ; i < dev->data->nb_tx_queues; i++) { +struct gve_tx_queue *txq = dev->data->tx_queues[i]; +xstat->id = indx++; +xstat->value = txq->packets; +if (--requested ==0 ) +return n; +xstat++; + +xstat->id = indx++; +xstat->value = txq->bytes;drivers/net/gve/gve_ethdev.c gve_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu) · line 449
Quoted 10 lines
drivers/net/gve/gve_ethdev.c +10
-0+if (--requested ==0 ) +return n; +xstat++; + +xstat->id = indx++; +xstat->value = txq->errors; +if (--requested ==0 ) +return n; +xstat++; +}This approach is error to prone and close to extension, many inplementations prefer to have an itnernal struct to link between names and values, something like:
structname_offset{
char name[RTE_ETH_XSTATS_NAME_SIZE];uint32_toffset;
};'name' holds the xstat name, for this patch it will be only repeating part of name like 'packets', 'bytes', etc.. and you need to construct the full name on the fly, that is why it you may prefer to add type to above struct to diffrenciate Rx and Tx and use it for name creation, up to you.
'offset' holds the offset of corresponding value in a struct, for you it is "struct
gve_rx_queue" & "structgve_tx_queue", since there are two different structs it helps to create helper macro that gets offset from correct struct.struct
name_offsetrx_name_offset[] = {
{ "packets",offsetof(struct gve_rx_queue, packets)},
....
}for (i = 0; i <
dev->data->nb_rx_queues; i++) { structgve_rx_queue*rxq = dev->data->rx_queues[i]; addr = (char *)rxq + rx_name_offset[i].offset; xstats[index++].value = *addr;
}
for (i = 0; i <dev->data->nb_tx_queues; i++) { structgve_tx_queue*txq = dev->data->tx_queues[i]; addr = (char *)txq + tx_name_offset[i].offset; xstats[index++].value = *addr;
}There are many sample of this in other drivers.
And since for this case instead of having fixed numbe of names, there are dynamiccaly changing queue names,
drivers/net/gve/gve_ethdev.c gve_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu) · line 452
Quoted 3 lines
drivers/net/gve/gve_ethdev.c +3
-0+} + +return (dev->data->nb_rx_queues *4 ) + (dev->data->nb_tx_queues *3 );When above suggested '
name_offset' struct used, you can use size of it instead of hardcoded 4 & 3 values.With above sample, it becomes:
return (
dev->data->nb_rx_queues*RTE_DIM(rx_name_offset)) + (dev->data->nb_tx_queues*RTE_DIM(tx_name_offset));Quoted 31 lines
drivers/net/gve/gve_ethdev.c +30
-0+} + +static int +gve_xstats_reset (struct rte_eth_dev *dev) +{ +return gve_stats_reset (dev); +} + +static int +gve_xstats_get_names (struct rte_eth_dev *dev,struct rte_eth_xstat_name *xstats_names, +unsigned int n) +{ +if (xstats_names) { +uint requested = n; +struct rte_eth_xstat_name *xstats_name = xstats_names; +uint16_t i; + +for (i =0 ; i < dev->data->nb_rx_queues; i++) { +snprintf (xstats_name->name,sizeof (xstats_name->name), +"rx_q%d_packets" , i); +if (--requested ==0 ) +return n; +xstats_name++; +snprintf (xstats_name->name,sizeof (xstats_name->name), +"rx_q%d_bytes" , i); +if (--requested ==0 ) +return n; +xstats_name++; +snprintf (xstats_name->name,sizeof (xstats_name->name), +"rx_q%d_errors" , i);drivers/net/gve/gve_ethdev.c gve_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu) · line 492
Quoted 10 lines
drivers/net/gve/gve_ethdev.c +10
-0+if (--requested ==0 ) +return n; +xstats_name++; +snprintf (xstats_name->name,sizeof (xstats_name->name), +"rx_q%d_no_mbufs" , i); +if (--requested ==0 ) +return n; +xstats_name++; +} +And again according above samples this becomes:
for (i = 0; i <
dev->data->nb_rx_queues; i++) { for (j = 0; j <RTE_DIM(rx_name_offset); j++) {snprintf(xstats_names[index++].name, sizeof(), "rx_q%d_%s", i, rx_name_offset[j].name);
}Quoted 51 lines
drivers/net/gve/gve_ethdev.c +29
-4+for (i =0 ; i < dev->data->nb_tx_queues; i++) { +snprintf (xstats_name->name,sizeof (xstats_name->name), +"tx_q%d_packets" , i); +if (--requested ==0 ) +return n; +xstats_name++; +snprintf (xstats_name->name,sizeof (xstats_name->name), +"tx_q%d_bytes" , i); +if (--requested ==0 ) +return n; +xstats_name++; +snprintf (xstats_name->name,sizeof (xstats_name->name), +"tx_q%d_errors" , i); +if (--requested ==0 ) +return n; +xstats_name++; +} +} + +return (dev->data->nb_rx_queues *4 ) + (dev->data->nb_tx_queues *3 ); +} +static const struct eth_dev_ops gve_eth_dev_ops = { .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, +.dev_infos_get = gve_dev_infos_get, .rx_queue_setup = gve_rx_queue_setup, .tx_queue_setup = gve_tx_queue_setup, .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, +.stats_get = gve_stats_get, +.stats_reset = gve_stats_reset, +.mtu_set = gve_mtu_set, +.xstats_get = gve_xstats_get, +.xstats_reset = gve_xstats_reset, +.xstats_get_names = gve_xstats_get_names,};
static void
drivers/net/gve/gve_rx.c +0
-0drivers/net/gve/gve_rx.c gve_rx_refill(struct gve_rx_queue *rxq) · line 26
Quoted 6 lines
drivers/net/gve/gve_rx.c +2
-1@@ -22,8 +22,10 @@ gve_rx_refill(struct gve_rx_queue *rxq)if (diag <0 ) {for (i =0 ; i < nb_alloc; i++) { nmb =rte_pktmbuf_alloc (rxq->mpool); -if (!nmb) +if (!nmb) { +rxq->no_mbufs++;Why this is needed, original code is as following:
``
for (i = 0; i <nb_alloc; i++) {
nmb =rte_pktmbuf_alloc(rxq->mpool);
if (!nmb)
break;
rxq->sw_ring[idx + i] = nmb;
}
if (i !=nb_alloc) {rxq->no_mbufs+=nb_alloc- i;nb_alloc= i;
}
``"if (i !=
nb_alloc)" block already takes care of 'rxq->no_mbufs' value, is an additional increment required in the for loop?And change is unrelated with the patch anyway.
Quoted 17 lines
drivers/net/gve/gve_rx.c +4
-1break ; +} rxq->sw_ring[idx + i] = nmb; }if (i != nb_alloc) {@@ -57,8 +59,10 @@ gve_rx_refill(struct gve_rx_queue *rxq)if (diag <0 ) {for (i =0 ; i < nb_alloc; i++) { nmb =rte_pktmbuf_alloc (rxq->mpool); -if (!nmb) +if (!nmb) { +rxq->no_mbufs++;break ; +} rxq->sw_ring[idx + i] = nmb; } nb_alloc = i;
Re: [PATCH 2/2] net/gve: add extended statistics
Hi Ferruh,
Opps, I was not aware of that rejection.
Thanks for notification.
Let me supersede this patch.
And create a new one.
Best,
Levend
Quoted 438 lines · Ferruh Yigit
Quoted 8 lines · Levend Sayar
Ferruh,
Thanks for this detailed review.
I am setting superseded this patch and create a new one. You’re right at all points.
For rx.no_mbufs counting, I probably overlooked while rebasing my patch and it is mixed with newly came patch.Quoted 5 lines
When I check ethdev layer again, I noticed that when
dev_flagshasRTE_ETH_DEV_AUTOFILL_QUEUE_XSTATS
Rx/tx queue stats are already added. I am pushing a fresh patch for adding rx/tx queue stats.Hi Levend,
You are right BUT, '
RTE_ETH_DEV_AUTOFILL_QUEUE_XSTATS' is a temporary solution and plan is to remove it [1].Background is, queue stats in "struct
rte_eth_stats" has fixed size and as number of queues supported by devices increase these fields getting bigger and bigger, the solution we came was to completely remove these fields from stats struct and get queue statistics via xstats.During transition '
RTE_ETH_DEV_AUTOFILL_QUEUE_XSTATS' is introduced until all drivers implement queue stats in xstats. We are not pushing hard for existing drivers to update but at least requiring new drivers to implement xstats method.That is why for net/gve updating queue stats in '
gve_dev_stats_get()' rejected before, and xstats implementation is requested.[1]
https://elixir.bootlin.com/dpdk/v22.11.1/source/doc/guides/rel_notes/deprecation.rst#L88Quoted 397 lines
And also noticed a missing part at rx
no_mbufscounting.Best,
LevendQuoted 390 lines · Ferruh Yigit
Quoted 1 line · Levend Sayar
Google Virtual NIC PMD is enriched with extended statistics info.
Only queue stats added to xstats, can you please highlight this in the commit log?
Quoted 2 lines
eth_dev_opscallback names are also synched witheth_dev_opsfield namesRenaming
eth_dev_opsis not related to xstats, and I am not sure if the change is necessary, can you please drop it from this patch?Quoted 33 lines
Signed-off-by Levend Sayar <[email protected]>---
drivers/net/gve/gve_ethdev.c| 152 ++++++++++++++++++++++++++++++-----drivers/net/gve/gve_rx.c| 8 +-2 files changed, 138 insertions(+), 22 deletions(-)drivers/net/gve/gve_ethdev.c +0
-0@@ -266,7 +266,7 @@ gve_dev_close(struct rte_eth_dev *dev) }static int
-gve_dev_info_get(structrte_eth_dev*dev, structrte_eth_dev_info*dev_info)
+gve_dev_infos_get(structrte_eth_dev*dev, structrte_eth_dev_info*dev_info)
{
structgve_priv*priv =dev->data->dev_private;drivers/net/gve/gve_ethdev.c +0
-0@@ -319,15 +319,12 @@ gve_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) }static int
drivers/net/gve/gve_ethdev.c +1
-1-gve_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats) +gve_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats){
uint16_ti;for (i = 0; i <
dev->data->nb_tx_queues; i++) { structgve_tx_queue*txq = dev->data->tx_queues[i];drivers/net/gve/gve_ethdev.c gve_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) · line 330
Quoted 3 lines
drivers/net/gve/gve_ethdev.c +0
-3-if (txq ==NULL ) -continue ; -I assume check is removed because it is unnecessary, but again not directly related with the patch, can you also drop these from the patch to reduce the noise.
Quoted 52 lines
stats->opackets+=txq->packets;stats->obytes+=txq->bytes;stats->oerrors+=txq->errors;drivers/net/gve/gve_ethdev.c +0
-3@@ -335,9 +332,6 @@ gve_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)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;drivers/net/gve/gve_ethdev.c +0
-0@@ -348,15 +342,12 @@ gve_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats) }static int
drivers/net/gve/gve_ethdev.c +1
-1-gve_dev_stats_reset(struct rte_eth_dev *dev) +gve_stats_reset(struct rte_eth_dev *dev){
uint16_ti;for (i = 0; i <
dev->data->nb_tx_queues; i++) { structgve_tx_queue*txq = dev->data->tx_queues[i];drivers/net/gve/gve_ethdev.c +0
-3-if (txq ==NULL ) -continue ; -
txq->packets= 0;txq->bytes= 0;txq->errors= 0;drivers/net/gve/gve_ethdev.c +0
-3@@ -364,9 +355,6 @@ gve_dev_stats_reset(struct rte_eth_dev *dev)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 ;@@ -377,7 +365,7 @@ gve_dev_stats_reset(struct rte_eth_dev *dev) }static int
drivers/net/gve/gve_ethdev.c +1
-1-gve_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu) +gve_mtu_set(struct rte_eth_dev *dev, uint16_t mtu){
structgve_priv*priv =dev->data->dev_private; int err;drivers/net/gve/gve_ethdev.c gve_dev_mtu_set(struct rte_eth_dev *dev, · line 399
Quoted 9 lines
drivers/net/gve/gve_ethdev.c +4
-0@@ -403,20 +391,144 @@ gve_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)return 0 ; } +static int +gve_xstats_get (struct rte_eth_dev *dev,struct rte_eth_xstat *xstats,unsigned int n) +{ +if (xstats) {To reduce indentation (and increase readability) you can prefer:
``
if !xstats
return count;<put rest of logic here>
``drivers/net/gve/gve_ethdev.c gve_dev_mtu_set(struct rte_eth_dev *dev, · line 400
Quoted 1 line
drivers/net/gve/gve_ethdev.c +1
-0+uint requested = n;uint? C#? Please prefer standard "unsigned int" type.
drivers/net/gve/gve_ethdev.c gve_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu) · line 408
Quoted 10 lines
drivers/net/gve/gve_ethdev.c +10
-0+uint64_t indx =0 ; +struct rte_eth_xstat *xstat = xstats; +uint16_t i; + +for (i =0 ; i < dev->data->nb_rx_queues; i++) { +struct gve_rx_queue *rxq = dev->data->rx_queues[i]; +xstat->id = indx++; +xstat->value = rxq->packets; +if (--requested ==0 ) +return n;And in this case, ethdev layer does the checks and return accordingly, so need to try to fill the stats as much as possible, can you please double check the ethdev API?
Quoted 31 lines
drivers/net/gve/gve_ethdev.c +31
-0+xstat++; + +xstat->id = indx++; +xstat->value = rxq->bytes; +if (--requested ==0 ) +return n; +xstat++; + +xstat->id = indx++; +xstat->value = rxq->errors; +if (--requested ==0 ) +return n; +xstat++; + +xstat->id = indx++; +xstat->value = rxq->no_mbufs; +if (--requested ==0 ) +return n; +xstat++; +} + +for (i =0 ; i < dev->data->nb_tx_queues; i++) { +struct gve_tx_queue *txq = dev->data->tx_queues[i]; +xstat->id = indx++; +xstat->value = txq->packets; +if (--requested ==0 ) +return n; +xstat++; + +xstat->id = indx++; +xstat->value = txq->bytes;drivers/net/gve/gve_ethdev.c gve_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu) · line 449
Quoted 10 lines
drivers/net/gve/gve_ethdev.c +10
-0+if (--requested ==0 ) +return n; +xstat++; + +xstat->id = indx++; +xstat->value = txq->errors; +if (--requested ==0 ) +return n; +xstat++; +}This approach is error to prone and close to extension, many inplementations prefer to have an itnernal struct to link between names and values, something like:
structname_offset{
char name[RTE_ETH_XSTATS_NAME_SIZE];uint32_toffset;
};'name' holds the xstat name, for this patch it will be only repeating part of name like 'packets', 'bytes', etc.. and you need to construct the full name on the fly, that is why it you may prefer to add type to above struct to diffrenciate Rx and Tx and use it for name creation, up to you.
'offset' holds the offset of corresponding value in a struct, for you it is "struct
gve_rx_queue" & "structgve_tx_queue", since there are two different structs it helps to create helper macro that gets offset from correct struct.struct
name_offsetrx_name_offset[] = {
{ "packets",offsetof(struct gve_rx_queue, packets)},.... }for (i = 0; i <
dev->data->nb_rx_queues; i++) { structgve_rx_queue*rxq = dev->data->rx_queues[i]; addr = (char *)rxq + rx_name_offset[i].offset; xstats[index++].value = *addr;
}
for (i = 0; i <dev->data->nb_tx_queues; i++) { structgve_tx_queue*txq = dev->data->tx_queues[i]; addr = (char *)txq + tx_name_offset[i].offset; xstats[index++].value = *addr;
}There are many sample of this in other drivers.
And since for this case instead of having fixed numbe of names, there are dynamiccaly changing queue names,
drivers/net/gve/gve_ethdev.c gve_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu) · line 452
Quoted 3 lines
drivers/net/gve/gve_ethdev.c +3
-0+} + +return (dev->data->nb_rx_queues *4 ) + (dev->data->nb_tx_queues *3 );When above suggested '
name_offset' struct used, you can use size of it instead of hardcoded 4 & 3 values.With above sample, it becomes:
return (
dev->data->nb_rx_queues*RTE_DIM(rx_name_offset)) + (dev->data->nb_tx_queues*RTE_DIM(tx_name_offset));Quoted 31 lines
drivers/net/gve/gve_ethdev.c +30
-0+} + +static int +gve_xstats_reset (struct rte_eth_dev *dev) +{ +return gve_stats_reset (dev); +} + +static int +gve_xstats_get_names (struct rte_eth_dev *dev,struct rte_eth_xstat_name *xstats_names, +unsigned int n) +{ +if (xstats_names) { +uint requested = n; +struct rte_eth_xstat_name *xstats_name = xstats_names; +uint16_t i; + +for (i =0 ; i < dev->data->nb_rx_queues; i++) { +snprintf (xstats_name->name,sizeof (xstats_name->name), +"rx_q%d_packets" , i); +if (--requested ==0 ) +return n; +xstats_name++; +snprintf (xstats_name->name,sizeof (xstats_name->name), +"rx_q%d_bytes" , i); +if (--requested ==0 ) +return n; +xstats_name++; +snprintf (xstats_name->name,sizeof (xstats_name->name), +"rx_q%d_errors" , i);drivers/net/gve/gve_ethdev.c gve_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu) · line 492
Quoted 10 lines
drivers/net/gve/gve_ethdev.c +10
-0+if (--requested ==0 ) +return n; +xstats_name++; +snprintf (xstats_name->name,sizeof (xstats_name->name), +"rx_q%d_no_mbufs" , i); +if (--requested ==0 ) +return n; +xstats_name++; +} +And again according above samples this becomes:
for (i = 0; i < dev->data->nb_rx_queues; i++) { for (j = 0; j < RTE_DIM(rx_name_offset); j++) {
snprintf(xstats_names[index++].name, sizeof(), "rx_q%d_%s", i, rx_name_offset[j].name);
}Quoted 51 lines
drivers/net/gve/gve_ethdev.c +29
-4+for (i =0 ; i < dev->data->nb_tx_queues; i++) { +snprintf (xstats_name->name,sizeof (xstats_name->name), +"tx_q%d_packets" , i); +if (--requested ==0 ) +return n; +xstats_name++; +snprintf (xstats_name->name,sizeof (xstats_name->name), +"tx_q%d_bytes" , i); +if (--requested ==0 ) +return n; +xstats_name++; +snprintf (xstats_name->name,sizeof (xstats_name->name), +"tx_q%d_errors" , i); +if (--requested ==0 ) +return n; +xstats_name++; +} +} + +return (dev->data->nb_rx_queues *4 ) + (dev->data->nb_tx_queues *3 ); +} +static const struct eth_dev_ops gve_eth_dev_ops = { .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, +.dev_infos_get = gve_dev_infos_get, .rx_queue_setup = gve_rx_queue_setup, .tx_queue_setup = gve_tx_queue_setup, .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, +.stats_get = gve_stats_get, +.stats_reset = gve_stats_reset, +.mtu_set = gve_mtu_set, +.xstats_get = gve_xstats_get, +.xstats_reset = gve_xstats_reset, +.xstats_get_names = gve_xstats_get_names,};
static void
drivers/net/gve/gve_rx.c +0
-0drivers/net/gve/gve_rx.c gve_rx_refill(struct gve_rx_queue *rxq) · line 26
Quoted 6 lines
drivers/net/gve/gve_rx.c +2
-1@@ -22,8 +22,10 @@ gve_rx_refill(struct gve_rx_queue *rxq)if (diag <0 ) {for (i =0 ; i < nb_alloc; i++) { nmb =rte_pktmbuf_alloc (rxq->mpool); -if (!nmb) +if (!nmb) { +rxq->no_mbufs++;Why this is needed, original code is as following:
``
for (i = 0; i <nb_alloc; i++) {
nmb =rte_pktmbuf_alloc(rxq->mpool);
if (!nmb)
break;
rxq->sw_ring[idx + i] = nmb;
}
if (i !=nb_alloc) {rxq->no_mbufs+=nb_alloc- i;nb_alloc= i;
}
``"if (i !=
nb_alloc)" block already takes care of 'rxq->no_mbufs' value, is an additional increment required in the for loop?And change is unrelated with the patch anyway.
Quoted 17 lines
drivers/net/gve/gve_rx.c +4
-1break ; +} rxq->sw_ring[idx + i] = nmb; }if (i != nb_alloc) {@@ -57,8 +59,10 @@ gve_rx_refill(struct gve_rx_queue *rxq)if (diag <0 ) {for (i =0 ; i < nb_alloc; i++) { nmb =rte_pktmbuf_alloc (rxq->mpool); -if (!nmb) +if (!nmb) { +rxq->no_mbufs++;break ; +} rxq->sw_ring[idx + i] = nmb; } nb_alloc = i;
Makes sense. The virtual device only does L4 checksum.
Quoted 25 lines · Levend Sayar
Google Virtual NIC is not doing IPv4 checksummimg. Removed that capability from PMD.
Signed-off-by Levend Sayar <[email protected]>--- drivers/net/gve/gve_ethdev.c | 1 - 1 file changed, 1 deletion(-)drivers/net/gve/gve_ethdev.c +0
-1@@ -282,7 +282,6 @@ gve_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) dev_info->rx_offload_capa = 0; dev_info->tx_offload_capa =RTE_ETH_TX_OFFLOAD_MULTI_SEGS | -RTE_ETH_TX_OFFLOAD_IPV4_CKSUM |RTE_ETH_TX_OFFLOAD_UDP_CKSUM | RTE_ETH_TX_OFFLOAD_TCP_CKSUM |
RTE_ETH_TX_OFFLOAD_SCTP_CKSUM|
--
2.37.1 (Apple Git-137.1)
Thanks Rushil for acknowledging.
Best,
Levend
Quoted 30 lines · Rushil Gupta
Makes sense. The virtual device only does L4 checksum.
Acked-by Rushil Gupta <[email protected] <mailto:[email protected]>>Quoted 23 lines · On Thu, Feb 16, 2023 at 10:58 AM Levend Sayar <[email protected]…
Google Virtual NIC is not doing IPv4 checksummimg. Removed that capability from PMD.
Signed-off-by Levend Sayar <[email protected] <mailto:[email protected]>>--- drivers/net/gve/gve_ethdev.c | 1 - 1 file changed, 1 deletion(-)drivers/net/gve/gve_ethdev.c +0
-1@@ -282,7 +282,6 @@ gve_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) dev_info->rx_offload_capa =0 ; dev_info->tx_offload_capa =RTE_ETH_TX_OFFLOAD_MULTI_SEGS | -RTE_ETH_TX_OFFLOAD_IPV4_CKSUM |RTE_ETH_TX_OFFLOAD_UDP_CKSUM |RTE_ETH_TX_OFFLOAD_TCP_CKSUM | RTE_ETH_TX_OFFLOAD_SCTP_CKSUM |Signature · 1 line
2.37.1 (Apple Git-137.1)
Quoted 9 lines
-----Original Message-----
From: Levend Sayar <[email protected]>
Sent: Friday, February 17, 2023 02:58
To: Guo, Junfeng <[email protected]>
Cc: [email protected]; Levend Sayar <[email protected]>
Subject: [PATCH 1/2] net/gve: change offloading capability
Quoted 5 lines
Google Virtual NIC is not doing IPv4 checksummimg. Removed that capability from PMD.
Signed-off-by Levend Sayar <[email protected]>---
Regards,
Junfeng Guo
Thanks Junfeng for acknowledging.
Best,
Levend
Quoted 21 lines · Junfeng
Quoted 10 lines
-----Original Message-----
From: Levend Sayar <[email protected]>
Sent: Friday, February 17, 2023 02:58
To: Guo, Junfeng <[email protected]>
Cc: [email protected]; Levend Sayar <[email protected]>
Subject: [PATCH 1/2] net/gve: change offloading capabilityQuoted 5 lines
Google Virtual NIC is not doing IPv4 checksummimg. Removed that capability from PMD.
Signed-off-by Levend Sayar <[email protected]>---
Acked-by Junfeng Guo <[email protected] <mailto:[email protected]>>Regards,
Junfeng Guo
Ferruh Yigit
AppliedQuoted 12 lines · Junfeng
Quoted 12 lines
-----Original Message-----
From: Levend Sayar <[email protected]>
Sent: Friday, February 17, 2023 02:58
To: Guo, Junfeng <[email protected]>
Cc: [email protected]; Levend Sayar <[email protected]>
Subject: [PATCH 1/2] net/gve: change offloading capabilityGoogle Virtual NIC is not doing IPv4 checksummimg. Removed that capability from PMD.
Quoted 7 lines
Quoted 2 lines
Signed-off-by Levend Sayar <[email protected]>---
Acked-by Junfeng Guo <[email protected]>Acked-by Rushil Gupta <[email protected]>
Fixes: a46583cf43c8 ("net/gve: support Rx/Tx")
Cc: [email protected]Added Rushil's name to .mailmap while merging.
Patch 2/2 is not merged and it can progress independently.
Applied to dpdk-next-net/main, thanks.