Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/897756/?format=api
{ "id": 897756, "url": "http://patchwork.ozlabs.org/api/patches/897756/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20180412181559.4343-4-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": "<20180412181559.4343-4-jacob.e.keller@intel.com>", "list_archive_url": null, "date": "2018-04-12T18:15:57", "name": "[4/6] fm10k: use macro to avoid passing the array and size separately", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "ca49aa3c7528260ee68a66492a552a25fb8fe4c1", "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/20180412181559.4343-4-jacob.e.keller@intel.com/mbox/", "series": [ { "id": 38679, "url": "http://patchwork.ozlabs.org/api/series/38679/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=38679", "date": "2018-04-12T18:15:54", "name": "[1/6] fm10k: setup VLANs for l2 accelerated macvlan interfaces", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/38679/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/897756/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/897756/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=none (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 AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 40MTch1hHXz9s25\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 13 Apr 2018 04:16:20 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 9DE8A8839E;\n\tThu, 12 Apr 2018 18:16:18 +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 aObolVRWcxxj; Thu, 12 Apr 2018 18:16:16 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 4D4428831F;\n\tThu, 12 Apr 2018 18:16:16 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id BA4AE1CF139\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 12 Apr 2018 18:16:13 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id B4A58221D2\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 12 Apr 2018 18:16:13 +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 f5T9t3khu9Av for <intel-wired-lan@lists.osuosl.org>;\n\tThu, 12 Apr 2018 18:16:11 +0000 (UTC)", "from mga09.intel.com (mga09.intel.com [134.134.136.24])\n\tby silver.osuosl.org (Postfix) with ESMTPS id 7495A22182\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 12 Apr 2018 18:16:11 +0000 (UTC)", "from fmsmga004.fm.intel.com ([10.253.24.48])\n\tby orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t12 Apr 2018 11:16:11 -0700", "from jekeller-desk.amr.corp.intel.com (HELO\n\tjekeller-desk.jekeller.internal) ([134.134.177.161])\n\tby fmsmga004.fm.intel.com with ESMTP; 12 Apr 2018 11:16:10 -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.48,442,1517904000\"; d=\"scan'208\";a=\"45707730\"", "From": "Jacob Keller <jacob.e.keller@intel.com>", "To": "Intel Wired LAN <intel-wired-lan@lists.osuosl.org>", "Date": "Thu, 12 Apr 2018 11:15:57 -0700", "Message-Id": "<20180412181559.4343-4-jacob.e.keller@intel.com>", "X-Mailer": "git-send-email 2.15.1.478.ga1e07cd25f8b", "In-Reply-To": "<20180412181559.4343-1-jacob.e.keller@intel.com>", "References": "<20180412181559.4343-1-jacob.e.keller@intel.com>", "Subject": "[Intel-wired-lan] [PATCH 4/6] fm10k: use macro to avoid passing the\n\tarray and size separately", "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": "Avoid potential bugs with fm10k_add_stat_strings and\nfm10k_add_ethtool_stats by using a macro to calculate the ARRAY_SIZE\nwhen passing. This helps ensure that the size is always correct.\n\nNote that it assumes we only pass static const fm10k_stat arrays, and\nthat evaluation of the argument won't have side effects.\n\nChange-Id: Id9396eef12cbab51a2559db80782e33fb20df274\nSigned-off-by: Jacob Keller <jacob.e.keller@intel.com>\nTitle: use macro to avoid passing the array and size separately\nChange-type: ImplementationChange\nReviewed-on: https://git-amr-1.devtools.intel.com/gerrit/198023\n---\n drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c | 48 +++++++++++-------------\n 1 file changed, 21 insertions(+), 27 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c b/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c\nindex 26bf2322f457..e7e0e3c82fb2 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c\n@@ -152,8 +152,8 @@ enum {\n static const char fm10k_prv_flags[FM10K_PRV_FLAG_LEN][ETH_GSTRING_LEN] = {\n };\n \n-static void fm10k_add_stat_strings(u8 **p, const struct fm10k_stats stats[],\n-\t\t\t\t const unsigned int size, ...)\n+static void __fm10k_add_stat_strings(u8 **p, const struct fm10k_stats stats[],\n+\t\t\t\t const unsigned int size, ...)\n {\n \tunsigned int i;\n \n@@ -167,31 +167,28 @@ static void fm10k_add_stat_strings(u8 **p, const struct fm10k_stats stats[],\n \t}\n }\n \n+#define fm10k_add_stat_strings(p, stats, ...) \\\n+\t__fm10k_add_stat_strings(p, stats, ARRAY_SIZE(stats), ## __VA_ARGS__)\n+\n static void fm10k_get_stat_strings(struct net_device *dev, u8 *data)\n {\n \tstruct fm10k_intfc *interface = netdev_priv(dev);\n \tunsigned int i;\n \n-\tfm10k_add_stat_strings(&data, fm10k_gstrings_net_stats,\n-\t\t\t FM10K_NETDEV_STATS_LEN);\n+\tfm10k_add_stat_strings(&data, fm10k_gstrings_net_stats);\n \n-\tfm10k_add_stat_strings(&data, fm10k_gstrings_global_stats,\n-\t\t\t FM10K_GLOBAL_STATS_LEN);\n+\tfm10k_add_stat_strings(&data, fm10k_gstrings_global_stats);\n \n-\tfm10k_add_stat_strings(&data, fm10k_gstrings_mbx_stats,\n-\t\t\t FM10K_MBX_STATS_LEN);\n+\tfm10k_add_stat_strings(&data, fm10k_gstrings_mbx_stats);\n \n \tif (interface->hw.mac.type != fm10k_mac_vf)\n-\t\tfm10k_add_stat_strings(&data, fm10k_gstrings_pf_stats,\n-\t\t\t\t FM10K_PF_STATS_LEN);\n+\t\tfm10k_add_stat_strings(&data, fm10k_gstrings_pf_stats);\n \n \tfor (i = 0; i < interface->hw.mac.max_queues; i++) {\n \t\tfm10k_add_stat_strings(&data, fm10k_gstrings_queue_stats,\n-\t\t\t\t FM10K_QUEUE_STATS_LEN,\n \t\t\t\t \"tx\", i);\n \n \t\tfm10k_add_stat_strings(&data, fm10k_gstrings_queue_stats,\n-\t\t\t\t FM10K_QUEUE_STATS_LEN,\n \t\t\t\t \"rx\", i);\n \t}\n }\n@@ -237,9 +234,9 @@ 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+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@@ -273,6 +270,9 @@ static void fm10k_add_ethtool_stats(u64 **data, void *pointer,\n \t}\n }\n \n+#define fm10k_add_ethtool_stats(data, pointer, stats) \\\n+\t__fm10k_add_ethtool_stats(data, pointer, stats, ARRAY_SIZE(stats))\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@@ -283,20 +283,16 @@ static void fm10k_get_ethtool_stats(struct net_device *netdev,\n \n \tfm10k_update_stats(interface);\n \n-\tfm10k_add_ethtool_stats(&data, net_stats, fm10k_gstrings_net_stats,\n-\t\t\t\tFM10K_NETDEV_STATS_LEN);\n+\tfm10k_add_ethtool_stats(&data, net_stats, fm10k_gstrings_net_stats);\n \n-\tfm10k_add_ethtool_stats(&data, interface, fm10k_gstrings_global_stats,\n-\t\t\t\tFM10K_GLOBAL_STATS_LEN);\n+\tfm10k_add_ethtool_stats(&data, interface, fm10k_gstrings_global_stats);\n \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+\t\t\t\tfm10k_gstrings_mbx_stats);\n \n \tif (interface->hw.mac.type != fm10k_mac_vf) {\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\t\t\t\tfm10k_gstrings_pf_stats);\n \t}\n \n \tfor (i = 0; i < interface->hw.mac.max_queues; i++) {\n@@ -304,13 +300,11 @@ static void fm10k_get_ethtool_stats(struct net_device *netdev,\n \n \t\tring = interface->tx_ring[i];\n \t\tfm10k_add_ethtool_stats(&data, ring,\n-\t\t\t\t\tfm10k_gstrings_queue_stats,\n-\t\t\t\t\tFM10K_QUEUE_STATS_LEN);\n+\t\t\t\t\tfm10k_gstrings_queue_stats);\n \n \t\tring = interface->rx_ring[i];\n \t\tfm10k_add_ethtool_stats(&data, ring,\n-\t\t\t\t\tfm10k_gstrings_queue_stats,\n-\t\t\t\t\tFM10K_QUEUE_STATS_LEN);\n+\t\t\t\t\tfm10k_gstrings_queue_stats);\n \t}\n }\n \n", "prefixes": [ "4/6" ] }