On 3/2/2023 10:35 AM, Mingxia Liu wrote:
> Add support for these device ops:
> - dev_xstats_get
> - dev_xstats_get_names
> - dev_xstats_reset
>
> Signed-off-by: Mingxia Liu <mingxia.liu@intel.com>
<...>
> +static int cpfl_dev_xstats_get_names(__rte_unused struct rte_eth_dev *dev,
> + struct rte_eth_xstat_name *xstats_names,
> + __rte_unused unsigned int limit)
> +{
> + unsigned int i;
> +
> + if (xstats_names)
> + for (i = 0; i < CPFL_NB_XSTATS; i++) {
> + snprintf(xstats_names[i].name,
> + sizeof(xstats_names[i].name),
> + "%s", rte_cpfl_stats_strings[i].name);
> + }
Although above is correct, can you please add {}, it is safer to do it
for multi line blocks.
> -----Original Message-----
> From: Ferruh Yigit <ferruh.yigit@amd.com>
> Sent: Thursday, March 2, 2023 5:30 PM
> To: Liu, Mingxia <mingxia.liu@intel.com>; dev@dpdk.org; Xing, Beilei
> <beilei.xing@intel.com>; Zhang, Yuying <yuying.zhang@intel.com>
> Subject: Re: [PATCH v8 21/21] net/cpfl: add xstats ops
>
> On 3/2/2023 10:35 AM, Mingxia Liu wrote:
> > Add support for these device ops:
> > - dev_xstats_get
> > - dev_xstats_get_names
> > - dev_xstats_reset
> >
> > Signed-off-by: Mingxia Liu <mingxia.liu@intel.com>
>
> <...>
>
> > +static int cpfl_dev_xstats_get_names(__rte_unused struct rte_eth_dev
> *dev,
> > + struct rte_eth_xstat_name
> *xstats_names,
> > + __rte_unused unsigned int limit) {
> > + unsigned int i;
> > +
> > + if (xstats_names)
> > + for (i = 0; i < CPFL_NB_XSTATS; i++) {
> > + snprintf(xstats_names[i].name,
> > + sizeof(xstats_names[i].name),
> > + "%s", rte_cpfl_stats_strings[i].name);
> > + }
>
>
> Although above is correct, can you please add {}, it is safer to do it for multi
> line blocks.
[Liu, Mingxia] ok, I'll add nexr version.
@@ -97,6 +97,28 @@ static const uint64_t cpfl_ipv6_rss = RTE_ETH_RSS_NONFRAG_IPV6_UDP |
RTE_ETH_RSS_NONFRAG_IPV6_OTHER |
RTE_ETH_RSS_FRAG_IPV6;
+struct rte_cpfl_xstats_name_off {
+ char name[RTE_ETH_XSTATS_NAME_SIZE];
+ unsigned int offset;
+};
+
+static const struct rte_cpfl_xstats_name_off rte_cpfl_stats_strings[] = {
+ {"rx_bytes", offsetof(struct virtchnl2_vport_stats, rx_bytes)},
+ {"rx_unicast_packets", offsetof(struct virtchnl2_vport_stats, rx_unicast)},
+ {"rx_multicast_packets", offsetof(struct virtchnl2_vport_stats, rx_multicast)},
+ {"rx_broadcast_packets", offsetof(struct virtchnl2_vport_stats, rx_broadcast)},
+ {"rx_dropped_packets", offsetof(struct virtchnl2_vport_stats, rx_discards)},
+ {"rx_errors", offsetof(struct virtchnl2_vport_stats, rx_errors)},
+ {"rx_unknown_protocol_packets", offsetof(struct virtchnl2_vport_stats,
+ rx_unknown_protocol)},
+ {"tx_bytes", offsetof(struct virtchnl2_vport_stats, tx_bytes)},
+ {"tx_unicast_packets", offsetof(struct virtchnl2_vport_stats, tx_unicast)},
+ {"tx_multicast_packets", offsetof(struct virtchnl2_vport_stats, tx_multicast)},
+ {"tx_broadcast_packets", offsetof(struct virtchnl2_vport_stats, tx_broadcast)},
+ {"tx_dropped_packets", offsetof(struct virtchnl2_vport_stats, tx_discards)},
+ {"tx_error_packets", offsetof(struct virtchnl2_vport_stats, tx_errors)}};
+
+#define CPFL_NB_XSTATS RTE_DIM(rte_cpfl_stats_strings)
static int
cpfl_dev_link_update(struct rte_eth_dev *dev,
@@ -312,6 +334,59 @@ cpfl_dev_stats_reset(struct rte_eth_dev *dev)
return 0;
}
+static int cpfl_dev_xstats_reset(struct rte_eth_dev *dev)
+{
+ cpfl_dev_stats_reset(dev);
+ return 0;
+}
+
+static int cpfl_dev_xstats_get(struct rte_eth_dev *dev,
+ struct rte_eth_xstat *xstats, unsigned int n)
+{
+ struct idpf_vport *vport =
+ (struct idpf_vport *)dev->data->dev_private;
+ struct virtchnl2_vport_stats *pstats = NULL;
+ unsigned int i;
+ int ret;
+
+ if (n < CPFL_NB_XSTATS)
+ return CPFL_NB_XSTATS;
+
+ if (!xstats)
+ return CPFL_NB_XSTATS;
+
+ ret = idpf_vc_stats_query(vport, &pstats);
+ if (ret) {
+ PMD_DRV_LOG(ERR, "Get statistics failed");
+ return 0;
+ }
+
+ idpf_vport_stats_update(&vport->eth_stats_offset, pstats);
+
+ /* loop over xstats array and values from pstats */
+ for (i = 0; i < CPFL_NB_XSTATS; i++) {
+ xstats[i].id = i;
+ xstats[i].value = *(uint64_t *)(((char *)pstats) +
+ rte_cpfl_stats_strings[i].offset);
+ }
+ return CPFL_NB_XSTATS;
+}
+
+static int cpfl_dev_xstats_get_names(__rte_unused struct rte_eth_dev *dev,
+ struct rte_eth_xstat_name *xstats_names,
+ __rte_unused unsigned int limit)
+{
+ unsigned int i;
+
+ if (xstats_names)
+ for (i = 0; i < CPFL_NB_XSTATS; i++) {
+ snprintf(xstats_names[i].name,
+ sizeof(xstats_names[i].name),
+ "%s", rte_cpfl_stats_strings[i].name);
+ }
+ return CPFL_NB_XSTATS;
+}
+
static int cpfl_config_rss_hf(struct idpf_vport *vport, uint64_t rss_hf)
{
uint64_t hena = 0;
@@ -798,6 +873,9 @@ static const struct eth_dev_ops cpfl_eth_dev_ops = {
.reta_query = cpfl_rss_reta_query,
.rss_hash_update = cpfl_rss_hash_update,
.rss_hash_conf_get = cpfl_rss_hash_conf_get,
+ .xstats_get = cpfl_dev_xstats_get,
+ .xstats_get_names = cpfl_dev_xstats_get_names,
+ .xstats_reset = cpfl_dev_xstats_reset,
};
static int