Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/579583/?format=api
{ "id": 579583, "url": "http://patchwork.ozlabs.org/api/patches/579583/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1454697789-22420-1-git-send-email-jacob.e.keller@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": "<1454697789-22420-1-git-send-email-jacob.e.keller@intel.com>", "list_archive_url": null, "date": "2016-02-05T18:43:08", "name": "[1/2] fm10k: add helper functions to set strings and data for ethtool stats", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "3fbbf36f9f5abf476bf0fd43650a5dda8ea41a57", "submitter": { "id": 9784, "url": "http://patchwork.ozlabs.org/api/people/9784/?format=api", "name": "Jacob Keller", "email": "jacob.e.keller@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/1454697789-22420-1-git-send-email-jacob.e.keller@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/579583/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/579583/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<intel-wired-lan-bounces@lists.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" ], "Received": [ "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\tby ozlabs.org (Postfix) with ESMTP id 6B71914031F\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat, 6 Feb 2016 05:44:42 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id B74139189F;\n\tFri, 5 Feb 2016 18:44:41 +0000 (UTC)", "from hemlock.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id 4E4d1oLf7Qju; Fri, 5 Feb 2016 18:44:40 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id A4B028953F;\n\tFri, 5 Feb 2016 18:44:40 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id 84E211C0866\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 5 Feb 2016 18:44:39 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 7EED1319D3\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 5 Feb 2016 18:44:39 +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 WS7bWMHw1Flh for <intel-wired-lan@lists.osuosl.org>;\n\tFri, 5 Feb 2016 18:44:35 +0000 (UTC)", "from mga14.intel.com (mga14.intel.com [192.55.52.115])\n\tby silver.osuosl.org (Postfix) with ESMTP id 2EA9F310C3\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 5 Feb 2016 18:44:35 +0000 (UTC)", "from orsmga001.jf.intel.com ([10.7.209.18])\n\tby fmsmga103.fm.intel.com with ESMTP; 05 Feb 2016 10:43:11 -0800", "from jekeller-desk.amr.corp.intel.com (HELO\n\tjekeller-desk.jekeller.internal) ([134.134.3.65])\n\tby orsmga001.jf.intel.com with ESMTP; 05 Feb 2016 10:43:11 -0800" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.22,401,1449561600\"; d=\"scan'208\";a=\"877979043\"", "From": "Jacob Keller <jacob.e.keller@intel.com>", "To": "Intel Wired LAN <intel-wired-lan@lists.osuosl.org>", "Date": "Fri, 5 Feb 2016 10:43:08 -0800", "Message-Id": "<1454697789-22420-1-git-send-email-jacob.e.keller@intel.com>", "X-Mailer": "git-send-email 2.7.0.236.gda096a0.dirty", "Subject": "[Intel-wired-lan] [PATCH 1/2] fm10k: add helper functions to set\n\tstrings and data for ethtool stats", "X-BeenThere": "intel-wired-lan@lists.osuosl.org", "X-Mailman-Version": "2.1.18-1", "Precedence": "list", "List-Id": "Intel Wired Ethernet Linux Kernel Driver Development\n\t<intel-wired-lan.lists.osuosl.org>", "List-Unsubscribe": "<http://lists.osuosl.org/mailman/options/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@lists.osuosl.org?subject=unsubscribe>", "List-Archive": "<http://lists.osuosl.org/pipermail/intel-wired-lan/>", "List-Post": "<mailto:intel-wired-lan@lists.osuosl.org>", "List-Help": "<mailto:intel-wired-lan-request@lists.osuosl.org?subject=help>", "List-Subscribe": "<http://lists.osuosl.org/mailman/listinfo/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@lists.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@lists.osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@lists.osuosl.org>" }, "content": "Reduce duplicate code and the amount of indentation by adding\nfm10k_add_stat_strings and fm10k_add_ethtool_stats functions which help\nadd fm10k_stat structures to the ethtool stats callbacks. This helps\nincrease ease of use for future stat additions, and increases code\nreadability. Skip handling of the per-queue stats as these will be\nreworked in a following patch.\n\nSigned-off-by: Jacob Keller <jacob.e.keller@intel.com>\n---\n\nThese two patches apply on top of my previous series, though I don't\nexpect there to be any conflicts.\n\n drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c | 164 ++++++++++++-----------\n 1 file changed, 83 insertions(+), 81 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c b/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c\nindex 6a9f9886cb98..1496c4b44b7e 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c\n@@ -153,57 +153,51 @@ static const char fm10k_prv_flags[FM10K_PRV_FLAG_LEN][ETH_GSTRING_LEN] = {\n \t\"debug-statistics\",\n };\n \n+static void fm10k_add_stat_strings(char **p, const char *prefix,\n+\t\t\t\t const struct fm10k_stats stats[],\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%s\",\n+\t\t\t prefix, stats[i].stat_string);\n+\t\t*p += ETH_GSTRING_LEN;\n+\t}\n+}\n+\n static void fm10k_get_stat_strings(struct net_device *dev, u8 *data)\n {\n \tstruct fm10k_intfc *interface = netdev_priv(dev);\n \tstruct fm10k_iov_data *iov_data = interface->iov_data;\n \tchar *p = (char *)data;\n \tunsigned int i;\n-\tunsigned int j;\n \n-\tfor (i = 0; i < FM10K_NETDEV_STATS_LEN; i++) {\n-\t\tmemcpy(p, fm10k_gstrings_net_stats[i].stat_string,\n-\t\t ETH_GSTRING_LEN);\n-\t\tp += ETH_GSTRING_LEN;\n-\t}\n+\tfm10k_add_stat_strings(&p, \"\", fm10k_gstrings_net_stats,\n+\t\t\t FM10K_NETDEV_STATS_LEN);\n \n-\tfor (i = 0; i < FM10K_GLOBAL_STATS_LEN; i++) {\n-\t\tmemcpy(p, fm10k_gstrings_global_stats[i].stat_string,\n-\t\t ETH_GSTRING_LEN);\n-\t\tp += ETH_GSTRING_LEN;\n-\t}\n+\tfm10k_add_stat_strings(&p, \"\", fm10k_gstrings_global_stats,\n+\t\t\t FM10K_GLOBAL_STATS_LEN);\n \n-\tif (interface->flags & FM10K_FLAG_DEBUG_STATS) {\n-\t\tfor (i = 0; i < FM10K_DEBUG_STATS_LEN; i++) {\n-\t\t\tmemcpy(p, fm10k_gstrings_debug_stats[i].stat_string,\n-\t\t\t ETH_GSTRING_LEN);\n-\t\t\tp += ETH_GSTRING_LEN;\n-\t\t}\n-\t}\n+\tif (interface->flags & FM10K_FLAG_DEBUG_STATS)\n+\t\tfm10k_add_stat_strings(&p, \"\", fm10k_gstrings_debug_stats,\n+\t\t\t\t FM10K_DEBUG_STATS_LEN);\n \n-\tfor (i = 0; i < FM10K_MBX_STATS_LEN; i++) {\n-\t\tmemcpy(p, fm10k_gstrings_mbx_stats[i].stat_string,\n-\t\t ETH_GSTRING_LEN);\n-\t\tp += ETH_GSTRING_LEN;\n-\t}\n+\tfm10k_add_stat_strings(&p, \"\", fm10k_gstrings_mbx_stats,\n+\t\t\t FM10K_MBX_STATS_LEN);\n \n-\tif (interface->hw.mac.type != fm10k_mac_vf) {\n-\t\tfor (i = 0; i < FM10K_PF_STATS_LEN; i++) {\n-\t\t\tmemcpy(p, fm10k_gstrings_pf_stats[i].stat_string,\n-\t\t\t ETH_GSTRING_LEN);\n-\t\t\tp += ETH_GSTRING_LEN;\n-\t\t}\n-\t}\n+\tif (interface->hw.mac.type != fm10k_mac_vf)\n+\t\tfm10k_add_stat_strings(&p, \"\", fm10k_gstrings_pf_stats,\n+\t\t\t\t FM10K_PF_STATS_LEN);\n \n \tif ((interface->flags & FM10K_FLAG_DEBUG_STATS) && iov_data) {\n \t\tfor (i = 0; i < iov_data->num_vfs; i++) {\n-\t\t\tfor (j = 0; j < FM10K_MBX_STATS_LEN; j++) {\n-\t\t\t\tsnprintf(p,\n-\t\t\t\t\t ETH_GSTRING_LEN,\n-\t\t\t\t\t \"vf_%u_%s\", i,\n-\t\t\t\t\t fm10k_gstrings_mbx_stats[j].stat_string);\n-\t\t\t\tp += ETH_GSTRING_LEN;\n-\t\t\t}\n+\t\t\tchar prefix[ETH_GSTRING_LEN];\n+\n+\t\t\tsnprintf(prefix, ETH_GSTRING_LEN, \"vf_%u_\", i);\n+\t\t\tfm10k_add_stat_strings(&p, prefix,\n+\t\t\t\t\t fm10k_gstrings_mbx_stats,\n+\t\t\t\t\t FM10K_MBX_STATS_LEN);\n \t\t}\n \t}\n \n@@ -271,6 +265,41 @@ static int fm10k_get_sset_count(struct net_device *dev, int sset)\n \t}\n }\n \n+static void fm10k_add_ethtool_stats(u64 **data, void *pointer,\n+\t\t\t\t const struct fm10k_stats stats[],\n+\t\t\t\t const unsigned int size)\n+{\n+\tunsigned int i;\n+\tchar *p;\n+\n+\t/* simply skip forward if we were not given a valid pointer */\n+\tif (!pointer) {\n+\t\t*data += size;\n+\t\treturn;\n+\t}\n+\n+\tfor (i = 0; i < size; i++) {\n+\t\tp = (char *)pointer + stats[i].stat_offset;\n+\n+\t\tswitch (stats[i].sizeof_stat) {\n+\t\tcase sizeof(u64):\n+\t\t\t*((*data)++) = *(u64 *)p;\n+\t\t\tbreak;\n+\t\tcase sizeof(u32):\n+\t\t\t*((*data)++) = *(u32 *)p;\n+\t\t\tbreak;\n+\t\tcase sizeof(u16):\n+\t\t\t*((*data)++) = *(u16 *)p;\n+\t\t\tbreak;\n+\t\tcase sizeof(u8):\n+\t\t\t*((*data)++) = *(u8 *)p;\n+\t\t\tbreak;\n+\t\tdefault:\n+\t\t\t*((*data)++) = 0;\n+\t\t}\n+\t}\n+}\n+\n static void fm10k_get_ethtool_stats(struct net_device *netdev,\n \t\t\t\t struct ethtool_stats __always_unused *stats,\n \t\t\t\t u64 *data)\n@@ -279,47 +308,29 @@ static void fm10k_get_ethtool_stats(struct net_device *netdev,\n \tstruct fm10k_intfc *interface = netdev_priv(netdev);\n \tstruct fm10k_iov_data *iov_data = interface->iov_data;\n \tstruct net_device_stats *net_stats = &netdev->stats;\n-\tchar *p;\n \tint i, j;\n \n \tfm10k_update_stats(interface);\n \n-\tfor (i = 0; i < FM10K_NETDEV_STATS_LEN; i++) {\n-\t\tp = (char *)net_stats + fm10k_gstrings_net_stats[i].stat_offset;\n-\t\t*(data++) = (fm10k_gstrings_net_stats[i].sizeof_stat ==\n-\t\t\tsizeof(u64)) ? *(u64 *)p : *(u32 *)p;\n-\t}\n+\tfm10k_add_ethtool_stats(&data, net_stats, fm10k_gstrings_net_stats,\n+\t\t\t\tFM10K_NETDEV_STATS_LEN);\n \n-\tfor (i = 0; i < FM10K_GLOBAL_STATS_LEN; i++) {\n-\t\tp = (char *)interface +\n-\t\t fm10k_gstrings_global_stats[i].stat_offset;\n-\t\t*(data++) = (fm10k_gstrings_global_stats[i].sizeof_stat ==\n-\t\t\tsizeof(u64)) ? *(u64 *)p : *(u32 *)p;\n-\t}\n+\tfm10k_add_ethtool_stats(&data, interface, fm10k_gstrings_global_stats,\n+\t\t\t\tFM10K_GLOBAL_STATS_LEN);\n \n-\tif (interface->flags & FM10K_FLAG_DEBUG_STATS) {\n-\t\tfor (i = 0; i < FM10K_DEBUG_STATS_LEN; i++) {\n-\t\t\tp = (char *)interface +\n-\t\t\t\tfm10k_gstrings_debug_stats[i].stat_offset;\n-\t\t\t*(data++) = (fm10k_gstrings_debug_stats[i].sizeof_stat ==\n-\t\t\t\t sizeof(u64)) ? *(u64 *)p : *(u32 *)p;\n-\t\t}\n-\t}\n+\tif (interface->flags & FM10K_FLAG_DEBUG_STATS)\n+\t\tfm10k_add_ethtool_stats(&data, interface,\n+\t\t\t\t\tfm10k_gstrings_debug_stats,\n+\t\t\t\t\tFM10K_DEBUG_STATS_LEN);\n \n-\tfor (i = 0; i < FM10K_MBX_STATS_LEN; i++) {\n-\t\tp = (char *)&interface->hw.mbx +\n-\t\t\tfm10k_gstrings_mbx_stats[i].stat_offset;\n-\t\t*(data++) = (fm10k_gstrings_mbx_stats[i].sizeof_stat ==\n-\t\t\tsizeof(u64)) ? *(u64 *)p : *(u32 *)p;\n-\t}\n+\tfm10k_add_ethtool_stats(&data, &interface->hw.mbx,\n+\t\t\t\tfm10k_gstrings_mbx_stats,\n+\t\t\t\tFM10K_MBX_STATS_LEN);\n \n \tif (interface->hw.mac.type != fm10k_mac_vf) {\n-\t\tfor (i = 0; i < FM10K_PF_STATS_LEN; i++) {\n-\t\t\tp = (char *)interface +\n-\t\t\t fm10k_gstrings_pf_stats[i].stat_offset;\n-\t\t\t*(data++) = (fm10k_gstrings_pf_stats[i].sizeof_stat ==\n-\t\t\t\t sizeof(u64)) ? *(u64 *)p : *(u32 *)p;\n-\t\t}\n+\t\tfm10k_add_ethtool_stats(&data, interface,\n+\t\t\t\t\tfm10k_gstrings_pf_stats,\n+\t\t\t\t\tFM10K_PF_STATS_LEN);\n \t}\n \n \tif ((interface->flags & FM10K_FLAG_DEBUG_STATS) && iov_data) {\n@@ -328,18 +339,9 @@ static void fm10k_get_ethtool_stats(struct net_device *netdev,\n \n \t\t\tvf_info = &iov_data->vf_info[i];\n \n-\t\t\t/* skip stats if we don't have a vf info */\n-\t\t\tif (!vf_info) {\n-\t\t\t\tdata += FM10K_MBX_STATS_LEN;\n-\t\t\t\tcontinue;\n-\t\t\t}\n-\n-\t\t\tfor (j = 0; j < FM10K_MBX_STATS_LEN; j++) {\n-\t\t\t\tp = (char *)&vf_info->mbx +\n-\t\t\t\t\tfm10k_gstrings_mbx_stats[j].stat_offset;\n-\t\t\t\t*(data++) = (fm10k_gstrings_mbx_stats[j].sizeof_stat ==\n-\t\t\t\t\t sizeof(u64)) ? *(u64 *)p : *(u32 *)p;\n-\t\t\t}\n+\t\t\tfm10k_add_ethtool_stats(&data, &vf_info->mbx,\n+\t\t\t\t\t\tfm10k_gstrings_mbx_stats,\n+\t\t\t\t\t\tFM10K_MBX_STATS_LEN);\n \t\t}\n \t}\n \n", "prefixes": [ "1/2" ] }