Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/915567/?format=api
{ "id": 915567, "url": "http://patchwork.ozlabs.org/api/patches/915567/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20180517080840.30192-6-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": "<20180517080840.30192-6-alice.michael@intel.com>", "list_archive_url": null, "date": "2018-05-17T08:08:37", "name": "[next,S92,6/9] i40e: fold prefix strings directly into stat names", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "d37f098f2ce0599bd975408dd04575fadeea4bbf", "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/20180517080840.30192-6-alice.michael@intel.com/mbox/", "series": [ { "id": 45017, "url": "http://patchwork.ozlabs.org/api/series/45017/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=45017", "date": "2018-05-17T08:08:34", "name": "[next,S92,1/9] i40e: free skb after clearing lock in ptp_stop", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/45017/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/915567/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/915567/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 40mxKz3DLvz9s4Y\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 18 May 2018 02:17:59 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id CC57787637;\n\tThu, 17 May 2018 16:17:57 +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 BRCx8AnAaC76; Thu, 17 May 2018 16:17:56 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 275AD87621;\n\tThu, 17 May 2018 16:17:56 +0000 (UTC)", "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id 2BD981C2C4E\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 17 May 2018 16:17:53 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 28C0F88266\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 17 May 2018 16:17:53 +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 nnhjWSrjgkCj for <intel-wired-lan@lists.osuosl.org>;\n\tThu, 17 May 2018 16:17:49 +0000 (UTC)", "from mga11.intel.com (mga11.intel.com [192.55.52.93])\n\tby whitealder.osuosl.org (Postfix) with ESMTPS id 8068488269\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 17 May 2018 16:17:48 +0000 (UTC)", "from orsmga006.jf.intel.com ([10.7.209.51])\n\tby fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t17 May 2018 09:17:47 -0700", "from alicemic-2.jf.intel.com ([10.166.16.121])\n\tby orsmga006.jf.intel.com with ESMTP; 17 May 2018 09:17:47 -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.49,411,1520924400\"; d=\"scan'208\";a=\"42632761\"", "From": "Alice Michael <alice.michael@intel.com>", "To": "alice.michael@intel.com,\n\tintel-wired-lan@lists.osuosl.org", "Date": "Thu, 17 May 2018 01:08:37 -0700", "Message-Id": "<20180517080840.30192-6-alice.michael@intel.com>", "X-Mailer": "git-send-email 2.9.5", "In-Reply-To": "<20180517080840.30192-1-alice.michael@intel.com>", "References": "<20180517080840.30192-1-alice.michael@intel.com>", "Subject": "[Intel-wired-lan] [next PATCH S92 6/9] i40e: fold prefix strings\n\tdirectly into stat names", "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\nWe always prefix these stats with a fixed string, so just fold this\nprefix into the stat string definition. This preparatory work will make\nit easier to implement a helper function to copy stats and strings into\nthe supplied buffers in a future patch.\n\nSigned-off-by: Jacob Keller <jacob.e.keller@intel.com>\n---\n drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 137 +++++++++++++------------\n 1 file changed, 69 insertions(+), 68 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\nindex 9bddae4..2498d19 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\n@@ -42,18 +42,18 @@ static const struct i40e_stats i40e_gstrings_net_stats[] = {\n };\n \n static const struct i40e_stats i40e_gstrings_veb_stats[] = {\n-\tI40E_VEB_STAT(\"rx_bytes\", stats.rx_bytes),\n-\tI40E_VEB_STAT(\"tx_bytes\", stats.tx_bytes),\n-\tI40E_VEB_STAT(\"rx_unicast\", stats.rx_unicast),\n-\tI40E_VEB_STAT(\"tx_unicast\", stats.tx_unicast),\n-\tI40E_VEB_STAT(\"rx_multicast\", stats.rx_multicast),\n-\tI40E_VEB_STAT(\"tx_multicast\", stats.tx_multicast),\n-\tI40E_VEB_STAT(\"rx_broadcast\", stats.rx_broadcast),\n-\tI40E_VEB_STAT(\"tx_broadcast\", stats.tx_broadcast),\n-\tI40E_VEB_STAT(\"rx_discards\", stats.rx_discards),\n-\tI40E_VEB_STAT(\"tx_discards\", stats.tx_discards),\n-\tI40E_VEB_STAT(\"tx_errors\", stats.tx_errors),\n-\tI40E_VEB_STAT(\"rx_unknown_protocol\", stats.rx_unknown_protocol),\n+\tI40E_VEB_STAT(\"veb.rx_bytes\", stats.rx_bytes),\n+\tI40E_VEB_STAT(\"veb.tx_bytes\", stats.tx_bytes),\n+\tI40E_VEB_STAT(\"veb.rx_unicast\", stats.rx_unicast),\n+\tI40E_VEB_STAT(\"veb.tx_unicast\", stats.tx_unicast),\n+\tI40E_VEB_STAT(\"veb.rx_multicast\", stats.rx_multicast),\n+\tI40E_VEB_STAT(\"veb.tx_multicast\", stats.tx_multicast),\n+\tI40E_VEB_STAT(\"veb.rx_broadcast\", stats.rx_broadcast),\n+\tI40E_VEB_STAT(\"veb.tx_broadcast\", stats.tx_broadcast),\n+\tI40E_VEB_STAT(\"veb.rx_discards\", stats.rx_discards),\n+\tI40E_VEB_STAT(\"veb.tx_discards\", stats.tx_discards),\n+\tI40E_VEB_STAT(\"veb.tx_errors\", stats.tx_errors),\n+\tI40E_VEB_STAT(\"veb.rx_unknown_protocol\", stats.rx_unknown_protocol),\n };\n \n static const struct i40e_stats i40e_gstrings_misc_stats[] = {\n@@ -82,62 +82,63 @@ static const struct i40e_stats i40e_gstrings_misc_stats[] = {\n * is queried on the base PF netdev, not on the VMDq or FCoE netdev.\n */\n static const struct i40e_stats i40e_gstrings_stats[] = {\n-\tI40E_PF_STAT(\"rx_bytes\", stats.eth.rx_bytes),\n-\tI40E_PF_STAT(\"tx_bytes\", stats.eth.tx_bytes),\n-\tI40E_PF_STAT(\"rx_unicast\", stats.eth.rx_unicast),\n-\tI40E_PF_STAT(\"tx_unicast\", stats.eth.tx_unicast),\n-\tI40E_PF_STAT(\"rx_multicast\", stats.eth.rx_multicast),\n-\tI40E_PF_STAT(\"tx_multicast\", stats.eth.tx_multicast),\n-\tI40E_PF_STAT(\"rx_broadcast\", stats.eth.rx_broadcast),\n-\tI40E_PF_STAT(\"tx_broadcast\", stats.eth.tx_broadcast),\n-\tI40E_PF_STAT(\"tx_errors\", stats.eth.tx_errors),\n-\tI40E_PF_STAT(\"rx_dropped\", stats.eth.rx_discards),\n-\tI40E_PF_STAT(\"tx_dropped_link_down\", stats.tx_dropped_link_down),\n-\tI40E_PF_STAT(\"rx_crc_errors\", stats.crc_errors),\n-\tI40E_PF_STAT(\"illegal_bytes\", stats.illegal_bytes),\n-\tI40E_PF_STAT(\"mac_local_faults\", stats.mac_local_faults),\n-\tI40E_PF_STAT(\"mac_remote_faults\", stats.mac_remote_faults),\n-\tI40E_PF_STAT(\"tx_timeout\", tx_timeout_count),\n-\tI40E_PF_STAT(\"rx_csum_bad\", hw_csum_rx_error),\n-\tI40E_PF_STAT(\"rx_length_errors\", stats.rx_length_errors),\n-\tI40E_PF_STAT(\"link_xon_rx\", stats.link_xon_rx),\n-\tI40E_PF_STAT(\"link_xoff_rx\", stats.link_xoff_rx),\n-\tI40E_PF_STAT(\"link_xon_tx\", stats.link_xon_tx),\n-\tI40E_PF_STAT(\"link_xoff_tx\", stats.link_xoff_tx),\n-\tI40E_PF_STAT(\"rx_size_64\", stats.rx_size_64),\n-\tI40E_PF_STAT(\"rx_size_127\", stats.rx_size_127),\n-\tI40E_PF_STAT(\"rx_size_255\", stats.rx_size_255),\n-\tI40E_PF_STAT(\"rx_size_511\", stats.rx_size_511),\n-\tI40E_PF_STAT(\"rx_size_1023\", stats.rx_size_1023),\n-\tI40E_PF_STAT(\"rx_size_1522\", stats.rx_size_1522),\n-\tI40E_PF_STAT(\"rx_size_big\", stats.rx_size_big),\n-\tI40E_PF_STAT(\"tx_size_64\", stats.tx_size_64),\n-\tI40E_PF_STAT(\"tx_size_127\", stats.tx_size_127),\n-\tI40E_PF_STAT(\"tx_size_255\", stats.tx_size_255),\n-\tI40E_PF_STAT(\"tx_size_511\", stats.tx_size_511),\n-\tI40E_PF_STAT(\"tx_size_1023\", stats.tx_size_1023),\n-\tI40E_PF_STAT(\"tx_size_1522\", stats.tx_size_1522),\n-\tI40E_PF_STAT(\"tx_size_big\", stats.tx_size_big),\n-\tI40E_PF_STAT(\"rx_undersize\", stats.rx_undersize),\n-\tI40E_PF_STAT(\"rx_fragments\", stats.rx_fragments),\n-\tI40E_PF_STAT(\"rx_oversize\", stats.rx_oversize),\n-\tI40E_PF_STAT(\"rx_jabber\", stats.rx_jabber),\n-\tI40E_PF_STAT(\"VF_admin_queue_requests\", vf_aq_requests),\n-\tI40E_PF_STAT(\"arq_overflows\", arq_overflows),\n-\tI40E_PF_STAT(\"rx_hwtstamp_cleared\", rx_hwtstamp_cleared),\n-\tI40E_PF_STAT(\"tx_hwtstamp_skipped\", tx_hwtstamp_skipped),\n-\tI40E_PF_STAT(\"fdir_flush_cnt\", fd_flush_cnt),\n-\tI40E_PF_STAT(\"fdir_atr_match\", stats.fd_atr_match),\n-\tI40E_PF_STAT(\"fdir_atr_tunnel_match\", stats.fd_atr_tunnel_match),\n-\tI40E_PF_STAT(\"fdir_atr_status\", stats.fd_atr_status),\n-\tI40E_PF_STAT(\"fdir_sb_match\", stats.fd_sb_match),\n-\tI40E_PF_STAT(\"fdir_sb_status\", stats.fd_sb_status),\n+\tI40E_PF_STAT(\"port.rx_bytes\", stats.eth.rx_bytes),\n+\tI40E_PF_STAT(\"port.tx_bytes\", stats.eth.tx_bytes),\n+\tI40E_PF_STAT(\"port.rx_unicast\", stats.eth.rx_unicast),\n+\tI40E_PF_STAT(\"port.tx_unicast\", stats.eth.tx_unicast),\n+\tI40E_PF_STAT(\"port.rx_multicast\", stats.eth.rx_multicast),\n+\tI40E_PF_STAT(\"port.tx_multicast\", stats.eth.tx_multicast),\n+\tI40E_PF_STAT(\"port.rx_broadcast\", stats.eth.rx_broadcast),\n+\tI40E_PF_STAT(\"port.tx_broadcast\", stats.eth.tx_broadcast),\n+\tI40E_PF_STAT(\"port.tx_errors\", stats.eth.tx_errors),\n+\tI40E_PF_STAT(\"port.rx_dropped\", stats.eth.rx_discards),\n+\tI40E_PF_STAT(\"port.tx_dropped_link_down\", stats.tx_dropped_link_down),\n+\tI40E_PF_STAT(\"port.rx_crc_errors\", stats.crc_errors),\n+\tI40E_PF_STAT(\"port.illegal_bytes\", stats.illegal_bytes),\n+\tI40E_PF_STAT(\"port.mac_local_faults\", stats.mac_local_faults),\n+\tI40E_PF_STAT(\"port.mac_remote_faults\", stats.mac_remote_faults),\n+\tI40E_PF_STAT(\"port.tx_timeout\", tx_timeout_count),\n+\tI40E_PF_STAT(\"port.rx_csum_bad\", hw_csum_rx_error),\n+\tI40E_PF_STAT(\"port.rx_length_errors\", stats.rx_length_errors),\n+\tI40E_PF_STAT(\"port.link_xon_rx\", stats.link_xon_rx),\n+\tI40E_PF_STAT(\"port.link_xoff_rx\", stats.link_xoff_rx),\n+\tI40E_PF_STAT(\"port.link_xon_tx\", stats.link_xon_tx),\n+\tI40E_PF_STAT(\"port.link_xoff_tx\", stats.link_xoff_tx),\n+\tI40E_PF_STAT(\"port.rx_size_64\", stats.rx_size_64),\n+\tI40E_PF_STAT(\"port.rx_size_127\", stats.rx_size_127),\n+\tI40E_PF_STAT(\"port.rx_size_255\", stats.rx_size_255),\n+\tI40E_PF_STAT(\"port.rx_size_511\", stats.rx_size_511),\n+\tI40E_PF_STAT(\"port.rx_size_1023\", stats.rx_size_1023),\n+\tI40E_PF_STAT(\"port.rx_size_1522\", stats.rx_size_1522),\n+\tI40E_PF_STAT(\"port.rx_size_big\", stats.rx_size_big),\n+\tI40E_PF_STAT(\"port.tx_size_64\", stats.tx_size_64),\n+\tI40E_PF_STAT(\"port.tx_size_127\", stats.tx_size_127),\n+\tI40E_PF_STAT(\"port.tx_size_255\", stats.tx_size_255),\n+\tI40E_PF_STAT(\"port.tx_size_511\", stats.tx_size_511),\n+\tI40E_PF_STAT(\"port.tx_size_1023\", stats.tx_size_1023),\n+\tI40E_PF_STAT(\"port.tx_size_1522\", stats.tx_size_1522),\n+\tI40E_PF_STAT(\"port.tx_size_big\", stats.tx_size_big),\n+\tI40E_PF_STAT(\"port.rx_undersize\", stats.rx_undersize),\n+\tI40E_PF_STAT(\"port.rx_fragments\", stats.rx_fragments),\n+\tI40E_PF_STAT(\"port.rx_oversize\", stats.rx_oversize),\n+\tI40E_PF_STAT(\"port.rx_jabber\", stats.rx_jabber),\n+\tI40E_PF_STAT(\"port.VF_admin_queue_requests\", vf_aq_requests),\n+\tI40E_PF_STAT(\"port.arq_overflows\", arq_overflows),\n+\tI40E_PF_STAT(\"port.tx_hwtstamp_timeouts\", tx_hwtstamp_timeouts),\n+\tI40E_PF_STAT(\"port.rx_hwtstamp_cleared\", rx_hwtstamp_cleared),\n+\tI40E_PF_STAT(\"port.tx_hwtstamp_skipped\", tx_hwtstamp_skipped),\n+\tI40E_PF_STAT(\"port.fdir_flush_cnt\", fd_flush_cnt),\n+\tI40E_PF_STAT(\"port.fdir_atr_match\", stats.fd_atr_match),\n+\tI40E_PF_STAT(\"port.fdir_atr_tunnel_match\", stats.fd_atr_tunnel_match),\n+\tI40E_PF_STAT(\"port.fdir_atr_status\", stats.fd_atr_status),\n+\tI40E_PF_STAT(\"port.fdir_sb_match\", stats.fd_sb_match),\n+\tI40E_PF_STAT(\"port.fdir_sb_status\", stats.fd_sb_status),\n \n \t/* LPI stats */\n-\tI40E_PF_STAT(\"tx_lpi_status\", stats.tx_lpi_status),\n-\tI40E_PF_STAT(\"rx_lpi_status\", stats.rx_lpi_status),\n-\tI40E_PF_STAT(\"tx_lpi_count\", stats.tx_lpi_count),\n-\tI40E_PF_STAT(\"rx_lpi_count\", stats.rx_lpi_count),\n+\tI40E_PF_STAT(\"port.tx_lpi_status\", stats.tx_lpi_status),\n+\tI40E_PF_STAT(\"port.rx_lpi_status\", stats.rx_lpi_status),\n+\tI40E_PF_STAT(\"port.tx_lpi_count\", stats.tx_lpi_count),\n+\tI40E_PF_STAT(\"port.rx_lpi_count\", stats.rx_lpi_count),\n };\n \n /* We use num_tx_queues here as a proxy for the maximum number of queues\n@@ -1699,7 +1700,7 @@ static void i40e_get_stat_strings(struct net_device *netdev, u8 *data)\n \t\treturn;\n \n \tfor (i = 0; i < I40E_VEB_STATS_LEN; i++) {\n-\t\tsnprintf(p, ETH_GSTRING_LEN, \"veb.%s\",\n+\t\tsnprintf(p, ETH_GSTRING_LEN, \"%s\",\n \t\t\t i40e_gstrings_veb_stats[i].stat_string);\n \t\tp += ETH_GSTRING_LEN;\n \t}\n@@ -1719,7 +1720,7 @@ static void i40e_get_stat_strings(struct net_device *netdev, u8 *data)\n \t}\n \n \tfor (i = 0; i < I40E_GLOBAL_STATS_LEN; i++) {\n-\t\tsnprintf(p, ETH_GSTRING_LEN, \"port.%s\",\n+\t\tsnprintf(p, ETH_GSTRING_LEN, \"%s\",\n \t\t\t i40e_gstrings_stats[i].stat_string);\n \t\tp += ETH_GSTRING_LEN;\n \t}\n", "prefixes": [ "next", "S92", "6/9" ] }