Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/951747/?format=api
{ "id": 951747, "url": "http://patchwork.ozlabs.org/api/patches/951747/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20180731104148.11896-5-alice.michael@intel.com/", "project": { "id": 46, "url": "http://patchwork.ozlabs.org/api/projects/46/?format=api", "name": "Intel Wired Ethernet development", "link_name": "intel-wired-lan", "list_id": "intel-wired-lan.osuosl.org", "list_email": "intel-wired-lan@osuosl.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20180731104148.11896-5-alice.michael@intel.com>", "list_archive_url": null, "date": "2018-07-31T10:41:42", "name": "[next,S93,05/11] i40e: convert priority flow control stats to use helpers", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "d5663dc4ddba832f258124c17e22276db4d03e6d", "submitter": { "id": 71123, "url": "http://patchwork.ozlabs.org/api/people/71123/?format=api", "name": "Michael, Alice", "email": "alice.michael@intel.com" }, "delegate": { "id": 68, "url": "http://patchwork.ozlabs.org/api/users/68/?format=api", "username": "jtkirshe", "first_name": "Jeff", "last_name": "Kirsher", "email": "jeffrey.t.kirsher@intel.com" }, "mbox": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20180731104148.11896-5-alice.michael@intel.com/mbox/", "series": [ { "id": 58617, "url": "http://patchwork.ozlabs.org/api/series/58617/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=58617", "date": "2018-07-31T10:41:48", "name": "[next,S93,01/11] i40e: add helper function for copying strings from stat arrays", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/58617/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/951747/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/951747/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<intel-wired-lan-bounces@osuosl.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Delivered-To": [ "patchwork-incoming@bilbo.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Authentication-Results": [ "ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=osuosl.org\n\t(client-ip=140.211.166.137; helo=fraxinus.osuosl.org;\n\tenvelope-from=intel-wired-lan-bounces@osuosl.org;\n\treceiver=<UNKNOWN>)", "ozlabs.org;\n\tdmarc=fail (p=none dis=none) header.from=intel.com" ], "Received": [ "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 41g5Cm0LF6z9s1R\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 1 Aug 2018 04:52:36 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 9E6B085F4D;\n\tTue, 31 Jul 2018 18:52:34 +0000 (UTC)", "from fraxinus.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id WWR5Q5O96T-K; Tue, 31 Jul 2018 18:52:33 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 7377885C4F;\n\tTue, 31 Jul 2018 18:52:33 +0000 (UTC)", "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id 8D51E1C3E95\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 31 Jul 2018 18:52:30 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 899178621B\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 31 Jul 2018 18:52:30 +0000 (UTC)", "from whitealder.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id HHorl7CXjQWj for <intel-wired-lan@lists.osuosl.org>;\n\tTue, 31 Jul 2018 18:52:29 +0000 (UTC)", "from mga07.intel.com (mga07.intel.com [134.134.136.100])\n\tby whitealder.osuosl.org (Postfix) with ESMTPS id F17C585B8E\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 31 Jul 2018 18:52:28 +0000 (UTC)", "from orsmga008.jf.intel.com ([10.7.209.65])\n\tby orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t31 Jul 2018 11:52:27 -0700", "from alicemic-2.jf.intel.com ([10.166.16.121])\n\tby orsmga008.jf.intel.com with ESMTP; 31 Jul 2018 11:52:27 -0700" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.51,428,1526367600\"; d=\"scan'208\";a=\"61310075\"", "From": "Alice Michael <alice.michael@intel.com>", "To": "alice.michael@intel.com,\n\tintel-wired-lan@lists.osuosl.org", "Date": "Tue, 31 Jul 2018 03:41:42 -0700", "Message-Id": "<20180731104148.11896-5-alice.michael@intel.com>", "X-Mailer": "git-send-email 2.9.5", "In-Reply-To": "<20180731104148.11896-1-alice.michael@intel.com>", "References": "<20180731104148.11896-1-alice.michael@intel.com>", "Subject": "[Intel-wired-lan] [next PATCH S93 05/11] i40e: convert priority\n\tflow control stats to use helpers", "X-BeenThere": "intel-wired-lan@osuosl.org", "X-Mailman-Version": "2.1.24", "Precedence": "list", "List-Id": "Intel Wired Ethernet Linux Kernel Driver Development\n\t<intel-wired-lan.osuosl.org>", "List-Unsubscribe": "<https://lists.osuosl.org/mailman/options/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@osuosl.org?subject=unsubscribe>", "List-Archive": "<http://lists.osuosl.org/pipermail/intel-wired-lan/>", "List-Post": "<mailto:intel-wired-lan@osuosl.org>", "List-Help": "<mailto:intel-wired-lan-request@osuosl.org?subject=help>", "List-Subscribe": "<https://lists.osuosl.org/mailman/listinfo/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@osuosl.org?subject=subscribe>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "intel-wired-lan-bounces@osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@osuosl.org>" }, "content": "From: Jacob Keller <jacob.e.keller@intel.com>\n\nThe priority flow control statistics are laid out in the stats structure\nusing arrays. This made it unwieldy to use as part of an i40e_stats\narray.\n\nAdd a new structure type, i40e_pfc_stats, and a helper function\ni40e_get_pfc_stats which can return the stats for a given priority\nvalue as an i40e_pfc_stats structure.\n\nUse this to create an i40e_stats array, which we'll use to format and\ncopy the strings and stats into the supplied buffers.\n\nThis reduces even more boiler plate code in i40e_get_ethtool_stats and\ni40e_get_stat_strings.\n\nAn alternative would be to modify the structure definition for the pfc\nstats, but this is more invasive to the rest of the code base.\n\nNote that a macro was used to setup the copy of stats from the\npf->stats, as this reduces the chance of typos in the code names. It\nwill produce a checkpatch.pl warning due to re-use of a macro argument.\nIn this case, it should be safe, as the macro will fail to compile in\ncases where the argument is not a simple structure member name, and thus\narguments with side effects should not be an issue.\n\nSigned-off-by: Jacob Keller <jacob.e.keller@intel.com>\n---\n drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 87 +++++++++++++++-----------\n 1 file changed, 51 insertions(+), 36 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\nindex 52ccafe..9c380c0 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\n@@ -31,6 +31,8 @@ struct i40e_stats {\n \tI40E_STAT(struct i40e_vsi, _name, _stat)\n #define I40E_VEB_STAT(_name, _stat) \\\n \tI40E_STAT(struct i40e_veb, _name, _stat)\n+#define I40E_PFC_STAT(_name, _stat) \\\n+\tI40E_STAT(struct i40e_pfc_stats, _name, _stat)\n \n static const struct i40e_stats i40e_gstrings_net_stats[] = {\n \tI40E_NETDEV_STAT(rx_packets),\n@@ -153,6 +155,22 @@ static const struct i40e_stats i40e_gstrings_stats[] = {\n \tI40E_PF_STAT(\"port.rx_lpi_count\", stats.rx_lpi_count),\n };\n \n+struct i40e_pfc_stats {\n+\tu64 priority_xon_rx;\n+\tu64 priority_xoff_rx;\n+\tu64 priority_xon_tx;\n+\tu64 priority_xoff_tx;\n+\tu64 priority_xon_2_xoff;\n+};\n+\n+static const struct i40e_stats i40e_gstrings_pfc_stats[] = {\n+\tI40E_PFC_STAT(\"port.tx_priority_%u_xon_tx\", priority_xon_tx),\n+\tI40E_PFC_STAT(\"port.tx_priority_%u_xoff_tx\", priority_xoff_tx),\n+\tI40E_PFC_STAT(\"port.rx_priority_%u_xon_rx\", priority_xon_rx),\n+\tI40E_PFC_STAT(\"port.rx_priority_%u_xoff_rx\", priority_xoff_rx),\n+\tI40E_PFC_STAT(\"port.rx_priority_%u_xon_2_xoff\", priority_xon_2_xoff),\n+};\n+\n /* We use num_tx_queues here as a proxy for the maximum number of queues\n * available because we always allocate queues symmetrically.\n */\n@@ -167,13 +185,9 @@ static const struct i40e_stats i40e_gstrings_stats[] = {\n #define I40E_VSI_STATS_LEN(n)\t(I40E_NETDEV_STATS_LEN + \\\n \t\t\t\t I40E_MISC_STATS_LEN + \\\n \t\t\t\t I40E_QUEUE_STATS_LEN((n)))\n-#define I40E_PFC_STATS_LEN ( \\\n-\t\t(FIELD_SIZEOF(struct i40e_pf, stats.priority_xoff_rx) + \\\n-\t\t FIELD_SIZEOF(struct i40e_pf, stats.priority_xon_rx) + \\\n-\t\t FIELD_SIZEOF(struct i40e_pf, stats.priority_xoff_tx) + \\\n-\t\t FIELD_SIZEOF(struct i40e_pf, stats.priority_xon_tx) + \\\n-\t\t FIELD_SIZEOF(struct i40e_pf, stats.priority_xon_2_xoff)) \\\n-\t\t / sizeof(u64))\n+\n+#define I40E_PFC_STATS_LEN\t(ARRAY_SIZE(i40e_gstrings_pfc_stats) * \\\n+\t\t\t\t I40E_MAX_USER_PRIORITY)\n \n #define I40E_VEB_STATS_LEN\t(ARRAY_SIZE(i40e_gstrings_veb_stats) + \\\n \t\t\t\t (ARRAY_SIZE(i40e_gstrings_veb_tc_stats) * \\\n@@ -1799,6 +1813,31 @@ __i40e_add_ethtool_stats(u64 **data, void *pointer,\n \t__i40e_add_ethtool_stats(data, pointer, stats, ARRAY_SIZE(stats))\n \n /**\n+ * i40e_get_pfc_stats - copy HW PFC statistics to formatted structure\n+ * @pf: the PF device structure\n+ * @i: the priority value to copy\n+ *\n+ * The PFC stats are found as arrays in pf->stats, which is not easy to pass\n+ * into i40e_add_ethtool_stats. Produce a formatted i40e_pfc_stats structure\n+ * of the PFC stats for the given priority.\n+ **/\n+static inline struct i40e_pfc_stats\n+i40e_get_pfc_stats(struct i40e_pf *pf, unsigned int i)\n+{\n+#define I40E_GET_PFC_STAT(stat, priority) \\\n+\t.stat = pf->stats.stat[priority]\n+\n+\tstruct i40e_pfc_stats pfc = {\n+\t\tI40E_GET_PFC_STAT(priority_xon_rx, i),\n+\t\tI40E_GET_PFC_STAT(priority_xoff_rx, i),\n+\t\tI40E_GET_PFC_STAT(priority_xon_tx, i),\n+\t\tI40E_GET_PFC_STAT(priority_xoff_tx, i),\n+\t\tI40E_GET_PFC_STAT(priority_xon_2_xoff, i),\n+\t};\n+\treturn pfc;\n+}\n+\n+/**\n * i40e_get_ethtool_stats - copy stat values into supplied buffer\n * @netdev: the netdev to collect stats for\n * @stats: ethtool stats command structure\n@@ -1884,15 +1923,10 @@ static void i40e_get_ethtool_stats(struct net_device *netdev,\n \ti40e_add_ethtool_stats(&data, pf, i40e_gstrings_stats);\n \n \tfor (i = 0; i < I40E_MAX_USER_PRIORITY; i++) {\n-\t\t*(data++) = pf->stats.priority_xon_tx[i];\n-\t\t*(data++) = pf->stats.priority_xoff_tx[i];\n-\t}\n-\tfor (i = 0; i < I40E_MAX_USER_PRIORITY; i++) {\n-\t\t*(data++) = pf->stats.priority_xon_rx[i];\n-\t\t*(data++) = pf->stats.priority_xoff_rx[i];\n+\t\tstruct i40e_pfc_stats pfc = i40e_get_pfc_stats(pf, i);\n+\n+\t\ti40e_add_ethtool_stats(&data, &pfc, i40e_gstrings_pfc_stats);\n \t}\n-\tfor (i = 0; i < I40E_MAX_USER_PRIORITY; i++)\n-\t\t*(data++) = pf->stats.priority_xon_2_xoff[i];\n }\n \n /**\n@@ -1973,27 +2007,8 @@ static void i40e_get_stat_strings(struct net_device *netdev, u8 *data)\n \n \ti40e_add_stat_strings(&data, i40e_gstrings_stats);\n \n-\tfor (i = 0; i < I40E_MAX_USER_PRIORITY; i++) {\n-\t\tsnprintf(data, ETH_GSTRING_LEN,\n-\t\t\t \"port.tx_priority_%u_xon\", i);\n-\t\tdata += ETH_GSTRING_LEN;\n-\t\tsnprintf(data, ETH_GSTRING_LEN,\n-\t\t\t \"port.tx_priority_%u_xoff\", i);\n-\t\tdata += ETH_GSTRING_LEN;\n-\t}\n-\tfor (i = 0; i < I40E_MAX_USER_PRIORITY; i++) {\n-\t\tsnprintf(data, ETH_GSTRING_LEN,\n-\t\t\t \"port.rx_priority_%u_xon\", i);\n-\t\tdata += ETH_GSTRING_LEN;\n-\t\tsnprintf(data, ETH_GSTRING_LEN,\n-\t\t\t \"port.rx_priority_%u_xoff\", i);\n-\t\tdata += ETH_GSTRING_LEN;\n-\t}\n-\tfor (i = 0; i < I40E_MAX_USER_PRIORITY; i++) {\n-\t\tsnprintf(data, ETH_GSTRING_LEN,\n-\t\t\t \"port.rx_priority_%u_xon_2_xoff\", i);\n-\t\tdata += ETH_GSTRING_LEN;\n-\t}\n+\tfor (i = 0; i < I40E_MAX_USER_PRIORITY; i++)\n+\t\ti40e_add_stat_strings(&data, i40e_gstrings_pfc_stats, i);\n \n \tWARN_ONCE(p - data != i40e_get_stats_count(netdev) * ETH_GSTRING_LEN,\n \t\t \"stat strings count mismatch!\");\n", "prefixes": [ "next", "S93", "05/11" ] }