Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/951752/?format=api
{ "id": 951752, "url": "http://patchwork.ozlabs.org/api/patches/951752/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20180731104148.11896-4-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-4-alice.michael@intel.com>", "list_archive_url": null, "date": "2018-07-31T10:41:41", "name": "[next,S93,04/11] i40e: convert VEB TC stats to use an i40e_stats array", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "0f45ba0b84486f77cf4a751f806c3a9011eed103", "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-4-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/951752/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/951752/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 41g5Cr1KN7z9s1R\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 1 Aug 2018 04:52:40 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 9885585F4D;\n\tTue, 31 Jul 2018 18:52:38 +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 Mn36bnoGK9EE; Tue, 31 Jul 2018 18:52:35 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id D8A6885EC9;\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 453491C3E95\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 31 Jul 2018 18:52:31 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 416F685C37\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 31 Jul 2018 18:52:31 +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 ZEnrh1CEvZfu for <intel-wired-lan@lists.osuosl.org>;\n\tTue, 31 Jul 2018 18:52:28 +0000 (UTC)", "from mga07.intel.com (mga07.intel.com [134.134.136.100])\n\tby whitealder.osuosl.org (Postfix) with ESMTPS id 3E9C385B6F\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=\"61310072\"", "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:41 -0700", "Message-Id": "<20180731104148.11896-4-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 04/11] i40e: convert VEB TC stats\n\tto use an i40e_stats array", "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 VEB TC stats are currently implemented with separate parsing,\ninstead of using the i40e_stats array and associated helper functions.\nThis is likely because the stats rely on embedding the TC number into\nthe stat name.\n\nUpdate i40e_add_stat_strings to take variadic arguments, and use these\nto vsnprintf the i40e_stats string as a string containing format\nspecifiers.\n\nCreate a stats array for the VEB TC related stats,\ni40e_gstrings_veb_tc_stats, and use this along with the helper functions\nto remove the specialized boiler plate code.\n\nAlways call i40e_add_ethtool_stats for both this array and the general\nVEB stats array. This ensures that we zero out any memory in case it was\nnot zero-allocated for us.\n\nThis ultimately results in less boiler plate code for the\ni40e_get_stat_strings and i40e_get_ethtool_stats.\n\nSigned-off-by: Jacob Keller <jacob.e.keller@intel.com>\n---\n drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 83 +++++++++++++-------------\n 1 file changed, 43 insertions(+), 40 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\nindex c051afe..52ccafe 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\n@@ -7,6 +7,11 @@\n #include \"i40e_diag.h\"\n \n struct i40e_stats {\n+\t/* The stat_string is expected to be a format string formatted using\n+\t * vsnprintf by i40e_add_stat_strings. Every member of a stats array\n+\t * should use the same format specifiers as they will be formatted\n+\t * using the same variadic arguments.\n+\t */\n \tchar stat_string[ETH_GSTRING_LEN];\n \tint sizeof_stat;\n \tint stat_offset;\n@@ -56,6 +61,13 @@ static const struct i40e_stats i40e_gstrings_veb_stats[] = {\n \tI40E_VEB_STAT(\"veb.rx_unknown_protocol\", stats.rx_unknown_protocol),\n };\n \n+static const struct i40e_stats i40e_gstrings_veb_tc_stats[] = {\n+\tI40E_VEB_STAT(\"veb.tc_%u_tx_packets\", tc_stats.tc_tx_packets),\n+\tI40E_VEB_STAT(\"veb.tc_%u_tx_bytes\", tc_stats.tc_tx_bytes),\n+\tI40E_VEB_STAT(\"veb.tc_%u_rx_packets\", tc_stats.tc_rx_packets),\n+\tI40E_VEB_STAT(\"veb.tc_%u_rx_bytes\", tc_stats.tc_rx_bytes),\n+};\n+\n static const struct i40e_stats i40e_gstrings_misc_stats[] = {\n \tI40E_VSI_STAT(\"rx_unicast\", eth_stats.rx_unicast),\n \tI40E_VSI_STAT(\"tx_unicast\", eth_stats.tx_unicast),\n@@ -162,16 +174,14 @@ static const struct i40e_stats i40e_gstrings_stats[] = {\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-#define I40E_VEB_TC_STATS_LEN ( \\\n-\t\t(FIELD_SIZEOF(struct i40e_veb, tc_stats.tc_rx_packets) + \\\n-\t\t FIELD_SIZEOF(struct i40e_veb, tc_stats.tc_rx_bytes) + \\\n-\t\t FIELD_SIZEOF(struct i40e_veb, tc_stats.tc_tx_packets) + \\\n-\t\t FIELD_SIZEOF(struct i40e_veb, tc_stats.tc_tx_bytes)) \\\n-\t\t / sizeof(u64))\n-#define I40E_VEB_STATS_LEN\tARRAY_SIZE(i40e_gstrings_veb_stats)\n-#define I40E_VEB_STATS_TOTAL\t(I40E_VEB_STATS_LEN + I40E_VEB_TC_STATS_LEN)\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+\t\t\t\t I40E_MAX_TRAFFIC_CLASS))\n+\n #define I40E_PF_STATS_LEN(n)\t(I40E_GLOBAL_STATS_LEN + \\\n \t\t\t\t I40E_PFC_STATS_LEN + \\\n+\t\t\t\t I40E_VEB_STATS_LEN + \\\n \t\t\t\t I40E_VSI_STATS_LEN((n)))\n \n enum i40e_ethtool_test_id {\n@@ -1681,7 +1691,7 @@ static int i40e_get_stats_count(struct net_device *netdev)\n \tstruct i40e_pf *pf = vsi->back;\n \n \tif (vsi == pf->vsi[pf->lan_vsi] && pf->hw.partition_id == 1)\n-\t\treturn I40E_PF_STATS_LEN(netdev) + I40E_VEB_STATS_TOTAL;\n+\t\treturn I40E_PF_STATS_LEN(netdev);\n \telse\n \t\treturn I40E_VSI_STATS_LEN(netdev);\n }\n@@ -1809,8 +1819,10 @@ static void i40e_get_ethtool_stats(struct net_device *netdev,\n \tstruct i40e_ring *tx_ring, *rx_ring;\n \tstruct i40e_vsi *vsi = np->vsi;\n \tstruct i40e_pf *pf = vsi->back;\n+\tstruct i40e_veb *veb = pf->veb[pf->lan_veb];\n \tunsigned int i;\n \tunsigned int start;\n+\tbool veb_stats;\n \n \ti40e_update_stats(vsi);\n \n@@ -1855,21 +1867,19 @@ static void i40e_get_ethtool_stats(struct net_device *netdev,\n \tif (vsi != pf->vsi[pf->lan_vsi] || pf->hw.partition_id != 1)\n \t\treturn;\n \n-\tif ((pf->lan_veb != I40E_NO_VEB) &&\n-\t (pf->flags & I40E_FLAG_VEB_STATS_ENABLED)) {\n-\t\tstruct i40e_veb *veb = pf->veb[pf->lan_veb];\n+\tveb_stats = ((pf->lan_veb != I40E_NO_VEB) &&\n+\t\t (pf->flags & I40E_FLAG_VEB_STATS_ENABLED));\n \n-\t\ti40e_add_ethtool_stats(&data, veb, i40e_gstrings_veb_stats);\n+\t/* If veb stats aren't enabled, pass NULL instead of the veb so that\n+\t * we initialize stats to zero and update the data pointer\n+\t * intelligently\n+\t */\n+\ti40e_add_ethtool_stats(&data, veb_stats ? veb : NULL,\n+\t\t\t i40e_gstrings_veb_stats);\n \n-\t\tfor (i = 0; i < I40E_MAX_TRAFFIC_CLASS; i++) {\n-\t\t\t*(data++) = veb->tc_stats.tc_tx_packets[i];\n-\t\t\t*(data++) = veb->tc_stats.tc_tx_bytes[i];\n-\t\t\t*(data++) = veb->tc_stats.tc_rx_packets[i];\n-\t\t\t*(data++) = veb->tc_stats.tc_rx_bytes[i];\n-\t\t}\n-\t} else {\n-\t\tdata += I40E_VEB_STATS_TOTAL;\n-\t}\n+\tfor (i = 0; i < I40E_MAX_TRAFFIC_CLASS; i++)\n+\t\ti40e_add_ethtool_stats(&data, veb_stats ? veb : NULL,\n+\t\t\t\t i40e_gstrings_veb_tc_stats);\n \n \ti40e_add_ethtool_stats(&data, pf, i40e_gstrings_stats);\n \n@@ -1891,16 +1901,21 @@ static void i40e_get_ethtool_stats(struct net_device *netdev,\n * @stats: stat definitions array\n * @size: size of the stats array\n *\n- * Copy the strings described by stats into the buffer pointed at by p.\n+ * Format and copy the strings described by stats into the buffer pointed at\n+ * by p.\n **/\n static void __i40e_add_stat_strings(u8 **p, const struct i40e_stats stats[],\n-\t\t\t\t const unsigned int size)\n+\t\t\t\t const unsigned int size, ...)\n {\n \tunsigned int i;\n \n \tfor (i = 0; i < size; i++) {\n-\t\tsnprintf(*p, ETH_GSTRING_LEN, \"%s\", stats[i].stat_string);\n+\t\tva_list args;\n+\n+\t\tva_start(args, size);\n+\t\tvsnprintf(*p, ETH_GSTRING_LEN, stats[i].stat_string, args);\n \t\t*p += ETH_GSTRING_LEN;\n+\t\tva_end(args);\n \t}\n }\n \n@@ -1914,7 +1929,7 @@ static void __i40e_add_stat_strings(u8 **p, const struct i40e_stats stats[],\n * for it.\n **/\n #define i40e_add_stat_strings(p, stats, ...) \\\n-\t__i40e_add_stat_strings(p, stats, ARRAY_SIZE(stats))\n+\t__i40e_add_stat_strings(p, stats, ARRAY_SIZE(stats), ## __VA_ARGS__)\n \n /**\n * i40e_get_stat_strings - copy stat strings into supplied buffer\n@@ -1953,20 +1968,8 @@ static void i40e_get_stat_strings(struct net_device *netdev, u8 *data)\n \n \ti40e_add_stat_strings(&data, i40e_gstrings_veb_stats);\n \n-\tfor (i = 0; i < I40E_MAX_TRAFFIC_CLASS; i++) {\n-\t\tsnprintf(data, ETH_GSTRING_LEN,\n-\t\t\t \"veb.tc_%u_tx_packets\", i);\n-\t\tdata += ETH_GSTRING_LEN;\n-\t\tsnprintf(data, ETH_GSTRING_LEN,\n-\t\t\t \"veb.tc_%u_tx_bytes\", i);\n-\t\tdata += ETH_GSTRING_LEN;\n-\t\tsnprintf(data, ETH_GSTRING_LEN,\n-\t\t\t \"veb.tc_%u_rx_packets\", i);\n-\t\tdata += ETH_GSTRING_LEN;\n-\t\tsnprintf(data, ETH_GSTRING_LEN,\n-\t\t\t \"veb.tc_%u_rx_bytes\", i);\n-\t\tdata += ETH_GSTRING_LEN;\n-\t}\n+\tfor (i = 0; i < I40E_MAX_TRAFFIC_CLASS; i++)\n+\t\ti40e_add_stat_strings(&data, i40e_gstrings_veb_tc_stats, i);\n \n \ti40e_add_stat_strings(&data, i40e_gstrings_stats);\n \n", "prefixes": [ "next", "S93", "04/11" ] }