Patch Detail

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

{
    "id": 8770,
    "url": "http://patches.dpdk.org/api/patches/8770/?format=api",
    "web_url": "http://patches.dpdk.org/project/dpdk/patch/1446819175-31325-4-git-send-email-harry.van.haaren@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": "<1446819175-31325-4-git-send-email-harry.van.haaren@intel.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/1446819175-31325-4-git-send-email-harry.van.haaren@intel.com",
    "date": "2015-11-06T14:12:55",
    "name": "[dpdk-dev,3/3] i40e: refactor xstats queue handling",
    "commit_ref": null,
    "pull_url": null,
    "state": "accepted",
    "archived": true,
    "hash": "576ca921428c4714b4efa5550c484f6232f01879",
    "submitter": {
        "id": 317,
        "url": "http://patches.dpdk.org/api/people/317/?format=api",
        "name": "Van Haaren, Harry",
        "email": "harry.van.haaren@intel.com"
    },
    "delegate": null,
    "mbox": "http://patches.dpdk.org/project/dpdk/patch/1446819175-31325-4-git-send-email-harry.van.haaren@intel.com/mbox/",
    "series": [],
    "comments": "http://patches.dpdk.org/api/patches/8770/comments/",
    "check": "pending",
    "checks": "http://patches.dpdk.org/api/patches/8770/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 281148DB5;\n\tFri,  6 Nov 2015 15:13:38 +0100 (CET)",
            "from mga14.intel.com (mga14.intel.com [192.55.52.115])\n\tby dpdk.org (Postfix) with ESMTP id DFED95A71\n\tfor <dev@dpdk.org>; Fri,  6 Nov 2015 15:13:34 +0100 (CET)",
            "from fmsmga001.fm.intel.com ([10.253.24.23])\n\tby fmsmga103.fm.intel.com with ESMTP; 06 Nov 2015 06:13:35 -0800",
            "from sie-lab-212-222.ir.intel.com (HELO\n\tsilpixa00366884.ir.intel.com) ([10.237.212.222])\n\tby fmsmga001.fm.intel.com with ESMTP; 06 Nov 2015 06:13:33 -0800"
        ],
        "X-ExtLoop1": "1",
        "X-IronPort-AV": "E=Sophos;i=\"5.20,252,1444719600\"; d=\"scan'208\";a=\"829187143\"",
        "From": "Harry van Haaren <harry.van.haaren@intel.com>",
        "To": "dev@dpdk.org",
        "Date": "Fri,  6 Nov 2015 14:12:55 +0000",
        "Message-Id": "<1446819175-31325-4-git-send-email-harry.van.haaren@intel.com>",
        "X-Mailer": "git-send-email 1.9.1",
        "In-Reply-To": "<1446819175-31325-1-git-send-email-harry.van.haaren@intel.com>",
        "References": "<1446819175-31325-1-git-send-email-harry.van.haaren@intel.com>",
        "Subject": "[dpdk-dev] [PATCH 3/3] i40e: refactor xstats queue handling",
        "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": "This patch refactors the queue and priority statistic handling.\nGeneric queue stats are presented by rte_eth_xstats_get(), and the\ni40e_xstats_get() exposes only the extra stats.\n\nSigned-off-by: Harry van Haaren <harry.van.haaren@intel.com>\n---\n drivers/net/i40e/i40e_ethdev.c | 112 ++++++++++++++++++++++++-----------------\n 1 file changed, 65 insertions(+), 47 deletions(-)",
    "diff": "diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c\nindex ddf3d38..c3f0235 100644\n--- a/drivers/net/i40e/i40e_ethdev.c\n+++ b/drivers/net/i40e/i40e_ethdev.c\n@@ -490,6 +490,9 @@ static const struct rte_i40e_xstats_name_off rte_i40e_stats_strings[] = {\n \t{\"tx_dropped\", offsetof(struct i40e_eth_stats, tx_discards)},\n };\n \n+#define I40E_NB_ETH_XSTATS (sizeof(rte_i40e_stats_strings) / \\\n+\t\tsizeof(rte_i40e_stats_strings[0]))\n+\n static const struct rte_i40e_xstats_name_off rte_i40e_hw_port_strings[] = {\n \t{\"tx_link_down_dropped\", offsetof(struct i40e_hw_port_stats,\n \t\ttx_dropped_link_down)},\n@@ -556,15 +559,30 @@ static const struct rte_i40e_xstats_name_off rte_i40e_hw_port_strings[] = {\n \t\trx_lpi_count)},\n };\n \n-/* Q Stats: 5 stats are exposed for each queue, implemented in xstats_get() */\n-#define I40E_NB_HW_PORT_Q_STATS (8 * 5)\n-\n-#define I40E_NB_ETH_XSTATS (sizeof(rte_i40e_stats_strings) / \\\n-\t\tsizeof(rte_i40e_stats_strings[0]))\n #define I40E_NB_HW_PORT_XSTATS (sizeof(rte_i40e_hw_port_strings) / \\\n \t\tsizeof(rte_i40e_hw_port_strings[0]))\n-#define I40E_NB_XSTATS (I40E_NB_ETH_XSTATS + I40E_NB_HW_PORT_XSTATS + \\\n-\t\tI40E_NB_HW_PORT_Q_STATS)\n+\n+static const struct rte_i40e_xstats_name_off rte_i40e_rxq_prio_strings[] = {\n+\t{\"xon_packets\", offsetof(struct i40e_hw_port_stats,\n+\t\tpriority_xon_rx)},\n+\t{\"xoff_packets\", offsetof(struct i40e_hw_port_stats,\n+\t\tpriority_xoff_rx)},\n+};\n+\n+#define I40E_NB_RXQ_PRIO_XSTATS (sizeof(rte_i40e_rxq_prio_strings) / \\\n+\t\tsizeof(rte_i40e_rxq_prio_strings[0]))\n+\n+static const struct rte_i40e_xstats_name_off rte_i40e_txq_prio_strings[] = {\n+\t{\"xon_packets\", offsetof(struct i40e_hw_port_stats,\n+\t\tpriority_xon_tx)},\n+\t{\"xoff_packets\", offsetof(struct i40e_hw_port_stats,\n+\t\tpriority_xoff_tx)},\n+\t{\"xon_to_xoff_packets\", offsetof(struct i40e_hw_port_stats,\n+\t\tpriority_xon_2_xoff)},\n+};\n+\n+#define I40E_NB_TXQ_PRIO_XSTATS (sizeof(rte_i40e_txq_prio_strings) / \\\n+\t\tsizeof(rte_i40e_txq_prio_strings[0]))\n \n static struct eth_driver rte_i40e_pmd = {\n \t.pci_drv = {\n@@ -2124,6 +2142,14 @@ i40e_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)\n \tPMD_DRV_LOG(DEBUG, \"***************** PF stats end ********************\");\n }\n \n+static uint32_t\n+i40e_xstats_calc_num(void)\n+{\n+\treturn I40E_NB_ETH_XSTATS + I40E_NB_HW_PORT_XSTATS +\n+\t\t(I40E_NB_RXQ_PRIO_XSTATS * 8) +\n+\t\t(I40E_NB_TXQ_PRIO_XSTATS * 8);\n+}\n+\n static void\n i40e_dev_xstats_reset(struct rte_eth_dev *dev)\n {\n@@ -2145,18 +2171,20 @@ i40e_dev_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstats *xstats,\n {\n \tstruct i40e_pf *pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private);\n \tstruct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n-\tunsigned i, count = 0;\n+\tunsigned i, count, prio;\n \tstruct i40e_hw_port_stats *hw_stats = &pf->stats;\n \n-\tif (n < I40E_NB_XSTATS)\n-\t\treturn I40E_NB_XSTATS;\n+\tcount = i40e_xstats_calc_num();\n+\tif (n < count)\n+\t\treturn count;\n \n \ti40e_read_stats_registers(pf, hw);\n \n-\t/* Reset */\n \tif (xstats == NULL)\n \t\treturn 0;\n \n+\tcount = 0;\n+\n \t/* Get stats from i40e_eth_stats struct */\n \tfor (i = 0; i < I40E_NB_ETH_XSTATS; i++) {\n \t\tsnprintf(xstats[count].name, sizeof(xstats[count].name),\n@@ -2175,45 +2203,35 @@ i40e_dev_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstats *xstats,\n \t\tcount++;\n \t}\n \n-\t/* Get per-queue stats from i40e_hw_port struct */\n-\tfor (i = 0; i < 8; i++) {\n-\t\tsnprintf(xstats[count].name, sizeof(xstats[count].name),\n-\t\t\t \"rx_q%u_xon_priority_packets\", i);\n-\t\txstats[count].value = *(uint64_t *)(((char *)hw_stats) +\n-\t\t\t\toffsetof(struct i40e_hw_port_stats,\n-\t\t\t\t\t priority_xon_rx[i]));\n-\t\tcount++;\n-\n-\t\tsnprintf(xstats[count].name, sizeof(xstats[count].name),\n-\t\t\t \"rx_q%u_xoff_priority_packets\", i);\n-\t\txstats[count].value = *(uint64_t *)(((char *)hw_stats) +\n-\t\t\t\toffsetof(struct i40e_hw_port_stats,\n-\t\t\t\t\t priority_xoff_rx[i]));\n-\t\tcount++;\n-\n-\t\tsnprintf(xstats[count].name, sizeof(xstats[count].name),\n-\t\t\t \"tx_q%u_xon_priority_packets\", i);\n-\t\txstats[count].value = *(uint64_t *)(((char *)hw_stats) +\n-\t\t\t\toffsetof(struct i40e_hw_port_stats,\n-\t\t\t\t\t priority_xon_tx[i]));\n-\t\tcount++;\n-\n-\t\tsnprintf(xstats[count].name, sizeof(xstats[count].name),\n-\t\t\t \"tx_q%u_xoff_priority_packets\", i);\n-\t\txstats[count].value = *(uint64_t *)(((char *)hw_stats) +\n-\t\t\t\toffsetof(struct i40e_hw_port_stats,\n-\t\t\t\t\t priority_xoff_tx[i]));\n-\t\tcount++;\n+\tfor (i = 0; i < I40E_NB_RXQ_PRIO_XSTATS; i++) {\n+\t\tfor (prio = 0; prio < 8; prio++) {\n+\t\t\tsnprintf(xstats[count].name,\n+\t\t\t\t sizeof(xstats[count].name),\n+\t\t\t\t \"rx_priority%u_%s\", prio,\n+\t\t\t\t rte_i40e_rxq_prio_strings[i].name);\n+\t\t\txstats[count].value =\n+\t\t\t\t*(uint64_t *)(((char *)hw_stats) +\n+\t\t\t\trte_i40e_rxq_prio_strings[i].offset +\n+\t\t\t\t(sizeof(uint64_t) * prio));\n+\t\t\tcount++;\n+\t\t}\n+\t}\n \n-\t\tsnprintf(xstats[count].name, sizeof(xstats[count].name),\n-\t\t\t \"xx_q%u_xon_to_xoff_priority_packets\", i);\n-\t\txstats[count].value = *(uint64_t *)(((char *)hw_stats) +\n-\t\t\t\toffsetof(struct i40e_hw_port_stats,\n-\t\t\t\t\t priority_xon_2_xoff[i]));\n-\t\tcount++;\n+\tfor (i = 0; i < I40E_NB_TXQ_PRIO_XSTATS; i++) {\n+\t\tfor (prio = 0; prio < 8; prio++) {\n+\t\t\tsnprintf(xstats[count].name,\n+\t\t\t\t sizeof(xstats[count].name),\n+\t\t\t\t \"tx_priority%u_%s\", prio,\n+\t\t\t\t rte_i40e_txq_prio_strings[i].name);\n+\t\t\txstats[count].value =\n+\t\t\t\t*(uint64_t *)(((char *)hw_stats) +\n+\t\t\t\trte_i40e_txq_prio_strings[i].offset +\n+\t\t\t\t(sizeof(uint64_t) * prio));\n+\t\t\tcount++;\n+\t\t}\n \t}\n \n-\treturn I40E_NB_XSTATS;\n+\treturn count;\n }\n \n /* Reset the statistics */\n",
    "prefixes": [
        "dpdk-dev",
        "3/3"
    ]
}