Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/897755/?format=api
{ "id": 897755, "url": "http://patchwork.ozlabs.org/api/patches/897755/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20180412181559.4343-3-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-3-jacob.e.keller@intel.com>", "list_archive_url": null, "date": "2018-04-12T18:15:56", "name": "[3/6] fm10k: use variadic arguments to fm10k_add_stat_strings", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "37a8ba96ffb27d7f3293e41c6a9a89dbf520779c", "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-3-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/897755/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/897755/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=none (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 40MTcf2TYBz9s27\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 13 Apr 2018 04:16:18 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id CBDA087354;\n\tThu, 12 Apr 2018 18:16:16 +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 gTDhC8evbjur; Thu, 12 Apr 2018 18:16:15 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 92BC187302;\n\tThu, 12 Apr 2018 18:16:15 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id 2AE6A1CF139\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 12 Apr 2018 18:16:12 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 2858522070\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 12 Apr 2018 18:16:12 +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 I9p28ET9beas 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 503FF22113\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:10 -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:09 -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=\"45707726\"", "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:56 -0700", "Message-Id": "<20180412181559.4343-3-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 3/6] fm10k: use variadic arguments to\n\tfm10k_add_stat_strings", "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": "Instead of using a fixed prefix string we setup before each call to\nfm10k_add_stat_strings, modify the helper to take variadic arguments and\npass them to vsnprintf. This requires changing the fm10k_stat strings to\ntake % format specifiers where necessary, but the resulting code is much\nsimpler.\n\nChange-Id: I8055adeae0d63c227024c007c2ff51d0ee495238\nSigned-off-by: Jacob Keller <jacob.e.keller@intel.com>\nTitle: use variadic arguments to fm10k_add_stat_strings\nChange-type: ImplementationChange\nReviewed-on: https://git-amr-1.devtools.intel.com/gerrit/198022\nTested-by: nosbuild <nosbuild@intel.com>\n---\n drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c | 53 ++++++++++++------------\n 1 file changed, 27 insertions(+), 26 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c b/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c\nindex 339915400a03..26bf2322f457 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c\n@@ -24,6 +24,11 @@\n #include \"fm10k.h\"\n \n struct fm10k_stats {\n+\t/* The stat_string is expected to be a format string formatted using\n+\t * vsnprintf by fm10k_add_stat_strings. Every member of a stats array\n+\t * should use the same format specifiers as they will be formatted\n+\t * using the same variadic arguments.\n+\t */\n \tchar stat_string[ETH_GSTRING_LEN];\n \tint sizeof_stat;\n \tint stat_offset;\n@@ -111,15 +116,13 @@ static const struct fm10k_stats fm10k_gstrings_mbx_stats[] = {\n \tFM10K_MBX_STAT(\"mbx_rx_mbmem_pushed\", rx_mbmem_pushed),\n };\n \n-#define FM10K_QUEUE_STAT(_name, _stat) { \\\n-\t.stat_string = _name, \\\n-\t.sizeof_stat = FIELD_SIZEOF(struct fm10k_ring, _stat), \\\n-\t.stat_offset = offsetof(struct fm10k_ring, _stat) \\\n-}\n+/* per-queue ring statistics */\n+#define FM10K_QUEUE_STAT(_name, _stat) \\\n+\tFM10K_STAT_FIELDS(struct fm10k_ring, _name, _stat)\n \n static const struct fm10k_stats fm10k_gstrings_queue_stats[] = {\n-\tFM10K_QUEUE_STAT(\"packets\", stats.packets),\n-\tFM10K_QUEUE_STAT(\"bytes\", stats.bytes),\n+\tFM10K_QUEUE_STAT(\"%s_queue_%u_packets\", stats.packets),\n+\tFM10K_QUEUE_STAT(\"%s_queue_%u_bytes\", stats.bytes),\n };\n \n #define FM10K_GLOBAL_STATS_LEN ARRAY_SIZE(fm10k_gstrings_global_stats)\n@@ -149,16 +152,18 @@ 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 char *prefix,\n-\t\t\t\t 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 \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\tva_list args;\n+\n+\t\tva_start(args, size);\n+\t\tvsnprintf(*p, ETH_GSTRING_LEN, stats[i].stat_string, args);\n \t\t*p += ETH_GSTRING_LEN;\n+\t\tva_end(args);\n \t}\n }\n \n@@ -167,31 +172,27 @@ static void fm10k_get_stat_strings(struct net_device *dev, u8 *data)\n \tstruct fm10k_intfc *interface = netdev_priv(dev);\n \tunsigned int i;\n \n-\tfm10k_add_stat_strings(&data, \"\", fm10k_gstrings_net_stats,\n+\tfm10k_add_stat_strings(&data, fm10k_gstrings_net_stats,\n \t\t\t FM10K_NETDEV_STATS_LEN);\n \n-\tfm10k_add_stat_strings(&data, \"\", fm10k_gstrings_global_stats,\n+\tfm10k_add_stat_strings(&data, fm10k_gstrings_global_stats,\n \t\t\t FM10K_GLOBAL_STATS_LEN);\n \n-\tfm10k_add_stat_strings(&data, \"\", fm10k_gstrings_mbx_stats,\n+\tfm10k_add_stat_strings(&data, fm10k_gstrings_mbx_stats,\n \t\t\t FM10K_MBX_STATS_LEN);\n \n \tif (interface->hw.mac.type != fm10k_mac_vf)\n-\t\tfm10k_add_stat_strings(&data, \"\", fm10k_gstrings_pf_stats,\n+\t\tfm10k_add_stat_strings(&data, fm10k_gstrings_pf_stats,\n \t\t\t\t FM10K_PF_STATS_LEN);\n \n \tfor (i = 0; i < interface->hw.mac.max_queues; i++) {\n-\t\tchar prefix[ETH_GSTRING_LEN];\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\tsnprintf(prefix, ETH_GSTRING_LEN, \"tx_queue_%u_\", i);\n-\t\tfm10k_add_stat_strings(&data, prefix,\n-\t\t\t\t fm10k_gstrings_queue_stats,\n-\t\t\t\t FM10K_QUEUE_STATS_LEN);\n-\n-\t\tsnprintf(prefix, ETH_GSTRING_LEN, \"rx_queue_%u_\", i);\n-\t\tfm10k_add_stat_strings(&data, prefix,\n-\t\t\t\t fm10k_gstrings_queue_stats,\n-\t\t\t\t FM10K_QUEUE_STATS_LEN);\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 \n", "prefixes": [ "3/6" ] }