Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/915561/?format=api
{ "id": 915561, "url": "http://patchwork.ozlabs.org/api/patches/915561/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20180517080840.30192-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": "<20180517080840.30192-4-alice.michael@intel.com>", "list_archive_url": null, "date": "2018-05-17T08:08:35", "name": "[next,S92,4/9] i40e: split i40e_get_strings() into smaller functions", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "3e8d6ed387d558f7f07a4e2bf6c02d2c998a08ee", "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-4-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/915561/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/915561/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 40mxKt3R6Xz9s4V\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 18 May 2018 02:17:54 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 9BC7B2D3C8;\n\tThu, 17 May 2018 16:17:52 +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 VjdTZQ3mHvdj; Thu, 17 May 2018 16:17:51 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id 00BFD26F4F;\n\tThu, 17 May 2018 16:17:51 +0000 (UTC)", "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id AE1251C2C4E\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 17 May 2018 16:17:49 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id AB13388266\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 17 May 2018 16:17:49 +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 51A3+gGdClab for <intel-wired-lan@lists.osuosl.org>;\n\tThu, 17 May 2018 16:17:48 +0000 (UTC)", "from mga11.intel.com (mga11.intel.com [192.55.52.93])\n\tby whitealder.osuosl.org (Postfix) with ESMTPS id 346C08821C\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=\"42632755\"", "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:35 -0700", "Message-Id": "<20180517080840.30192-4-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 4/9] i40e: split\n\ti40e_get_strings() into smaller functions", "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\nSplit the statistic strings and private flags strings into their own\nseparate functions to aid code readability.\n\nSigned-off-by: Jacob Keller <jacob.e.keller@intel.com>\n---\n drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 183 ++++++++++++++-----------\n 1 file changed, 100 insertions(+), 83 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\nindex 698f096..cc09dd7 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\n@@ -1667,8 +1667,7 @@ static void i40e_get_ethtool_stats(struct net_device *netdev,\n \t\tdata[i++] = pf->stats.priority_xon_2_xoff[j];\n }\n \n-static void i40e_get_strings(struct net_device *netdev, u32 stringset,\n-\t\t\t u8 *data)\n+static void i40e_get_stat_strings(struct net_device *netdev, u8 *data)\n {\n \tstruct i40e_netdev_priv *np = netdev_priv(netdev);\n \tstruct i40e_vsi *vsi = np->vsi;\n@@ -1676,95 +1675,113 @@ static void i40e_get_strings(struct net_device *netdev, u32 stringset,\n \tchar *p = (char *)data;\n \tunsigned int i;\n \n+\tfor (i = 0; i < I40E_NETDEV_STATS_LEN; i++) {\n+\t\tsnprintf(p, ETH_GSTRING_LEN, \"%s\",\n+\t\t\t i40e_gstrings_net_stats[i].stat_string);\n+\t\tp += ETH_GSTRING_LEN;\n+\t}\n+\tfor (i = 0; i < I40E_MISC_STATS_LEN; i++) {\n+\t\tsnprintf(p, ETH_GSTRING_LEN, \"%s\",\n+\t\t\t i40e_gstrings_misc_stats[i].stat_string);\n+\t\tp += ETH_GSTRING_LEN;\n+\t}\n+\tfor (i = 0; i < I40E_MAX_NUM_QUEUES(netdev); i++) {\n+\t\tsnprintf(p, ETH_GSTRING_LEN, \"tx-%u.tx_packets\", i);\n+\t\tp += ETH_GSTRING_LEN;\n+\t\tsnprintf(p, ETH_GSTRING_LEN, \"tx-%u.tx_bytes\", i);\n+\t\tp += ETH_GSTRING_LEN;\n+\t\tsnprintf(p, ETH_GSTRING_LEN, \"rx-%u.rx_packets\", i);\n+\t\tp += ETH_GSTRING_LEN;\n+\t\tsnprintf(p, ETH_GSTRING_LEN, \"rx-%u.rx_bytes\", i);\n+\t\tp += ETH_GSTRING_LEN;\n+\t}\n+\tif (vsi != pf->vsi[pf->lan_vsi] || pf->hw.partition_id != 1)\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\t\t i40e_gstrings_veb_stats[i].stat_string);\n+\t\tp += ETH_GSTRING_LEN;\n+\t}\n+\tfor (i = 0; i < I40E_MAX_TRAFFIC_CLASS; i++) {\n+\t\tsnprintf(p, ETH_GSTRING_LEN,\n+\t\t\t \"veb.tc_%u_tx_packets\", i);\n+\t\tp += ETH_GSTRING_LEN;\n+\t\tsnprintf(p, ETH_GSTRING_LEN,\n+\t\t\t \"veb.tc_%u_tx_bytes\", i);\n+\t\tp += ETH_GSTRING_LEN;\n+\t\tsnprintf(p, ETH_GSTRING_LEN,\n+\t\t\t \"veb.tc_%u_rx_packets\", i);\n+\t\tp += ETH_GSTRING_LEN;\n+\t\tsnprintf(p, ETH_GSTRING_LEN,\n+\t\t\t \"veb.tc_%u_rx_bytes\", i);\n+\t\tp += ETH_GSTRING_LEN;\n+\t}\n+\n+\tfor (i = 0; i < I40E_GLOBAL_STATS_LEN; i++) {\n+\t\tsnprintf(p, ETH_GSTRING_LEN, \"port.%s\",\n+\t\t\t i40e_gstrings_stats[i].stat_string);\n+\t\tp += ETH_GSTRING_LEN;\n+\t}\n+\tfor (i = 0; i < I40E_MAX_USER_PRIORITY; i++) {\n+\t\tsnprintf(p, ETH_GSTRING_LEN,\n+\t\t\t \"port.tx_priority_%u_xon\", i);\n+\t\tp += ETH_GSTRING_LEN;\n+\t\tsnprintf(p, ETH_GSTRING_LEN,\n+\t\t\t \"port.tx_priority_%u_xoff\", i);\n+\t\tp += ETH_GSTRING_LEN;\n+\t}\n+\tfor (i = 0; i < I40E_MAX_USER_PRIORITY; i++) {\n+\t\tsnprintf(p, ETH_GSTRING_LEN,\n+\t\t\t \"port.rx_priority_%u_xon\", i);\n+\t\tp += ETH_GSTRING_LEN;\n+\t\tsnprintf(p, ETH_GSTRING_LEN,\n+\t\t\t \"port.rx_priority_%u_xoff\", i);\n+\t\tp += ETH_GSTRING_LEN;\n+\t}\n+\tfor (i = 0; i < I40E_MAX_USER_PRIORITY; i++) {\n+\t\tsnprintf(p, ETH_GSTRING_LEN,\n+\t\t\t \"port.rx_priority_%u_xon_2_xoff\", i);\n+\t\tp += ETH_GSTRING_LEN;\n+\t}\n+\t/* BUG_ON(p - data != I40E_STATS_LEN * ETH_GSTRING_LEN); */\n+}\n+\n+static void i40e_get_priv_flag_strings(struct net_device *netdev, u8 *data)\n+{\n+\tstruct i40e_netdev_priv *np = netdev_priv(netdev);\n+\tstruct i40e_vsi *vsi = np->vsi;\n+\tstruct i40e_pf *pf = vsi->back;\n+\tchar *p = (char *)data;\n+\tunsigned int i;\n+\n+\tfor (i = 0; i < I40E_PRIV_FLAGS_STR_LEN; i++) {\n+\t\tsnprintf(p, ETH_GSTRING_LEN, \"%s\",\n+\t\t\t i40e_gstrings_priv_flags[i].flag_string);\n+\t\tp += ETH_GSTRING_LEN;\n+\t}\n+\tif (pf->hw.pf_id != 0)\n+\t\treturn;\n+\tfor (i = 0; i < I40E_GL_PRIV_FLAGS_STR_LEN; i++) {\n+\t\tsnprintf(p, ETH_GSTRING_LEN, \"%s\",\n+\t\t\t i40e_gl_gstrings_priv_flags[i].flag_string);\n+\t\tp += ETH_GSTRING_LEN;\n+\t}\n+}\n+\n+static void i40e_get_strings(struct net_device *netdev, u32 stringset,\n+\t\t\t u8 *data)\n+{\n \tswitch (stringset) {\n \tcase ETH_SS_TEST:\n \t\tmemcpy(data, i40e_gstrings_test,\n \t\t I40E_TEST_LEN * ETH_GSTRING_LEN);\n \t\tbreak;\n \tcase ETH_SS_STATS:\n-\t\tfor (i = 0; i < I40E_NETDEV_STATS_LEN; i++) {\n-\t\t\tsnprintf(p, ETH_GSTRING_LEN, \"%s\",\n-\t\t\t\t i40e_gstrings_net_stats[i].stat_string);\n-\t\t\tp += ETH_GSTRING_LEN;\n-\t\t}\n-\t\tfor (i = 0; i < I40E_MISC_STATS_LEN; i++) {\n-\t\t\tsnprintf(p, ETH_GSTRING_LEN, \"%s\",\n-\t\t\t\t i40e_gstrings_misc_stats[i].stat_string);\n-\t\t\tp += ETH_GSTRING_LEN;\n-\t\t}\n-\t\tfor (i = 0; i < I40E_MAX_NUM_QUEUES(netdev); i++) {\n-\t\t\tsnprintf(p, ETH_GSTRING_LEN, \"tx-%d.tx_packets\", i);\n-\t\t\tp += ETH_GSTRING_LEN;\n-\t\t\tsnprintf(p, ETH_GSTRING_LEN, \"tx-%d.tx_bytes\", i);\n-\t\t\tp += ETH_GSTRING_LEN;\n-\t\t\tsnprintf(p, ETH_GSTRING_LEN, \"rx-%d.rx_packets\", i);\n-\t\t\tp += ETH_GSTRING_LEN;\n-\t\t\tsnprintf(p, ETH_GSTRING_LEN, \"rx-%d.rx_bytes\", i);\n-\t\t\tp += ETH_GSTRING_LEN;\n-\t\t}\n-\t\tif (vsi != pf->vsi[pf->lan_vsi] || pf->hw.partition_id != 1)\n-\t\t\treturn;\n-\n-\t\tfor (i = 0; i < I40E_VEB_STATS_LEN; i++) {\n-\t\t\tsnprintf(p, ETH_GSTRING_LEN, \"veb.%s\",\n-\t\t\t\t i40e_gstrings_veb_stats[i].stat_string);\n-\t\t\tp += ETH_GSTRING_LEN;\n-\t\t}\n-\t\tfor (i = 0; i < I40E_MAX_TRAFFIC_CLASS; i++) {\n-\t\t\tsnprintf(p, ETH_GSTRING_LEN,\n-\t\t\t\t \"veb.tc_%u_tx_packets\", i);\n-\t\t\tp += ETH_GSTRING_LEN;\n-\t\t\tsnprintf(p, ETH_GSTRING_LEN,\n-\t\t\t\t \"veb.tc_%u_tx_bytes\", i);\n-\t\t\tp += ETH_GSTRING_LEN;\n-\t\t\tsnprintf(p, ETH_GSTRING_LEN,\n-\t\t\t\t \"veb.tc_%u_rx_packets\", i);\n-\t\t\tp += ETH_GSTRING_LEN;\n-\t\t\tsnprintf(p, ETH_GSTRING_LEN,\n-\t\t\t\t \"veb.tc_%u_rx_bytes\", i);\n-\t\t\tp += ETH_GSTRING_LEN;\n-\t\t}\n-\t\tfor (i = 0; i < I40E_GLOBAL_STATS_LEN; i++) {\n-\t\t\tsnprintf(p, ETH_GSTRING_LEN, \"port.%s\",\n-\t\t\t\t i40e_gstrings_stats[i].stat_string);\n-\t\t\tp += ETH_GSTRING_LEN;\n-\t\t}\n-\t\tfor (i = 0; i < I40E_MAX_USER_PRIORITY; i++) {\n-\t\t\tsnprintf(p, ETH_GSTRING_LEN,\n-\t\t\t\t \"port.tx_priority_%d_xon\", i);\n-\t\t\tp += ETH_GSTRING_LEN;\n-\t\t\tsnprintf(p, ETH_GSTRING_LEN,\n-\t\t\t\t \"port.tx_priority_%d_xoff\", i);\n-\t\t\tp += ETH_GSTRING_LEN;\n-\t\t}\n-\t\tfor (i = 0; i < I40E_MAX_USER_PRIORITY; i++) {\n-\t\t\tsnprintf(p, ETH_GSTRING_LEN,\n-\t\t\t\t \"port.rx_priority_%d_xon\", i);\n-\t\t\tp += ETH_GSTRING_LEN;\n-\t\t\tsnprintf(p, ETH_GSTRING_LEN,\n-\t\t\t\t \"port.rx_priority_%d_xoff\", i);\n-\t\t\tp += ETH_GSTRING_LEN;\n-\t\t}\n-\t\tfor (i = 0; i < I40E_MAX_USER_PRIORITY; i++) {\n-\t\t\tsnprintf(p, ETH_GSTRING_LEN,\n-\t\t\t\t \"port.rx_priority_%d_xon_2_xoff\", i);\n-\t\t\tp += ETH_GSTRING_LEN;\n-\t\t}\n-\t\t/* BUG_ON(p - data != I40E_STATS_LEN * ETH_GSTRING_LEN); */\n+\t\ti40e_get_stat_strings(netdev, data);\n \t\tbreak;\n \tcase ETH_SS_PRIV_FLAGS:\n-\t\tfor (i = 0; i < I40E_PRIV_FLAGS_STR_LEN; i++) {\n-\t\t\tsnprintf(p, ETH_GSTRING_LEN, \"%s\",\n-\t\t\t\t i40e_gstrings_priv_flags[i].flag_string);\n-\t\t\tp += ETH_GSTRING_LEN;\n-\t\t}\n-\t\tif (pf->hw.pf_id != 0)\n-\t\t\tbreak;\n-\t\tfor (i = 0; i < I40E_GL_PRIV_FLAGS_STR_LEN; i++) {\n-\t\t\tsnprintf(p, ETH_GSTRING_LEN, \"%s\",\n-\t\t\t\t i40e_gl_gstrings_priv_flags[i].flag_string);\n-\t\t\tp += ETH_GSTRING_LEN;\n-\t\t}\n+\t\ti40e_get_priv_flag_strings(netdev, data);\n \t\tbreak;\n \tdefault:\n \t\tbreak;\n", "prefixes": [ "next", "S92", "4/9" ] }