net/ena: support xstat names by ID

ENA was only supporting retrieval of all the xstats name and wasn't
implementing the eth_xstats_get_names_by_id API.

As this API may be more efficient than retrieving all the names, it
tries to avoid excessive string copying.

Signed-off-by: Michal Krawczyk <mk@semihalf.com>
Reviewed-by: Dawid Gorecki <dgr@semihalf.com>
Reviewed-by: Shai Brandes <shaibran@amazon.com>

diff --git a/doc/guides/rel_notes/release_22_03.rst b/doc/guides/rel_notes/release_22_03.rst
index f343b461df834f5fe0b1e986e6355d372464b114..bb7ab59542ac58f74583672ab6acce97087eb101 100644 (file)
--- a/doc/guides/rel_notes/release_22_03.rst
+++ b/doc/guides/rel_notes/release_22_03.rst
@@ -114,6 +114,7 @@ New Features
   * Added optimized memcpy support for the ARM platforms.
   * Added ENA admin queue support for the MP applications.
   * Added free Tx mbuf on demand feature support.
+  * Added ``rte_eth_xstats_get_names_by_id`` API support.
 
 * **Updated Cisco enic driver.**
 

diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c
index 5e7b964995260a3a8f64910bb9a089a96b98df83..11c9bb05e651fe16a1940b84bf0a83097a2f2639 100644 (file)
--- a/drivers/net/ena/ena_ethdev.c
+++ b/drivers/net/ena/ena_ethdev.c
@@ -230,6 +230,10 @@ static int eth_ena_dev_init(struct rte_eth_dev *eth_dev);
 static int ena_xstats_get_names(struct rte_eth_dev *dev,
                                struct rte_eth_xstat_name *xstats_names,
                                unsigned int n);
+static int ena_xstats_get_names_by_id(struct rte_eth_dev *dev,
+                                     const uint64_t *ids,
+                                     struct rte_eth_xstat_name *xstats_names,
+                                     unsigned int size);
 static int ena_xstats_get(struct rte_eth_dev *dev,
                          struct rte_eth_xstat *stats,
                          unsigned int n);
@@ -254,29 +258,30 @@ static int ena_mp_primary_handle(const struct rte_mp_msg *mp_msg,
                                 const void *peer);
 
 static const struct eth_dev_ops ena_dev_ops = {
-       .dev_configure        = ena_dev_configure,
-       .dev_infos_get        = ena_infos_get,
-       .rx_queue_setup       = ena_rx_queue_setup,
-       .tx_queue_setup       = ena_tx_queue_setup,
-       .dev_start            = ena_start,
-       .dev_stop             = ena_stop,
-       .link_update          = ena_link_update,
-       .stats_get            = ena_stats_get,
-       .xstats_get_names     = ena_xstats_get_names,
-       .xstats_get           = ena_xstats_get,
-       .xstats_get_by_id     = ena_xstats_get_by_id,
-       .mtu_set              = ena_mtu_set,
-       .rx_queue_release     = ena_rx_queue_release,
-       .tx_queue_release     = ena_tx_queue_release,
-       .dev_close            = ena_close,
-       .dev_reset            = ena_dev_reset,
-       .reta_update          = ena_rss_reta_update,
-       .reta_query           = ena_rss_reta_query,
-       .rx_queue_intr_enable = ena_rx_queue_intr_enable,
-       .rx_queue_intr_disable = ena_rx_queue_intr_disable,
-       .rss_hash_update      = ena_rss_hash_update,
-       .rss_hash_conf_get    = ena_rss_hash_conf_get,
-       .tx_done_cleanup      = ena_tx_cleanup,
+       .dev_configure          = ena_dev_configure,
+       .dev_infos_get          = ena_infos_get,
+       .rx_queue_setup         = ena_rx_queue_setup,
+       .tx_queue_setup         = ena_tx_queue_setup,
+       .dev_start              = ena_start,
+       .dev_stop               = ena_stop,
+       .link_update            = ena_link_update,
+       .stats_get              = ena_stats_get,
+       .xstats_get_names       = ena_xstats_get_names,
+       .xstats_get_names_by_id = ena_xstats_get_names_by_id,
+       .xstats_get             = ena_xstats_get,
+       .xstats_get_by_id       = ena_xstats_get_by_id,
+       .mtu_set                = ena_mtu_set,
+       .rx_queue_release       = ena_rx_queue_release,
+       .tx_queue_release       = ena_tx_queue_release,
+       .dev_close              = ena_close,
+       .dev_reset              = ena_dev_reset,
+       .reta_update            = ena_rss_reta_update,
+       .reta_query             = ena_rss_reta_query,
+       .rx_queue_intr_enable   = ena_rx_queue_intr_enable,
+       .rx_queue_intr_disable  = ena_rx_queue_intr_disable,
+       .rss_hash_update        = ena_rss_hash_update,
+       .rss_hash_conf_get      = ena_rss_hash_conf_get,
+       .tx_done_cleanup        = ena_tx_cleanup,
 };
 
 /*********************************************************************
@@ -3165,6 +3170,85 @@ static int ena_xstats_get_names(struct rte_eth_dev *dev,
        return xstats_count;
 }
 
+/**
+ * DPDK callback to retrieve names of extended device statistics for the given
+ * ids.
+ *
+ * @param dev
+ *   Pointer to Ethernet device structure.
+ * @param[out] xstats_names
+ *   Buffer to insert names into.
+ * @param ids
+ *   IDs array for which the names should be retrieved.
+ * @param size
+ *   Number of ids.
+ *
+ * @return
+ *   Positive value: number of xstats names. Negative value: error code.
+ */
+static int ena_xstats_get_names_by_id(struct rte_eth_dev *dev,
+                                     const uint64_t *ids,
+                                     struct rte_eth_xstat_name *xstats_names,
+                                     unsigned int size)
+{
+       uint64_t xstats_count = ena_xstats_calc_num(dev->data);
+       uint64_t id, qid;
+       unsigned int i;
+
+       if (xstats_names == NULL)
+               return xstats_count;
+
+       for (i = 0; i < size; ++i) {
+               id = ids[i];
+               if (id > xstats_count) {
+                       PMD_DRV_LOG(ERR,
+                               "ID value out of range: id=%" PRIu64 ", xstats_num=%" PRIu64 "\n",
+                                id, xstats_count);
+                       return -EINVAL;
+               }
+
+               if (id < ENA_STATS_ARRAY_GLOBAL) {
+                       strcpy(xstats_names[i].name,
+                              ena_stats_global_strings[id].name);
+                       continue;
+               }
+
+               id -= ENA_STATS_ARRAY_GLOBAL;
+               if (id < ENA_STATS_ARRAY_ENI) {
+                       strcpy(xstats_names[i].name,
+                              ena_stats_eni_strings[id].name);
+                       continue;
+               }
+
+               id -= ENA_STATS_ARRAY_ENI;
+               if (id < ENA_STATS_ARRAY_RX) {
+                       qid = id / dev->data->nb_rx_queues;
+                       id %= dev->data->nb_rx_queues;
+                       snprintf(xstats_names[i].name,
+                                sizeof(xstats_names[i].name),
+                                "rx_q%" PRIu64 "d_%s",
+                                qid, ena_stats_rx_strings[id].name);
+                       continue;
+               }
+
+               id -= ENA_STATS_ARRAY_RX;
+               /* Although this condition is not needed, it was added for
+                * compatibility if new xstat structure would be ever added.
+                */
+               if (id < ENA_STATS_ARRAY_TX) {
+                       qid = id / dev->data->nb_tx_queues;
+                       id %= dev->data->nb_tx_queues;
+                       snprintf(xstats_names[i].name,
+                                sizeof(xstats_names[i].name),
+                                "tx_q%" PRIu64 "_%s",
+                                qid, ena_stats_tx_strings[id].name);
+                       continue;
+               }
+       }
+
+       return i;
+}
+
 /**
  * DPDK callback to get extended device statistics.
  *