Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/23975/?format=api
https://patches.dpdk.org/api/patches/23975/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20170427144240.10188-7-michalx.k.jastrzebski@intel.com/", "project": { "id": 1, "url": "https://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20170427144240.10188-7-michalx.k.jastrzebski@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20170427144240.10188-7-michalx.k.jastrzebski@intel.com", "date": "2017-04-27T14:42:40", "name": "[dpdk-dev,v1,6/6] net/ixgbe: support xstats by ID", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "6368ab14e7b7a9c95cd95a1af4c11d84476d95d1", "submitter": { "id": 74, "url": "https://patches.dpdk.org/api/people/74/?format=api", "name": "Michal Jastrzebski", "email": "michalx.k.jastrzebski@intel.com" }, "delegate": null, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20170427144240.10188-7-michalx.k.jastrzebski@intel.com/mbox/", "series": [], "comments": "https://patches.dpdk.org/api/patches/23975/comments/", "check": "fail", "checks": "https://patches.dpdk.org/api/patches/23975/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [IPv6:::1])\n\tby dpdk.org (Postfix) with ESMTP id D8A952C4B;\n\tThu, 27 Apr 2017 16:48:40 +0200 (CEST)", "from mga14.intel.com (mga14.intel.com [192.55.52.115])\n\tby dpdk.org (Postfix) with ESMTP id D71A8A2F\n\tfor <dev@dpdk.org>; Thu, 27 Apr 2017 16:48:38 +0200 (CEST)", "from orsmga002.jf.intel.com ([10.7.209.21])\n\tby fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t27 Apr 2017 07:48:37 -0700", "from unknown ([10.103.103.28])\n\tby orsmga002.jf.intel.com with SMTP; 27 Apr 2017 07:48:34 -0700", "by (sSMTP sendmail emulation); Thu, 27 Apr 2017 16:47:52 +0200" ], "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.37,384,1488873600\"; d=\"scan'208\";a=\"79641698\"", "From": "Michal Jastrzebski <michalx.k.jastrzebski@intel.com>", "To": "dev@dpdk.org", "Cc": "harry.van.haaren@intel.com, deepak.k.jain@intel.com,\n\tKuba Kozak <kubax.kozak@intel.com>", "Date": "Thu, 27 Apr 2017 16:42:40 +0200", "Message-Id": "<20170427144240.10188-7-michalx.k.jastrzebski@intel.com>", "X-Mailer": "git-send-email 2.12.2", "In-Reply-To": "<20170427144240.10188-1-michalx.k.jastrzebski@intel.com>", "References": "<20170427144240.10188-1-michalx.k.jastrzebski@intel.com>", "Subject": "[dpdk-dev] [PATCH v1 6/6] net/ixgbe: support xstats by ID", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<http://dpdk.org/ml/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://dpdk.org/ml/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<http://dpdk.org/ml/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "From: Kuba Kozak <kubax.kozak@intel.com>\n\nTo achieve functionality of retrieving only specific statistics\ngiven by application there are two new functions added:\nixgbe_dev_xstats_get_by_ids() which retrieve\nvalues of statistics specified by ids array\nand ixgbe_dev_xstats_get_names_by_ids() which retrieve\nnames of statistics specified by ids array.\n\nSigned-off-by: Kuba Kozak <kubax.kozak@intel.com>\n---\n drivers/net/ixgbe/ixgbe_ethdev.c | 184 ++++++++++++++++++++++++++++++++++++++-\n lib/librte_ether/rte_ethdev.c | 2 +-\n 2 files changed, 183 insertions(+), 3 deletions(-)", "diff": "diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c\nindex c226e0a..2197290 100644\n--- a/drivers/net/ixgbe/ixgbe_ethdev.c\n+++ b/drivers/net/ixgbe/ixgbe_ethdev.c\n@@ -182,12 +182,21 @@ static int ixgbe_dev_xstats_get(struct rte_eth_dev *dev,\n \t\t\t\tstruct rte_eth_xstat *xstats, unsigned n);\n static int ixgbevf_dev_xstats_get(struct rte_eth_dev *dev,\n \t\t\t\t struct rte_eth_xstat *xstats, unsigned n);\n+static int\n+ixgbe_dev_xstats_get_by_id(struct rte_eth_dev *dev, const uint64_t *ids,\n+\t\tuint64_t *values, unsigned int n);\n static void ixgbe_dev_stats_reset(struct rte_eth_dev *dev);\n static void ixgbe_dev_xstats_reset(struct rte_eth_dev *dev);\n static int ixgbe_dev_xstats_get_names(__rte_unused struct rte_eth_dev *dev,\n-\tstruct rte_eth_xstat_name *xstats_names, __rte_unused unsigned limit);\n+\tstruct rte_eth_xstat_name *xstats_names,\n+\t__rte_unused unsigned int size);\n static int ixgbevf_dev_xstats_get_names(__rte_unused struct rte_eth_dev *dev,\n \tstruct rte_eth_xstat_name *xstats_names, __rte_unused unsigned limit);\n+static int ixgbe_dev_xstats_get_names_by_id(\n+\t__rte_unused struct rte_eth_dev *dev,\n+\tstruct rte_eth_xstat_name *xstats_names,\n+\tconst uint64_t *ids,\n+\tunsigned int limit);\n static int ixgbe_dev_queue_stats_mapping_set(struct rte_eth_dev *eth_dev,\n \t\t\t\t\t uint16_t queue_id,\n \t\t\t\t\t uint8_t stat_idx,\n@@ -523,9 +532,11 @@ static const struct eth_dev_ops ixgbe_eth_dev_ops = {\n \t.link_update = ixgbe_dev_link_update,\n \t.stats_get = ixgbe_dev_stats_get,\n \t.xstats_get = ixgbe_dev_xstats_get,\n+\t.xstats_get_by_id = ixgbe_dev_xstats_get_by_id,\n \t.stats_reset = ixgbe_dev_stats_reset,\n \t.xstats_reset = ixgbe_dev_xstats_reset,\n \t.xstats_get_names = ixgbe_dev_xstats_get_names,\n+\t.xstats_get_names_by_id = ixgbe_dev_xstats_get_names_by_id,\n \t.queue_stats_mapping_set = ixgbe_dev_queue_stats_mapping_set,\n \t.fw_version_get = ixgbe_fw_version_get,\n \t.dev_infos_get = ixgbe_dev_info_get,\n@@ -3127,7 +3138,7 @@ ixgbe_xstats_calc_num(void) {\n }\n \n static int ixgbe_dev_xstats_get_names(__rte_unused struct rte_eth_dev *dev,\n-\tstruct rte_eth_xstat_name *xstats_names, __rte_unused unsigned limit)\n+\tstruct rte_eth_xstat_name *xstats_names, __rte_unused unsigned int size)\n {\n \tconst unsigned cnt_stats = ixgbe_xstats_calc_num();\n \tunsigned stat, i, count;\n@@ -3182,6 +3193,84 @@ static int ixgbe_dev_xstats_get_names(__rte_unused struct rte_eth_dev *dev,\n \treturn cnt_stats;\n }\n \n+static int ixgbe_dev_xstats_get_names_by_id(\n+\t__rte_unused struct rte_eth_dev *dev,\n+\tstruct rte_eth_xstat_name *xstats_names,\n+\tconst uint64_t *ids,\n+\tunsigned int limit)\n+{\n+\tif (!ids) {\n+\t\tconst unsigned int cnt_stats = ixgbe_xstats_calc_num();\n+\t\tunsigned int stat, i, count;\n+\n+\t\tif (xstats_names != NULL) {\n+\t\t\tcount = 0;\n+\n+\t\t\t/* Note: limit >= cnt_stats checked upstream\n+\t\t\t * in rte_eth_xstats_names()\n+\t\t\t */\n+\n+\t\t\t/* Extended stats from ixgbe_hw_stats */\n+\t\t\tfor (i = 0; i < IXGBE_NB_HW_STATS; i++) {\n+\t\t\t\tsnprintf(xstats_names[count].name,\n+\t\t\t\t\tsizeof(xstats_names[count].name),\n+\t\t\t\t\t\"%s\",\n+\t\t\t\t\trte_ixgbe_stats_strings[i].name);\n+\t\t\t\tcount++;\n+\t\t\t}\n+\n+\t\t\t/* MACsec Stats */\n+\t\t\tfor (i = 0; i < IXGBE_NB_MACSEC_STATS; i++) {\n+\t\t\t\tsnprintf(xstats_names[count].name,\n+\t\t\t\t\tsizeof(xstats_names[count].name),\n+\t\t\t\t\t\"%s\",\n+\t\t\t\t\trte_ixgbe_macsec_strings[i].name);\n+\t\t\t\tcount++;\n+\t\t\t}\n+\n+\t\t\t/* RX Priority Stats */\n+\t\t\tfor (stat = 0; stat < IXGBE_NB_RXQ_PRIO_STATS; stat++) {\n+\t\t\t\tfor (i = 0; i < IXGBE_NB_RXQ_PRIO_VALUES; i++) {\n+\t\t\t\t\tsnprintf(xstats_names[count].name,\n+\t\t\t\t\t sizeof(xstats_names[count].name),\n+\t\t\t\t\t \"rx_priority%u_%s\", i,\n+\t\t\t\t\t rte_ixgbe_rxq_strings[stat].name);\n+\t\t\t\t\tcount++;\n+\t\t\t\t}\n+\t\t\t}\n+\n+\t\t\t/* TX Priority Stats */\n+\t\t\tfor (stat = 0; stat < IXGBE_NB_TXQ_PRIO_STATS; stat++) {\n+\t\t\t\tfor (i = 0; i < IXGBE_NB_TXQ_PRIO_VALUES; i++) {\n+\t\t\t\t\tsnprintf(xstats_names[count].name,\n+\t\t\t\t\t sizeof(xstats_names[count].name),\n+\t\t\t\t\t \"tx_priority%u_%s\", i,\n+\t\t\t\t\t rte_ixgbe_txq_strings[stat].name);\n+\t\t\t\t\tcount++;\n+\t\t\t\t}\n+\t\t\t}\n+\t\t}\n+\t\treturn cnt_stats;\n+\t}\n+\n+\tuint16_t i;\n+\tuint16_t size = ixgbe_xstats_calc_num();\n+\tstruct rte_eth_xstat_name xstats_names_copy[size];\n+\n+\tixgbe_dev_xstats_get_names_by_id(dev, xstats_names_copy, NULL,\n+\t\t\tsize);\n+\n+\tfor (i = 0; i < limit; i++) {\n+\t\tif (ids[i] >= size) {\n+\t\t\tPMD_INIT_LOG(ERR, \"id value isn't valid\");\n+\t\t\treturn -1;\n+\t\t}\n+\t\tstrcpy(xstats_names[i].name,\n+\t\t\t\txstats_names_copy[ids[i]].name);\n+\t}\n+\treturn limit;\n+}\n+\n static int ixgbevf_dev_xstats_get_names(__rte_unused struct rte_eth_dev *dev,\n \tstruct rte_eth_xstat_name *xstats_names, unsigned limit)\n {\n@@ -3272,6 +3361,97 @@ ixgbe_dev_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *xstats,\n \treturn count;\n }\n \n+static int\n+ixgbe_dev_xstats_get_by_id(struct rte_eth_dev *dev, const uint64_t *ids,\n+\t\tuint64_t *values, unsigned int n)\n+{\n+\tif (!ids) {\n+\t\tstruct ixgbe_hw *hw =\n+\t\t\t\tIXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n+\t\tstruct ixgbe_hw_stats *hw_stats =\n+\t\t\t\tIXGBE_DEV_PRIVATE_TO_STATS(\n+\t\t\t\t\t\tdev->data->dev_private);\n+\t\tstruct ixgbe_macsec_stats *macsec_stats =\n+\t\t\t\tIXGBE_DEV_PRIVATE_TO_MACSEC_STATS(\n+\t\t\t\t\tdev->data->dev_private);\n+\t\tuint64_t total_missed_rx, total_qbrc, total_qprc, total_qprdc;\n+\t\tunsigned int i, stat, count = 0;\n+\n+\t\tcount = ixgbe_xstats_calc_num();\n+\n+\t\tif (!ids && n < count)\n+\t\t\treturn count;\n+\n+\t\ttotal_missed_rx = 0;\n+\t\ttotal_qbrc = 0;\n+\t\ttotal_qprc = 0;\n+\t\ttotal_qprdc = 0;\n+\n+\t\tixgbe_read_stats_registers(hw, hw_stats, macsec_stats,\n+\t\t\t\t&total_missed_rx, &total_qbrc, &total_qprc,\n+\t\t\t\t&total_qprdc);\n+\n+\t\t/* If this is a reset xstats is NULL, and we have cleared the\n+\t\t * registers by reading them.\n+\t\t */\n+\t\tif (!ids && !values)\n+\t\t\treturn 0;\n+\n+\t\t/* Extended stats from ixgbe_hw_stats */\n+\t\tcount = 0;\n+\t\tfor (i = 0; i < IXGBE_NB_HW_STATS; i++) {\n+\t\t\tvalues[count] = *(uint64_t *)(((char *)hw_stats) +\n+\t\t\t\t\trte_ixgbe_stats_strings[i].offset);\n+\t\t\tcount++;\n+\t\t}\n+\n+\t\t/* MACsec Stats */\n+\t\tfor (i = 0; i < IXGBE_NB_MACSEC_STATS; i++) {\n+\t\t\tvalues[count] = *(uint64_t *)(((char *)macsec_stats) +\n+\t\t\t\t\trte_ixgbe_macsec_strings[i].offset);\n+\t\t\tcount++;\n+\t\t}\n+\n+\t\t/* RX Priority Stats */\n+\t\tfor (stat = 0; stat < IXGBE_NB_RXQ_PRIO_STATS; stat++) {\n+\t\t\tfor (i = 0; i < IXGBE_NB_RXQ_PRIO_VALUES; i++) {\n+\t\t\t\tvalues[count] =\n+\t\t\t\t\t*(uint64_t *)(((char *)hw_stats) +\n+\t\t\t\t\trte_ixgbe_rxq_strings[stat].offset +\n+\t\t\t\t\t(sizeof(uint64_t) * i));\n+\t\t\t\tcount++;\n+\t\t\t}\n+\t\t}\n+\n+\t\t/* TX Priority Stats */\n+\t\tfor (stat = 0; stat < IXGBE_NB_TXQ_PRIO_STATS; stat++) {\n+\t\t\tfor (i = 0; i < IXGBE_NB_TXQ_PRIO_VALUES; i++) {\n+\t\t\t\tvalues[count] =\n+\t\t\t\t\t*(uint64_t *)(((char *)hw_stats) +\n+\t\t\t\t\trte_ixgbe_txq_strings[stat].offset +\n+\t\t\t\t\t(sizeof(uint64_t) * i));\n+\t\t\t\tcount++;\n+\t\t\t}\n+\t\t}\n+\t\treturn count;\n+\t}\n+\n+\tuint16_t i;\n+\tuint16_t size = ixgbe_xstats_calc_num();\n+\tuint64_t values_copy[size];\n+\n+\tixgbe_dev_xstats_get_by_id(dev, NULL, values_copy, size);\n+\n+\tfor (i = 0; i < n; i++) {\n+\t\tif (ids[i] >= size) {\n+\t\t\tPMD_INIT_LOG(ERR, \"id value isn't valid\");\n+\t\t\treturn -1;\n+\t\t}\n+\t\tvalues[i] = values_copy[ids[i]];\n+\t}\n+\treturn n;\n+}\n+\n static void\n ixgbe_dev_xstats_reset(struct rte_eth_dev *dev)\n {\ndiff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c\nindex 8aa6331..8edcfb4 100644\n--- a/lib/librte_ether/rte_ethdev.c\n+++ b/lib/librte_ether/rte_ethdev.c\n@@ -188,7 +188,7 @@ rte_eth_dev_allocated(const char *name)\n static uint8_t\n rte_eth_dev_find_free_port(void)\n {\n-\tunsigned i;\n+\tunsigned int i;\n \n \tfor (i = 0; i < RTE_MAX_ETHPORTS; i++) {\n \t\tif (rte_eth_devices[i].state == RTE_ETH_DEV_UNUSED)\n", "prefixes": [ "dpdk-dev", "v1", "6/6" ] }{ "id": 23975, "url": "