Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/458047/?format=api
{ "id": 458047, "url": "http://patchwork.ozlabs.org/api/patches/458047/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1428092835-16834-9-git-send-email-jeffrey.t.kirsher@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": "<1428092835-16834-9-git-send-email-jeffrey.t.kirsher@intel.com>", "list_archive_url": null, "date": "2015-04-03T20:26:59", "name": "[net-next,09/25] fm10k: use hw->mac.max_queues for stats", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "11182e052236d82e48f3fc1f04117e4217384714", "submitter": { "id": 473, "url": "http://patchwork.ozlabs.org/api/people/473/?format=api", "name": "Kirsher, Jeffrey T", "email": "jeffrey.t.kirsher@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/1428092835-16834-9-git-send-email-jeffrey.t.kirsher@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/458047/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/458047/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 fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137])\n\tby ozlabs.org (Postfix) with ESMTP id 5BA9C1400B7\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat, 4 Apr 2015 07:27:30 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id AE742A4099;\n\tFri, 3 Apr 2015 20:27:29 +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 xxHQLbVu38tW; Fri, 3 Apr 2015 20:27:27 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 2A6B6A3F0D;\n\tFri, 3 Apr 2015 20:27:27 +0000 (UTC)", "from whitealder.osuosl.org (whitealder.osuosl.org\n\t[140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id 7FA681C2BDA\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 3 Apr 2015 20:27:22 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 7B7C892162\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 3 Apr 2015 20:27:22 +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 EoRB28xh6vSr for <intel-wired-lan@lists.osuosl.org>;\n\tFri, 3 Apr 2015 20:27:19 +0000 (UTC)", "from mga09.intel.com (mga09.intel.com [134.134.136.24])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id D2D8692166\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 3 Apr 2015 20:27:19 +0000 (UTC)", "from fmsmga003.fm.intel.com ([10.253.24.29])\n\tby orsmga102.jf.intel.com with ESMTP; 03 Apr 2015 13:27:19 -0700", "from lwang4-mobl1.amr.corp.intel.com (HELO\n\tjtkirshe-mobl.amr.corp.intel.com) ([10.254.109.203])\n\tby FMSMGA003.fm.intel.com with ESMTP; 03 Apr 2015 13:27:19 -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-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.11,519,1422950400\"; d=\"scan'208\";a=\"476517891\"", "From": "Jeff Kirsher <jeffrey.t.kirsher@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Fri, 3 Apr 2015 13:26:59 -0700", "Message-Id": "<1428092835-16834-9-git-send-email-jeffrey.t.kirsher@intel.com>", "X-Mailer": "git-send-email 1.9.3", "In-Reply-To": "<1428092835-16834-1-git-send-email-jeffrey.t.kirsher@intel.com>", "References": "<1428092835-16834-1-git-send-email-jeffrey.t.kirsher@intel.com>", "Subject": "[Intel-wired-lan] [net-next 09/25] fm10k: use hw->mac.max_queues\n\tfor 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": "Even though it shouldn't strictly matter, don't count queue stats higher\nthan the max_queues value stored for this mac. This ensures that we\ndon't attempt to check queues which don't belong to use in VFs. This\nshouldn't be a visible change, as the VFs should see zero for queues\nwhich don't belong to them.\n\nSigned-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>\nSigned-off-by: Jacob Keller <jacob.e.keller@intel.com>\nAcked-by: Matthew Vick <matthew.vick@intel.com>\n---\n drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c | 18 +++++++++++-------\n drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 2 +-\n 2 files changed, 12 insertions(+), 8 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c b/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c\nindex 478e67b..cbfaf94 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c\n@@ -98,12 +98,11 @@ static const struct fm10k_stats fm10k_gstrings_stats[] = {\n \n #define FM10K_GLOBAL_STATS_LEN ARRAY_SIZE(fm10k_gstrings_stats)\n \n-#define FM10K_QUEUE_STATS_LEN \\\n-\t (MAX_QUEUES * 2 * (sizeof(struct fm10k_queue_stats) / sizeof(u64)))\n+#define FM10K_QUEUE_STATS_LEN(_n) \\\n+\t( (_n) * 2 * (sizeof(struct fm10k_queue_stats) / sizeof(u64)))\n \n-#define FM10K_STATS_LEN (FM10K_GLOBAL_STATS_LEN + \\\n-\t\t\t FM10K_NETDEV_STATS_LEN + \\\n-\t\t\t FM10K_QUEUE_STATS_LEN)\n+#define FM10K_STATIC_STATS_LEN (FM10K_GLOBAL_STATS_LEN + \\\n+\t\t\t\tFM10K_NETDEV_STATS_LEN)\n \n static const char fm10k_gstrings_test[][ETH_GSTRING_LEN] = {\n \t\"Mailbox test (on/offline)\"\n@@ -155,11 +154,16 @@ static void fm10k_get_strings(struct net_device *dev, u32 stringset, u8 *data)\n \n static int fm10k_get_sset_count(struct net_device *dev, int sset)\n {\n+\tstruct fm10k_intfc *interface = netdev_priv(dev);\n+\tstruct fm10k_hw *hw = &interface->hw;\n+\tint stats_len = FM10K_STATIC_STATS_LEN;\n+\n \tswitch (sset) {\n \tcase ETH_SS_TEST:\n \t\treturn FM10K_TEST_LEN;\n \tcase ETH_SS_STATS:\n-\t\treturn FM10K_STATS_LEN;\n+\t\tstats_len += FM10K_QUEUE_STATS_LEN(hw->mac.max_queues);\n+\t\treturn stats_len;\n \tdefault:\n \t\treturn -EOPNOTSUPP;\n \t}\n@@ -369,7 +373,7 @@ static void fm10k_get_drvinfo(struct net_device *dev,\n \tstrncpy(info->bus_info, pci_name(interface->pdev),\n \t\tsizeof(info->bus_info) - 1);\n \n-\tinfo->n_stats = FM10K_STATS_LEN;\n+\tinfo->n_stats = fm10k_get_sset_count(dev, ETH_SS_STATS);\n \n \tinfo->regdump_len = fm10k_get_regs_len(dev);\n }\ndiff --git a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c\nindex 12a3044..0ef1d71 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c\n@@ -360,7 +360,7 @@ void fm10k_update_stats(struct fm10k_intfc *interface)\n \n \thw->mac.ops.update_hw_stats(hw, &interface->stats);\n \n-\tfor (i = 0; i < FM10K_MAX_QUEUES_PF; i++) {\n+\tfor (i = 0; i < hw->mac.max_queues; i++) {\n \t\tstruct fm10k_hw_stats_q *q = &interface->stats.q[i];\n \n \t\ttx_bytes_nic += q->tx_bytes.count;\n", "prefixes": [ "net-next", "09/25" ] }