Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/951750/?format=api
{ "id": 951750, "url": "http://patchwork.ozlabs.org/api/patches/951750/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20180731104148.11896-2-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-2-alice.michael@intel.com>", "list_archive_url": null, "date": "2018-07-31T10:41:39", "name": "[next,S93,02/11] i40e: add helper to copy statistic values into ethtool buffer", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "cdc2017ca6926f5ae1c7768866389a5630f0b9c7", "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-2-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/951750/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/951750/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.136; helo=silver.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 silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\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 41g5Cn6jWkz9s1R\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 1 Aug 2018 04:52:37 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 5E1682408F;\n\tTue, 31 Jul 2018 18:52:36 +0000 (UTC)", "from silver.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id QR53RXaqPqPr; Tue, 31 Jul 2018 18:52:34 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id 49D7424154;\n\tTue, 31 Jul 2018 18:52:34 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id 716371C3E95\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 31 Jul 2018 18:52:32 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 6D2F223FD1\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 31 Jul 2018 18:52:32 +0000 (UTC)", "from silver.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id 2QtIeQBwGHfn 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 silver.osuosl.org (Postfix) with ESMTPS id 4A58223F8A\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 31 Jul 2018 18:52:29 +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=\"61310070\"", "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:39 -0700", "Message-Id": "<20180731104148.11896-2-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 02/11] i40e: add helper to copy\n\tstatistic values into ethtool buffer", "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\nSimilar to the helper function to copy the ethtool stats strings, add\nand use a helper function for copying the ethtool stats into the\nsupplied buffer.\n\nJust like before, we use a macro to avoid having to pass ARRAY_SIZE\nmanually, so as to reduce chance of bugs.\n\nSome of the stats, especially queue stats, are a bit trickier, and will\nbe handled in future patches.\n\nSigned-off-by: Jacob Keller <jacob.e.keller@intel.com>\n---\n drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 116 ++++++++++++++++++++-----\n 1 file changed, 93 insertions(+), 23 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\nindex 20e8630..c051afe 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\n@@ -1706,6 +1706,89 @@ static int i40e_get_sset_count(struct net_device *netdev, int sset)\n }\n \n /**\n+ * i40e_add_one_ethtool_stat - copy the stat into the supplied buffer\n+ * @data: location to store the stat value\n+ * @pointer: basis for where to copy from\n+ * @stat: the stat definition\n+ *\n+ * Copies the stat data defined by the pointer and stat structure pair into\n+ * the memory supplied as data. Used to implement i40e_add_ethtool_stats.\n+ * If the pointer is null, data will be zero'd.\n+ */\n+static inline void\n+i40e_add_one_ethtool_stat(u64 *data, void *pointer,\n+\t\t\t const struct i40e_stats *stat)\n+{\n+\tchar *p;\n+\n+\tif (!pointer) {\n+\t\t/* ensure that the ethtool data buffer is zero'd for any stats\n+\t\t * which don't have a valid pointer.\n+\t\t */\n+\t\t*data = 0;\n+\t\treturn;\n+\t}\n+\n+\tp = (char *)pointer + stat->stat_offset;\n+\tswitch (stat->sizeof_stat) {\n+\tcase sizeof(u64):\n+\t\t*data = *((u64 *)p);\n+\t\tbreak;\n+\tcase sizeof(u32):\n+\t\t*data = *((u32 *)p);\n+\t\tbreak;\n+\tcase sizeof(u16):\n+\t\t*data = *((u16 *)p);\n+\t\tbreak;\n+\tcase sizeof(u8):\n+\t\t*data = *((u8 *)p);\n+\t\tbreak;\n+\tdefault:\n+\t\tWARN_ONCE(1, \"unexpected stat size for %s\",\n+\t\t\t stat->stat_string);\n+\t\t*data = 0;\n+\t}\n+}\n+\n+/**\n+ * __i40e_add_ethtool_stats - copy stats into the ethtool supplied buffer\n+ * @data: ethtool stats buffer\n+ * @pointer: location to copy stats from\n+ * @stats: array of stats to copy\n+ * @size: the size of the stats definition\n+ *\n+ * Copy the stats defined by the stats array using the pointer as a base into\n+ * the data buffer supplied by ethtool. Updates the data pointer to point to\n+ * the next empty location for successive calls to __i40e_add_ethtool_stats.\n+ * If pointer is null, set the data values to zero and update the pointer to\n+ * skip these stats.\n+ **/\n+static inline void\n+__i40e_add_ethtool_stats(u64 **data, void *pointer,\n+\t\t\t const struct i40e_stats stats[],\n+\t\t\t const unsigned int size)\n+{\n+\tunsigned int i;\n+\n+\tfor (i = 0; i < size; i++)\n+\t\ti40e_add_one_ethtool_stat((*data)++, pointer, &stats[i]);\n+}\n+\n+/**\n+ * i40e_add_ethtool_stats - copy stats into ethtool supplied buffer\n+ * @data: ethtool stats buffer\n+ * @pointer: location where stats are stored\n+ * @stats: static const array of stat definitions\n+ *\n+ * Macro to ease the use of __i40e_add_ethtool_stats by taking a static\n+ * constant stats array and passing the ARRAY_SIZE(). This avoids typos by\n+ * ensuring that we pass the size associated with the given stats array.\n+ * Assumes that stats is an array.\n+ **/\n+#define i40e_add_ethtool_stats(data, pointer, stats) \\\n+\t__i40e_add_ethtool_stats(data, pointer, stats, ARRAY_SIZE(stats))\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@@ -1727,22 +1810,15 @@ static void i40e_get_ethtool_stats(struct net_device *netdev,\n \tstruct i40e_vsi *vsi = np->vsi;\n \tstruct i40e_pf *pf = vsi->back;\n \tunsigned int i;\n-\tchar *p;\n-\tstruct rtnl_link_stats64 *net_stats = i40e_get_vsi_stats_struct(vsi);\n \tunsigned int start;\n \n \ti40e_update_stats(vsi);\n \n-\tfor (i = 0; i < I40E_NETDEV_STATS_LEN; i++) {\n-\t\tp = (char *)net_stats + i40e_gstrings_net_stats[i].stat_offset;\n-\t\t*(data++) = (i40e_gstrings_net_stats[i].sizeof_stat ==\n-\t\t\tsizeof(u64)) ? *(u64 *)p : *(u32 *)p;\n-\t}\n-\tfor (i = 0; i < I40E_MISC_STATS_LEN; i++) {\n-\t\tp = (char *)vsi + i40e_gstrings_misc_stats[i].stat_offset;\n-\t\t*(data++) = (i40e_gstrings_misc_stats[i].sizeof_stat ==\n-\t\t\t sizeof(u64)) ? *(u64 *)p : *(u32 *)p;\n-\t}\n+\ti40e_add_ethtool_stats(&data, i40e_get_vsi_stats_struct(vsi),\n+\t\t\t i40e_gstrings_net_stats);\n+\n+\ti40e_add_ethtool_stats(&data, vsi, i40e_gstrings_misc_stats);\n+\n \trcu_read_lock();\n \tfor (i = 0; i < I40E_MAX_NUM_QUEUES(netdev) ; i++) {\n \t\ttx_ring = READ_ONCE(vsi->tx_rings[i]);\n@@ -1783,12 +1859,8 @@ static void i40e_get_ethtool_stats(struct net_device *netdev,\n \t (pf->flags & I40E_FLAG_VEB_STATS_ENABLED)) {\n \t\tstruct i40e_veb *veb = pf->veb[pf->lan_veb];\n \n-\t\tfor (i = 0; i < I40E_VEB_STATS_LEN; i++) {\n-\t\t\tp = (char *)veb;\n-\t\t\tp += i40e_gstrings_veb_stats[i].stat_offset;\n-\t\t\t*(data++) = (i40e_gstrings_veb_stats[i].sizeof_stat ==\n-\t\t\t\t sizeof(u64)) ? *(u64 *)p : *(u32 *)p;\n-\t\t}\n+\t\ti40e_add_ethtool_stats(&data, veb, 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@@ -1798,11 +1870,9 @@ static void i40e_get_ethtool_stats(struct net_device *netdev,\n \t} else {\n \t\tdata += I40E_VEB_STATS_TOTAL;\n \t}\n-\tfor (i = 0; i < I40E_GLOBAL_STATS_LEN; i++) {\n-\t\tp = (char *)pf + i40e_gstrings_stats[i].stat_offset;\n-\t\t*(data++) = (i40e_gstrings_stats[i].sizeof_stat ==\n-\t\t\t sizeof(u64)) ? *(u64 *)p : *(u32 *)p;\n-\t}\n+\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", "prefixes": [ "next", "S93", "02/11" ] }