From: "David Harton (dharton)" <dharton@cisco.com>
To: Remy Horton <remy.horton@intel.com>,
"dev@dpdk.org" <dev@dpdk.org>,
"Helin Zhang" <helin.zhang@intel.com>
Subject: Re: [dpdk-dev] [RFC PATCH v1 2/3] drivers/net/ixgbe: change xstats to use integers
Date: Fri, 29 Apr 2016 13:43:38 +0000 [thread overview]
Message-ID: <34cbe07723f64e9f926666164d9d5319@XCH-RCD-016.cisco.com> (raw)
In-Reply-To: <1460731462-21229-3-git-send-email-remy.horton@intel.com>
> -----Original Message-----
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Remy Horton
> Sent: Friday, April 15, 2016 10:44 AM
> To: dev@dpdk.org; Helin Zhang <helin.zhang@intel.com>
> Subject: [dpdk-dev] [RFC PATCH v1 2/3] drivers/net/ixgbe: change xstats to
> use integers
>
> Signed-off-by: Remy Horton <remy.horton@intel.com>
> ---
> drivers/net/ixgbe/ixgbe_ethdev.c | 87
> +++++++++++++++++++++++++++++++++++-----
> 1 file changed, 78 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c
> b/drivers/net/ixgbe/ixgbe_ethdev.c
> index 3f1ebc1..4d31fe9 100644
> --- a/drivers/net/ixgbe/ixgbe_ethdev.c
> +++ b/drivers/net/ixgbe/ixgbe_ethdev.c
> @@ -179,6 +179,10 @@ static int ixgbevf_dev_xstats_get(struct rte_eth_dev
> *dev,
> struct rte_eth_xstats *xstats, unsigned n);
> static void ixgbe_dev_stats_reset(struct rte_eth_dev *dev);
> static void ixgbe_dev_xstats_reset(struct rte_eth_dev *dev);
> +static int ixgbe_dev_xstats_names(__rte_unused struct rte_eth_dev *dev,
> + struct rte_eth_xstats_name *ptr_names, __rte_unused unsigned limit);
> +static int ixgbevf_dev_xstats_names(__rte_unused struct rte_eth_dev *dev,
> + struct rte_eth_xstats_name *ptr_names, __rte_unused unsigned limit);
> static int ixgbe_dev_queue_stats_mapping_set(struct rte_eth_dev *eth_dev,
> uint16_t queue_id,
> uint8_t stat_idx,
> @@ -466,6 +470,7 @@ static const struct eth_dev_ops ixgbe_eth_dev_ops = {
> .xstats_get = ixgbe_dev_xstats_get,
> .stats_reset = ixgbe_dev_stats_reset,
> .xstats_reset = ixgbe_dev_xstats_reset,
> + .xstats_names = ixgbe_dev_xstats_names,
> .queue_stats_mapping_set = ixgbe_dev_queue_stats_mapping_set,
> .dev_infos_get = ixgbe_dev_info_get,
> .dev_supported_ptypes_get = ixgbe_dev_supported_ptypes_get,
> @@ -555,6 +560,7 @@ static const struct eth_dev_ops ixgbevf_eth_dev_ops =
> {
> .xstats_get = ixgbevf_dev_xstats_get,
> .stats_reset = ixgbevf_dev_stats_reset,
> .xstats_reset = ixgbevf_dev_stats_reset,
> + .xstats_names = ixgbevf_dev_xstats_names,
> .dev_close = ixgbevf_dev_close,
> .allmulticast_enable = ixgbevf_dev_allmulticast_enable,
> .allmulticast_disable = ixgbevf_dev_allmulticast_disable,
> @@ -2698,6 +2704,76 @@ ixgbe_xstats_calc_num(void) {
> (IXGBE_NB_TXQ_PRIO_STATS * 8);
> }
>
> +static int ixgbe_dev_xstats_names(__rte_unused struct rte_eth_dev *dev,
> + struct rte_eth_xstats_name *ptr_names, __rte_unused unsigned limit)
> +{
> + const unsigned cnt_stats = ixgbe_xstats_calc_num();
> + unsigned stat, i, count, offset;
> +
> + if (ptr_names != NULL) {
> + count = 0;
> + offset = 0;
> +
> + /* Note: limit >= cnt_stats checked upstream
> + * in rte_eth_xstats_names()
> + */
> +
> + /* Extended stats from ixgbe_hw_stats */
> + for (i = 0; i < IXGBE_NB_HW_STATS; i++) {
> + snprintf(ptr_names[count].name,
> + sizeof(ptr_names[count].name),
> + "%s",
> + rte_ixgbe_stats_strings[i].name);
> + count++;
> + offset += RTE_ETH_XSTATS_NAME_SIZE;
> + }
> +
> + /* RX Priority Stats */
> + for (stat = 0; stat < IXGBE_NB_RXQ_PRIO_STATS; stat++) {
> + for (i = 0; i < 8; i++) {
8 seems magical. Is there a constant somewhere that can be used?
> + snprintf(ptr_names[count].name,
> + sizeof(ptr_names[count].name),
> + "rx_priority%u_%s", i,
> + rte_ixgbe_rxq_strings[stat].name);
> + count++;
> + offset += RTE_ETH_XSTATS_NAME_SIZE;
> + }
> + }
> +
> + /* TX Priority Stats */
> + for (stat = 0; stat < IXGBE_NB_TXQ_PRIO_STATS; stat++) {
> + for (i = 0; i < 8; i++) {
Same magic number.
> + snprintf(ptr_names[count].name,
> + sizeof(ptr_names[count].name),
> + "tx_priority%u_%s", i,
> + rte_ixgbe_txq_strings[stat].name);
> + count++;
> + offset += RTE_ETH_XSTATS_NAME_SIZE;
> + }
> + }
> + /* FIXME: Debugging check */
Just a reminder to cleanup.
> + if (cnt_stats != count)
> + return -EIO;
> + }
> + return cnt_stats;
> +}
> +
> +static int ixgbevf_dev_xstats_names(__rte_unused struct rte_eth_dev *dev,
> + struct rte_eth_xstats_name *ptr_names, __rte_unused unsigned limit)
> +{
> + unsigned i;
> +
> + if (limit < IXGBEVF_NB_XSTATS)
Think this check has to be removed since rte_eth_xstats_count() calls with
limit == 0.
> + return -ENOMEM;
> +
> + if (ptr_names != NULL)
> + for (i = 0; i < IXGBEVF_NB_XSTATS; i++)
> + snprintf(ptr_names[i].name,
> + sizeof(ptr_names[i].name),
> + "%s", rte_ixgbevf_stats_strings[i].name);
> + return IXGBEVF_NB_XSTATS;
> +}
> +
> static int
> ixgbe_dev_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstats
> *xstats,
> unsigned n)
> @@ -2731,8 +2807,6 @@ ixgbe_dev_xstats_get(struct rte_eth_dev *dev, struct
> rte_eth_xstats *xstats,
> /* Extended stats from ixgbe_hw_stats */
> count = 0;
> for (i = 0; i < IXGBE_NB_HW_STATS; i++) {
> - snprintf(xstats[count].name, sizeof(xstats[count].name), "%s",
> - rte_ixgbe_stats_strings[i].name);
Forgot to add key/id.
Also, same name comment as above.
> xstats[count].value = *(uint64_t *)(((char *)hw_stats) +
> rte_ixgbe_stats_strings[i].offset);
> count++;
> @@ -2741,9 +2815,6 @@ ixgbe_dev_xstats_get(struct rte_eth_dev *dev, struct
> rte_eth_xstats *xstats,
> /* RX Priority Stats */
> for (stat = 0; stat < IXGBE_NB_RXQ_PRIO_STATS; stat++) {
> for (i = 0; i < 8; i++) {
> - snprintf(xstats[count].name, sizeof(xstats[count].name),
> - "rx_priority%u_%s", i,
> - rte_ixgbe_rxq_strings[stat].name);
Add key/id...terminate name.
> xstats[count].value = *(uint64_t *)(((char *)hw_stats) +
> rte_ixgbe_rxq_strings[stat].offset +
> (sizeof(uint64_t) * i));
> @@ -2754,16 +2825,14 @@ ixgbe_dev_xstats_get(struct rte_eth_dev *dev,
> struct rte_eth_xstats *xstats,
> /* TX Priority Stats */
> for (stat = 0; stat < IXGBE_NB_TXQ_PRIO_STATS; stat++) {
> for (i = 0; i < 8; i++) {
> - snprintf(xstats[count].name, sizeof(xstats[count].name),
> - "tx_priority%u_%s", i,
> - rte_ixgbe_txq_strings[stat].name);
Add key/id...terminate name.
> xstats[count].value = *(uint64_t *)(((char *)hw_stats) +
> rte_ixgbe_txq_strings[stat].offset +
> (sizeof(uint64_t) * i));
> count++;
> }
> }
> -
> + for (i = 0; i < count; i++)
> + xstats[i].key = i;
Suggest doing this in the loops above to be consistent with pass-thru
and likely saves some instructions.
Regards,
Dave
> return count;
> }
>
> --
> 2.5.5
next prev parent reply other threads:[~2016-04-29 13:43 UTC|newest]
Thread overview: 71+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-15 14:44 [dpdk-dev] [RFC PATCH v1 0/3] Remove string operations from xstats Remy Horton
2016-04-15 14:44 ` [dpdk-dev] [RFC PATCH v1 1/3] rte: change xstats to use integer keys Remy Horton
2016-04-29 13:17 ` David Harton (dharton)
2016-04-15 14:44 ` [dpdk-dev] [RFC PATCH v1 2/3] drivers/net/ixgbe: change xstats to use integers Remy Horton
2016-04-29 13:43 ` David Harton (dharton) [this message]
2016-05-03 12:22 ` Remy Horton
2016-05-03 13:40 ` David Harton (dharton)
2016-04-15 14:44 ` [dpdk-dev] [RFC PATCH v1 3/3] examples/ethtool: add xstats display command Remy Horton
2016-04-20 16:03 ` [dpdk-dev] [RFC PATCH v1 0/3] Remove string operations from xstats David Harton (dharton)
2016-04-20 16:49 ` Mcnamara, John
2016-04-22 15:04 ` David Harton (dharton)
2016-04-28 14:56 ` Tahhan, Maryam
2016-04-28 15:58 ` David Harton (dharton)
2016-04-29 10:21 ` Remy Horton
2016-04-29 12:15 ` David Harton (dharton)
2016-04-29 12:52 ` David Harton (dharton)
2016-05-06 11:11 ` [dpdk-dev] [RFC PATCH v2 " Remy Horton
2016-05-06 11:11 ` [dpdk-dev] [RFC PATCH v2 1/3] rte: change xstats to use integer keys Remy Horton
2016-05-09 13:59 ` David Harton (dharton)
2016-05-10 8:58 ` Remy Horton
2016-05-12 16:17 ` Thomas Monjalon
2016-05-16 10:47 ` Tahhan, Maryam
2016-05-18 8:31 ` Tahhan, Maryam
2016-05-18 8:45 ` Remy Horton
2016-05-06 11:11 ` [dpdk-dev] [RFC PATCH v2 2/3] drivers/net/ixgbe: change xstats to use integer id Remy Horton
2016-05-09 14:06 ` David Harton (dharton)
2016-05-18 8:41 ` Tahhan, Maryam
2016-05-06 11:11 ` [dpdk-dev] [RFC PATCH v2 3/3] examples/ethtool: add xstats display command Remy Horton
2016-05-09 14:08 ` David Harton (dharton)
2016-05-18 8:42 ` Tahhan, Maryam
2016-05-16 10:42 ` [dpdk-dev] [RFC PATCH v2 0/3] Remove string operations from xstats Tahhan, Maryam
2016-05-18 10:12 ` Remy Horton
2016-05-30 10:48 ` [dpdk-dev] [PATCH v3 00/10] " Remy Horton
2016-05-30 10:48 ` [dpdk-dev] [PATCH v3 01/10] rte: change xstats to use integer ids Remy Horton
2016-06-08 9:37 ` Thomas Monjalon
2016-06-08 11:16 ` Remy Horton
2016-06-08 12:22 ` Thomas Monjalon
2016-05-30 10:48 ` [dpdk-dev] [PATCH v3 02/10] drivers/net/ixgbe: " Remy Horton
2016-05-30 10:48 ` [dpdk-dev] [PATCH v3 03/10] drivers/net/e1000: " Remy Horton
2016-05-30 10:48 ` [dpdk-dev] [PATCH v3 04/10] drivers/net/fm10k: " Remy Horton
2016-05-30 10:48 ` [dpdk-dev] [PATCH v3 05/10] drivers/net/i40e: " Remy Horton
2016-05-30 10:48 ` [dpdk-dev] [PATCH v3 06/10] drivers/net/virtio: " Remy Horton
2016-05-30 10:48 ` [dpdk-dev] [PATCH v3 07/10] app/test-pmd: " Remy Horton
2016-05-30 10:48 ` [dpdk-dev] [PATCH v3 08/10] app/proc_info: " Remy Horton
2016-05-30 10:48 ` [dpdk-dev] [PATCH v3 09/10] remove name field from struct rte_eth_xstats Remy Horton
2016-06-08 12:23 ` Thomas Monjalon
2016-05-30 10:48 ` [dpdk-dev] [PATCH v3 10/10] doc: update xstats documentation Remy Horton
2016-06-09 8:48 ` Mcnamara, John
2016-06-06 12:45 ` [dpdk-dev] [PATCH v3 00/10] Remove string operations from xstats David Harton (dharton)
2016-06-13 15:51 ` [dpdk-dev] [PATCH v4 0/8] " Remy Horton
2016-06-13 15:51 ` [dpdk-dev] [PATCH v4 1/8] rte: change xstats to use integer ids Remy Horton
2016-06-15 9:19 ` Thomas Monjalon
2016-06-13 15:51 ` [dpdk-dev] [PATCH v4 2/8] drivers/net/ixgbe: " Remy Horton
2016-06-13 15:51 ` [dpdk-dev] [PATCH v4 3/8] drivers/net/e1000: " Remy Horton
2016-06-13 15:51 ` [dpdk-dev] [PATCH v4 4/8] drivers/net/fm10k: " Remy Horton
2016-06-13 15:51 ` [dpdk-dev] [PATCH v4 5/8] drivers/net/i40e: " Remy Horton
2016-06-13 15:51 ` [dpdk-dev] [PATCH v4 6/8] drivers/net/virtio: " Remy Horton
2016-06-13 15:52 ` [dpdk-dev] [PATCH v4 7/8] rte: change xstats usage to new API Remy Horton
2016-06-15 9:13 ` Thomas Monjalon
2016-06-13 15:52 ` [dpdk-dev] [PATCH v4 8/8] doc: update xstats documentation Remy Horton
2016-06-14 14:06 ` Mcnamara, John
2016-06-15 15:25 ` [dpdk-dev] [PATCH v5 0/7] Remove string operations from xstats Remy Horton
2016-06-15 15:25 ` [dpdk-dev] [PATCH v5 1/7] rte: change xstats to use integer ids Remy Horton
2016-06-15 15:25 ` [dpdk-dev] [PATCH v5 2/7] drivers/net/ixgbe: " Remy Horton
2016-06-15 15:25 ` [dpdk-dev] [PATCH v5 3/7] drivers/net/e1000: " Remy Horton
2016-06-15 15:25 ` [dpdk-dev] [PATCH v5 4/7] drivers/net/fm10k: " Remy Horton
2016-06-15 15:25 ` [dpdk-dev] [PATCH v5 5/7] drivers/net/i40e: " Remy Horton
2016-06-15 15:25 ` [dpdk-dev] [PATCH v5 6/7] drivers/net/virtio: " Remy Horton
2016-06-20 10:43 ` Yuanhan Liu
2016-06-15 15:25 ` [dpdk-dev] [PATCH v5 7/7] rte: change xstats usage to new API Remy Horton
2016-06-16 16:02 ` [dpdk-dev] [PATCH v5 0/7] Remove string operations from xstats Thomas Monjalon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=34cbe07723f64e9f926666164d9d5319@XCH-RCD-016.cisco.com \
--to=dharton@cisco.com \
--cc=dev@dpdk.org \
--cc=helin.zhang@intel.com \
--cc=remy.horton@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).