Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 12482,
    "url": "http://patches.dpdk.org/api/patches/12482/?format=api",
    "web_url": "http://patches.dpdk.org/project/dpdk/patch/1462533074-1994-3-git-send-email-remy.horton@intel.com/",
    "project": {
        "id": 1,
        "url": "http://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": "<1462533074-1994-3-git-send-email-remy.horton@intel.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/1462533074-1994-3-git-send-email-remy.horton@intel.com",
    "date": "2016-05-06T11:11:13",
    "name": "[dpdk-dev,RFC,v2,2/3] drivers/net/ixgbe: change xstats to use integer id",
    "commit_ref": null,
    "pull_url": null,
    "state": "superseded",
    "archived": true,
    "hash": "375064ed8a6569f0585a3fb261d2cc289ca2e0c8",
    "submitter": {
        "id": 326,
        "url": "http://patches.dpdk.org/api/people/326/?format=api",
        "name": "Remy Horton",
        "email": "remy.horton@intel.com"
    },
    "delegate": null,
    "mbox": "http://patches.dpdk.org/project/dpdk/patch/1462533074-1994-3-git-send-email-remy.horton@intel.com/mbox/",
    "series": [],
    "comments": "http://patches.dpdk.org/api/patches/12482/comments/",
    "check": "pending",
    "checks": "http://patches.dpdk.org/api/patches/12482/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 EDFA55A32;\n\tFri,  6 May 2016 13:11:21 +0200 (CEST)",
            "from mga01.intel.com (mga01.intel.com [192.55.52.88])\n\tby dpdk.org (Postfix) with ESMTP id B5AC15A03\n\tfor <dev@dpdk.org>; Fri,  6 May 2016 13:11:18 +0200 (CEST)",
            "from fmsmga002.fm.intel.com ([10.253.24.26])\n\tby fmsmga101.fm.intel.com with ESMTP; 06 May 2016 04:11:18 -0700",
            "from rhorton-mobl.ger.corp.intel.com (HELO VM.ir.intel.com)\n\t([163.33.228.56])\n\tby fmsmga002.fm.intel.com with ESMTP; 06 May 2016 04:11:18 -0700"
        ],
        "X-ExtLoop1": "1",
        "X-IronPort-AV": "E=Sophos;i=\"5.24,586,1455004800\"; d=\"scan'208\";a=\"973967426\"",
        "From": "Remy Horton <remy.horton@intel.com>",
        "To": "dev@dpdk.org",
        "Date": "Fri,  6 May 2016 12:11:13 +0100",
        "Message-Id": "<1462533074-1994-3-git-send-email-remy.horton@intel.com>",
        "X-Mailer": "git-send-email 2.5.5",
        "In-Reply-To": "<1462533074-1994-1-git-send-email-remy.horton@intel.com>",
        "References": "<1462533074-1994-1-git-send-email-remy.horton@intel.com>",
        "Subject": "[dpdk-dev] [RFC PATCH v2 2/3] drivers/net/ixgbe: change xstats to\n\tuse integer id",
        "X-BeenThere": "dev@dpdk.org",
        "X-Mailman-Version": "2.1.15",
        "Precedence": "list",
        "List-Id": "patches and discussions about DPDK <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": "Signed-off-by: Remy Horton <remy.horton@intel.com>\n---\n drivers/net/ixgbe/ixgbe_ethdev.c | 98 ++++++++++++++++++++++++++++++++++------\n 1 file changed, 85 insertions(+), 13 deletions(-)",
    "diff": "diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c\nindex 3f1ebc1..3ff8bae 100644\n--- a/drivers/net/ixgbe/ixgbe_ethdev.c\n+++ b/drivers/net/ixgbe/ixgbe_ethdev.c\n@@ -179,6 +179,10 @@ static int ixgbevf_dev_xstats_get(struct rte_eth_dev *dev,\n \t\t\t\t  struct rte_eth_xstats *xstats, unsigned 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_names(__rte_unused struct rte_eth_dev *dev,\n+\tstruct rte_eth_xstats_name *ptr_names, __rte_unused unsigned limit);\n+static int ixgbevf_dev_xstats_names(__rte_unused struct rte_eth_dev *dev,\n+\tstruct rte_eth_xstats_name *ptr_names, __rte_unused unsigned 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@@ -466,6 +470,7 @@ static const struct eth_dev_ops ixgbe_eth_dev_ops = {\n \t.xstats_get           = ixgbe_dev_xstats_get,\n \t.stats_reset          = ixgbe_dev_stats_reset,\n \t.xstats_reset         = ixgbe_dev_xstats_reset,\n+\t.xstats_names         = ixgbe_dev_xstats_names,\n \t.queue_stats_mapping_set = ixgbe_dev_queue_stats_mapping_set,\n \t.dev_infos_get        = ixgbe_dev_info_get,\n \t.dev_supported_ptypes_get = ixgbe_dev_supported_ptypes_get,\n@@ -555,6 +560,7 @@ static const struct eth_dev_ops ixgbevf_eth_dev_ops = {\n \t.xstats_get           = ixgbevf_dev_xstats_get,\n \t.stats_reset          = ixgbevf_dev_stats_reset,\n \t.xstats_reset         = ixgbevf_dev_stats_reset,\n+\t.xstats_names         = ixgbevf_dev_xstats_names,\n \t.dev_close            = ixgbevf_dev_close,\n \t.allmulticast_enable  = ixgbevf_dev_allmulticast_enable,\n \t.allmulticast_disable = ixgbevf_dev_allmulticast_disable,\n@@ -685,6 +691,7 @@ static const struct rte_ixgbe_xstats_name_off rte_ixgbe_rxq_strings[] = {\n \n #define IXGBE_NB_RXQ_PRIO_STATS (sizeof(rte_ixgbe_rxq_strings) / \\\n \t\t\t   sizeof(rte_ixgbe_rxq_strings[0]))\n+#define IXGBE_NB_RXQ_PRIO_VALUES 8\n \n static const struct rte_ixgbe_xstats_name_off rte_ixgbe_txq_strings[] = {\n \t{\"xon_packets\", offsetof(struct ixgbe_hw_stats, pxontxc)},\n@@ -695,6 +702,7 @@ static const struct rte_ixgbe_xstats_name_off rte_ixgbe_txq_strings[] = {\n \n #define IXGBE_NB_TXQ_PRIO_STATS (sizeof(rte_ixgbe_txq_strings) / \\\n \t\t\t   sizeof(rte_ixgbe_txq_strings[0]))\n+#define IXGBE_NB_TXQ_PRIO_VALUES 8\n \n static const struct rte_ixgbe_xstats_name_off rte_ixgbevf_stats_strings[] = {\n \t{\"rx_multicast_packets\", offsetof(struct ixgbevf_hw_stats, vfmprc)},\n@@ -2694,8 +2702,75 @@ ixgbe_dev_stats_reset(struct rte_eth_dev *dev)\n /* This function calculates the number of xstats based on the current config */\n static unsigned\n ixgbe_xstats_calc_num(void) {\n-\treturn IXGBE_NB_HW_STATS + (IXGBE_NB_RXQ_PRIO_STATS * 8) +\n-\t\t(IXGBE_NB_TXQ_PRIO_STATS * 8);\n+\treturn IXGBE_NB_HW_STATS +\n+\t\t(IXGBE_NB_RXQ_PRIO_STATS * IXGBE_NB_RXQ_PRIO_VALUES) +\n+\t\t(IXGBE_NB_TXQ_PRIO_STATS * IXGBE_NB_TXQ_PRIO_VALUES);\n+}\n+\n+static int ixgbe_dev_xstats_names(__rte_unused struct rte_eth_dev *dev,\n+\tstruct rte_eth_xstats_name *ptr_names, __rte_unused unsigned limit)\n+{\n+\tconst unsigned cnt_stats = ixgbe_xstats_calc_num();\n+\tunsigned stat, i, count;\n+\n+\tif (ptr_names != NULL) {\n+\t\tcount = 0;\n+\n+\t\t/* Note: limit >= cnt_stats checked upstream\n+\t\t * in rte_eth_xstats_names()\n+\t\t */\n+\n+\t\t/* Extended stats from ixgbe_hw_stats */\n+\t\tfor (i = 0; i < IXGBE_NB_HW_STATS; i++) {\n+\t\t\tptr_names[count].id = count;\n+\t\t\tsnprintf(ptr_names[count].name,\n+\t\t\t\tsizeof(ptr_names[count].name),\n+\t\t\t\t\"%s\",\n+\t\t\t\trte_ixgbe_stats_strings[i].name);\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\tptr_names[count].id = count;\n+\t\t\t\tsnprintf(ptr_names[count].name,\n+\t\t\t\t\tsizeof(ptr_names[count].name),\n+\t\t\t\t\t\"rx_priority%u_%s\", i,\n+\t\t\t\t\trte_ixgbe_rxq_strings[stat].name);\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\tptr_names[count].id = count;\n+\t\t\t\tsnprintf(ptr_names[count].name,\n+\t\t\t\t\tsizeof(ptr_names[count].name),\n+\t\t\t\t\t\"tx_priority%u_%s\", i,\n+\t\t\t\t\trte_ixgbe_txq_strings[stat].name);\n+\t\t\t\tcount++;\n+\t\t\t}\n+\t\t}\n+\t}\n+\treturn cnt_stats;\n+}\n+\n+static int ixgbevf_dev_xstats_names(__rte_unused struct rte_eth_dev *dev,\n+\tstruct rte_eth_xstats_name *ptr_names, unsigned limit)\n+{\n+\tunsigned i;\n+\n+\tif (limit < IXGBEVF_NB_XSTATS && ptr_names != NULL)\n+\t\treturn -ENOMEM;\n+\n+\tif (ptr_names != NULL)\n+\t\tfor (i = 0; i < IXGBEVF_NB_XSTATS; i++)\n+\t\t\tsnprintf(ptr_names[i].name,\n+\t\t\t\tsizeof(ptr_names[i].name),\n+\t\t\t\t\"%s\", rte_ixgbevf_stats_strings[i].name);\n+\treturn IXGBEVF_NB_XSTATS;\n }\n \n static int\n@@ -2731,8 +2806,8 @@ ixgbe_dev_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstats *xstats,\n \t/* Extended stats from ixgbe_hw_stats */\n \tcount = 0;\n \tfor (i = 0; i < IXGBE_NB_HW_STATS; i++) {\n-\t\tsnprintf(xstats[count].name, sizeof(xstats[count].name), \"%s\",\n-\t\t\t rte_ixgbe_stats_strings[i].name);\n+\t\txstats[count].id = count;\n+\t\txstats[count].name[0] = '\\0';\n \t\txstats[count].value = *(uint64_t *)(((char *)hw_stats) +\n \t\t\t\trte_ixgbe_stats_strings[i].offset);\n \t\tcount++;\n@@ -2740,10 +2815,9 @@ ixgbe_dev_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstats *xstats,\n \n \t/* RX Priority Stats */\n \tfor (stat = 0; stat < IXGBE_NB_RXQ_PRIO_STATS; stat++) {\n-\t\tfor (i = 0; i < 8; i++) {\n-\t\t\tsnprintf(xstats[count].name, sizeof(xstats[count].name),\n-\t\t\t\t \"rx_priority%u_%s\", i,\n-\t\t\t\t rte_ixgbe_rxq_strings[stat].name);\n+\t\tfor (i = 0; i < IXGBE_NB_RXQ_PRIO_VALUES; i++) {\n+\t\t\txstats[count].id = count;\n+\t\t\txstats[count].name[0] = '\\0';\n \t\t\txstats[count].value = *(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@@ -2753,17 +2827,15 @@ ixgbe_dev_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstats *xstats,\n \n \t/* TX Priority Stats */\n \tfor (stat = 0; stat < IXGBE_NB_TXQ_PRIO_STATS; stat++) {\n-\t\tfor (i = 0; i < 8; i++) {\n-\t\t\tsnprintf(xstats[count].name, sizeof(xstats[count].name),\n-\t\t\t\t \"tx_priority%u_%s\", i,\n-\t\t\t\t rte_ixgbe_txq_strings[stat].name);\n+\t\tfor (i = 0; i < IXGBE_NB_TXQ_PRIO_VALUES; i++) {\n+\t\t\txstats[count].id = count;\n+\t\t\txstats[count].name[0] = '\\0';\n \t\t\txstats[count].value = *(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\tcount++;\n \t\t}\n \t}\n-\n \treturn count;\n }\n \n",
    "prefixes": [
        "dpdk-dev",
        "RFC",
        "v2",
        "2/3"
    ]
}