Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1086467/?format=api
{ "id": 1086467, "url": "http://patchwork.ozlabs.org/api/patches/1086467/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20190416172439.27908-10-anirudh.venkataramanan@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": "<20190416172439.27908-10-anirudh.venkataramanan@intel.com>", "list_archive_url": null, "date": "2019-04-16T17:24:33", "name": "[S19,09/15] ice: Format ethtool reported stats", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "fe0ef03ebd46c5d52da4558873f41dedd512668c", "submitter": { "id": 73601, "url": "http://patchwork.ozlabs.org/api/people/73601/?format=api", "name": "Anirudh Venkataramanan", "email": "anirudh.venkataramanan@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/20190416172439.27908-10-anirudh.venkataramanan@intel.com/mbox/", "series": [ { "id": 103107, "url": "http://patchwork.ozlabs.org/api/series/103107/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=103107", "date": "2019-04-16T17:24:38", "name": "Fixes and feature updates for ice", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/103107/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1086467/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1086467/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.138; helo=whitealder.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 whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 44kC1h2XG3z9s3l\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 17 Apr 2019 03:25:28 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id E4E6086E4E;\n\tTue, 16 Apr 2019 17:25:26 +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 EU8Mlkfrtzki; Tue, 16 Apr 2019 17:25:20 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 8AB66870EA;\n\tTue, 16 Apr 2019 17:25:17 +0000 (UTC)", "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id E2C0B1C1626\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 16 Apr 2019 17:25:14 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id DFFBB870B3\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 16 Apr 2019 17:25:14 +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 K0SCyyzSOXDq for <intel-wired-lan@lists.osuosl.org>;\n\tTue, 16 Apr 2019 17:25:13 +0000 (UTC)", "from mga09.intel.com (mga09.intel.com [134.134.136.24])\n\tby whitealder.osuosl.org (Postfix) with ESMTPS id B4A80870B4\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 16 Apr 2019 17:25:13 +0000 (UTC)", "from orsmga001.jf.intel.com ([10.7.209.18])\n\tby orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t16 Apr 2019 10:25:11 -0700", "from shasta.jf.intel.com ([10.166.244.191])\n\tby orsmga001.jf.intel.com with ESMTP; 16 Apr 2019 10:25:11 -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.60,358,1549958400\"; d=\"scan'208\";a=\"224064172\"", "From": "Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Tue, 16 Apr 2019 10:24:33 -0700", "Message-Id": "<20190416172439.27908-10-anirudh.venkataramanan@intel.com>", "X-Mailer": "git-send-email 2.20.1", "In-Reply-To": "<20190416172439.27908-1-anirudh.venkataramanan@intel.com>", "References": "<20190416172439.27908-1-anirudh.venkataramanan@intel.com>", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [PATCH S19 09/15] ice: Format ethtool reported\n\tstats", "X-BeenThere": "intel-wired-lan@osuosl.org", "X-Mailman-Version": "2.1.29", "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>", "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: Richard Rodriguez <richard.rodriguez@intel.com>\n\nFixes ethtool -S reported stats in ice driver to match\nformat and nomenclature of the ixgbe driver.\n\nSigned-off-by: Richard Rodriguez <richard.rodriguez@intel.com>\nSigned-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>\n---\n drivers/net/ethernet/intel/ice/ice_ethtool.c | 108 +++++++++----------\n 1 file changed, 54 insertions(+), 54 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ice/ice_ethtool.c b/drivers/net/ethernet/intel/ice/ice_ethtool.c\nindex 91e3c451c66c..1214325eb80b 100644\n--- a/drivers/net/ethernet/intel/ice/ice_ethtool.c\n+++ b/drivers/net/ethernet/intel/ice/ice_ethtool.c\n@@ -45,20 +45,20 @@ static int ice_q_stats_len(struct net_device *netdev)\n \t\t\t\t ICE_VSI_STATS_LEN + ice_q_stats_len(n))\n \n static const struct ice_stats ice_gstrings_vsi_stats[] = {\n-\tICE_VSI_STAT(\"tx_unicast\", eth_stats.tx_unicast),\n \tICE_VSI_STAT(\"rx_unicast\", eth_stats.rx_unicast),\n-\tICE_VSI_STAT(\"tx_multicast\", eth_stats.tx_multicast),\n+\tICE_VSI_STAT(\"tx_unicast\", eth_stats.tx_unicast),\n \tICE_VSI_STAT(\"rx_multicast\", eth_stats.rx_multicast),\n-\tICE_VSI_STAT(\"tx_broadcast\", eth_stats.tx_broadcast),\n+\tICE_VSI_STAT(\"tx_multicast\", eth_stats.tx_multicast),\n \tICE_VSI_STAT(\"rx_broadcast\", eth_stats.rx_broadcast),\n-\tICE_VSI_STAT(\"tx_bytes\", eth_stats.tx_bytes),\n+\tICE_VSI_STAT(\"tx_broadcast\", eth_stats.tx_broadcast),\n \tICE_VSI_STAT(\"rx_bytes\", eth_stats.rx_bytes),\n-\tICE_VSI_STAT(\"rx_discards\", eth_stats.rx_discards),\n-\tICE_VSI_STAT(\"tx_errors\", eth_stats.tx_errors),\n-\tICE_VSI_STAT(\"tx_linearize\", tx_linearize),\n+\tICE_VSI_STAT(\"tx_bytes\", eth_stats.tx_bytes),\n+\tICE_VSI_STAT(\"rx_dropped\", eth_stats.rx_discards),\n \tICE_VSI_STAT(\"rx_unknown_protocol\", eth_stats.rx_unknown_protocol),\n \tICE_VSI_STAT(\"rx_alloc_fail\", rx_buf_failed),\n \tICE_VSI_STAT(\"rx_pg_alloc_fail\", rx_page_failed),\n+\tICE_VSI_STAT(\"tx_errors\", eth_stats.tx_errors),\n+\tICE_VSI_STAT(\"tx_linearize\", tx_linearize),\n };\n \n /* These PF_STATs might look like duplicates of some NETDEV_STATs,\n@@ -71,45 +71,45 @@ static const struct ice_stats ice_gstrings_vsi_stats[] = {\n * is queried on the base PF netdev.\n */\n static const struct ice_stats ice_gstrings_pf_stats[] = {\n-\tICE_PF_STAT(\"port.tx_bytes\", stats.eth.tx_bytes),\n-\tICE_PF_STAT(\"port.rx_bytes\", stats.eth.rx_bytes),\n-\tICE_PF_STAT(\"port.tx_unicast\", stats.eth.tx_unicast),\n-\tICE_PF_STAT(\"port.rx_unicast\", stats.eth.rx_unicast),\n-\tICE_PF_STAT(\"port.tx_multicast\", stats.eth.tx_multicast),\n-\tICE_PF_STAT(\"port.rx_multicast\", stats.eth.rx_multicast),\n-\tICE_PF_STAT(\"port.tx_broadcast\", stats.eth.tx_broadcast),\n-\tICE_PF_STAT(\"port.rx_broadcast\", stats.eth.rx_broadcast),\n-\tICE_PF_STAT(\"port.tx_errors\", stats.eth.tx_errors),\n-\tICE_PF_STAT(\"port.tx_size_64\", stats.tx_size_64),\n-\tICE_PF_STAT(\"port.rx_size_64\", stats.rx_size_64),\n-\tICE_PF_STAT(\"port.tx_size_127\", stats.tx_size_127),\n-\tICE_PF_STAT(\"port.rx_size_127\", stats.rx_size_127),\n-\tICE_PF_STAT(\"port.tx_size_255\", stats.tx_size_255),\n-\tICE_PF_STAT(\"port.rx_size_255\", stats.rx_size_255),\n-\tICE_PF_STAT(\"port.tx_size_511\", stats.tx_size_511),\n-\tICE_PF_STAT(\"port.rx_size_511\", stats.rx_size_511),\n-\tICE_PF_STAT(\"port.tx_size_1023\", stats.tx_size_1023),\n-\tICE_PF_STAT(\"port.rx_size_1023\", stats.rx_size_1023),\n-\tICE_PF_STAT(\"port.tx_size_1522\", stats.tx_size_1522),\n-\tICE_PF_STAT(\"port.rx_size_1522\", stats.rx_size_1522),\n-\tICE_PF_STAT(\"port.tx_size_big\", stats.tx_size_big),\n-\tICE_PF_STAT(\"port.rx_size_big\", stats.rx_size_big),\n-\tICE_PF_STAT(\"port.link_xon_tx\", stats.link_xon_tx),\n-\tICE_PF_STAT(\"port.link_xon_rx\", stats.link_xon_rx),\n-\tICE_PF_STAT(\"port.link_xoff_tx\", stats.link_xoff_tx),\n-\tICE_PF_STAT(\"port.link_xoff_rx\", stats.link_xoff_rx),\n-\tICE_PF_STAT(\"port.tx_dropped_link_down\", stats.tx_dropped_link_down),\n-\tICE_PF_STAT(\"port.rx_undersize\", stats.rx_undersize),\n-\tICE_PF_STAT(\"port.rx_fragments\", stats.rx_fragments),\n-\tICE_PF_STAT(\"port.rx_oversize\", stats.rx_oversize),\n-\tICE_PF_STAT(\"port.rx_jabber\", stats.rx_jabber),\n-\tICE_PF_STAT(\"port.rx_csum_bad\", hw_csum_rx_error),\n-\tICE_PF_STAT(\"port.rx_length_errors\", stats.rx_len_errors),\n-\tICE_PF_STAT(\"port.rx_dropped\", stats.eth.rx_discards),\n-\tICE_PF_STAT(\"port.rx_crc_errors\", stats.crc_errors),\n-\tICE_PF_STAT(\"port.illegal_bytes\", stats.illegal_bytes),\n-\tICE_PF_STAT(\"port.mac_local_faults\", stats.mac_local_faults),\n-\tICE_PF_STAT(\"port.mac_remote_faults\", stats.mac_remote_faults),\n+\tICE_PF_STAT(\"rx_bytes.nic\", stats.eth.rx_bytes),\n+\tICE_PF_STAT(\"tx_bytes.nic\", stats.eth.tx_bytes),\n+\tICE_PF_STAT(\"rx_unicast.nic\", stats.eth.rx_unicast),\n+\tICE_PF_STAT(\"tx_unicast.nic\", stats.eth.tx_unicast),\n+\tICE_PF_STAT(\"rx_multicast.nic\", stats.eth.rx_multicast),\n+\tICE_PF_STAT(\"tx_multicast.nic\", stats.eth.tx_multicast),\n+\tICE_PF_STAT(\"rx_broadcast.nic\", stats.eth.rx_broadcast),\n+\tICE_PF_STAT(\"tx_broadcast.nic\", stats.eth.tx_broadcast),\n+\tICE_PF_STAT(\"tx_errors.nic\", stats.eth.tx_errors),\n+\tICE_PF_STAT(\"rx_size_64.nic\", stats.rx_size_64),\n+\tICE_PF_STAT(\"tx_size_64.nic\", stats.tx_size_64),\n+\tICE_PF_STAT(\"rx_size_127.nic\", stats.rx_size_127),\n+\tICE_PF_STAT(\"tx_size_127.nic\", stats.tx_size_127),\n+\tICE_PF_STAT(\"rx_size_255.nic\", stats.rx_size_255),\n+\tICE_PF_STAT(\"tx_size_255.nic\", stats.tx_size_255),\n+\tICE_PF_STAT(\"rx_size_511.nic\", stats.rx_size_511),\n+\tICE_PF_STAT(\"tx_size_511.nic\", stats.tx_size_511),\n+\tICE_PF_STAT(\"rx_size_1023.nic\", stats.rx_size_1023),\n+\tICE_PF_STAT(\"tx_size_1023.nic\", stats.tx_size_1023),\n+\tICE_PF_STAT(\"rx_size_1522.nic\", stats.rx_size_1522),\n+\tICE_PF_STAT(\"tx_size_1522.nic\", stats.tx_size_1522),\n+\tICE_PF_STAT(\"rx_size_big.nic\", stats.rx_size_big),\n+\tICE_PF_STAT(\"tx_size_big.nic\", stats.tx_size_big),\n+\tICE_PF_STAT(\"link_xon_rx.nic\", stats.link_xon_rx),\n+\tICE_PF_STAT(\"link_xon_tx.nic\", stats.link_xon_tx),\n+\tICE_PF_STAT(\"link_xoff_rx.nic\", stats.link_xoff_rx),\n+\tICE_PF_STAT(\"link_xoff_tx.nic\", stats.link_xoff_tx),\n+\tICE_PF_STAT(\"tx_dropped_link_down.nic\", stats.tx_dropped_link_down),\n+\tICE_PF_STAT(\"rx_undersize.nic\", stats.rx_undersize),\n+\tICE_PF_STAT(\"rx_fragments.nic\", stats.rx_fragments),\n+\tICE_PF_STAT(\"rx_oversize.nic\", stats.rx_oversize),\n+\tICE_PF_STAT(\"rx_jabber.nic\", stats.rx_jabber),\n+\tICE_PF_STAT(\"rx_csum_bad.nic\", hw_csum_rx_error),\n+\tICE_PF_STAT(\"rx_length_errors.nic\", stats.rx_len_errors),\n+\tICE_PF_STAT(\"rx_dropped.nic\", stats.eth.rx_discards),\n+\tICE_PF_STAT(\"rx_crc_errors.nic\", stats.crc_errors),\n+\tICE_PF_STAT(\"illegal_bytes.nic\", stats.illegal_bytes),\n+\tICE_PF_STAT(\"mac_local_faults.nic\", stats.mac_local_faults),\n+\tICE_PF_STAT(\"mac_remote_faults.nic\", stats.mac_remote_faults),\n };\n \n static const u32 ice_regs_dump_list[] = {\n@@ -295,17 +295,17 @@ static void ice_get_strings(struct net_device *netdev, u32 stringset, u8 *data)\n \n \t\tice_for_each_alloc_txq(vsi, i) {\n \t\t\tsnprintf(p, ETH_GSTRING_LEN,\n-\t\t\t\t \"tx-queue-%u.tx_packets\", i);\n+\t\t\t\t \"tx_queue_%u_packets\", i);\n \t\t\tp += ETH_GSTRING_LEN;\n-\t\t\tsnprintf(p, ETH_GSTRING_LEN, \"tx-queue-%u.tx_bytes\", i);\n+\t\t\tsnprintf(p, ETH_GSTRING_LEN, \"tx_queue_%u_bytes\", i);\n \t\t\tp += ETH_GSTRING_LEN;\n \t\t}\n \n \t\tice_for_each_alloc_rxq(vsi, i) {\n \t\t\tsnprintf(p, ETH_GSTRING_LEN,\n-\t\t\t\t \"rx-queue-%u.rx_packets\", i);\n+\t\t\t\t \"rx_queue_%u_packets\", i);\n \t\t\tp += ETH_GSTRING_LEN;\n-\t\t\tsnprintf(p, ETH_GSTRING_LEN, \"rx-queue-%u.rx_bytes\", i);\n+\t\t\tsnprintf(p, ETH_GSTRING_LEN, \"rx_queue_%u_bytes\", i);\n \t\t\tp += ETH_GSTRING_LEN;\n \t\t}\n \n@@ -320,18 +320,18 @@ static void ice_get_strings(struct net_device *netdev, u32 stringset, u8 *data)\n \n \t\tfor (i = 0; i < ICE_MAX_USER_PRIORITY; i++) {\n \t\t\tsnprintf(p, ETH_GSTRING_LEN,\n-\t\t\t\t \"port.tx-priority-%u-xon\", i);\n+\t\t\t\t \"tx_priority_%u_xon.nic\", i);\n \t\t\tp += ETH_GSTRING_LEN;\n \t\t\tsnprintf(p, ETH_GSTRING_LEN,\n-\t\t\t\t \"port.tx-priority-%u-xoff\", i);\n+\t\t\t\t \"tx_priority_%u_xoff.nic\", i);\n \t\t\tp += ETH_GSTRING_LEN;\n \t\t}\n \t\tfor (i = 0; i < ICE_MAX_USER_PRIORITY; i++) {\n \t\t\tsnprintf(p, ETH_GSTRING_LEN,\n-\t\t\t\t \"port.rx-priority-%u-xon\", i);\n+\t\t\t\t \"rx_priority_%u_xon.nic\", i);\n \t\t\tp += ETH_GSTRING_LEN;\n \t\t\tsnprintf(p, ETH_GSTRING_LEN,\n-\t\t\t\t \"port.rx-priority-%u-xoff\", i);\n+\t\t\t\t \"rx_priority_%u_xoff.nic\", i);\n \t\t\tp += ETH_GSTRING_LEN;\n \t\t}\n \t\tbreak;\n", "prefixes": [ "S19", "09/15" ] }