Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1150371/?format=api
{ "id": 1150371, "url": "http://patchwork.ozlabs.org/api/patches/1150371/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20190820211921.9058-1-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": "<20190820211921.9058-1-jacob.e.keller@intel.com>", "list_archive_url": null, "date": "2019-08-20T21:19:21", "name": "[v2] fm10k: add support for ndo_get_vf_stats operation", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "d5a5df40a7e0b693d820349aa3ff258f5631670c", "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/20190820211921.9058-1-jacob.e.keller@intel.com/mbox/", "series": [ { "id": 126324, "url": "http://patchwork.ozlabs.org/api/series/126324/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=126324", "date": "2019-08-20T21:19:21", "name": "[v2] fm10k: add support for ndo_get_vf_stats operation", "version": 2, "mbox": "http://patchwork.ozlabs.org/series/126324/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1150371/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1150371/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.133; helo=hemlock.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 hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 46CkFf5jprz9s4Y\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 21 Aug 2019 07:19:31 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id B6FF188637;\n\tTue, 20 Aug 2019 21:19:29 +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 xg14-pyJLay0; Tue, 20 Aug 2019 21:19:26 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 80F7F8861F;\n\tTue, 20 Aug 2019 21:19:26 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id 202F51BF3A3\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 20 Aug 2019 21:19:25 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 1881C22CB0\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 20 Aug 2019 21:19:25 +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 Q-pnScu33WGI for <intel-wired-lan@lists.osuosl.org>;\n\tTue, 20 Aug 2019 21:19:24 +0000 (UTC)", "from mga09.intel.com (mga09.intel.com [134.134.136.24])\n\tby silver.osuosl.org (Postfix) with ESMTPS id 1313022C6B\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 20 Aug 2019 21:19:24 +0000 (UTC)", "from orsmga005.jf.intel.com ([10.7.209.41])\n\tby orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t20 Aug 2019 14:19:23 -0700", "from jekeller-desk.amr.corp.intel.com ([10.166.244.172])\n\tby orsmga005.jf.intel.com with ESMTP; 20 Aug 2019 14:19:22 -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.64,410,1559545200\"; d=\"scan'208\";a=\"353739174\"", "From": "Jacob Keller <jacob.e.keller@intel.com>", "To": "Intel Wired LAN <intel-wired-lan@lists.osuosl.org>", "Date": "Tue, 20 Aug 2019 14:19:21 -0700", "Message-Id": "<20190820211921.9058-1-jacob.e.keller@intel.com>", "X-Mailer": "git-send-email 2.23.0.245.gf157bbb9169d", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [PATCH v2] fm10k: add support for\n\tndo_get_vf_stats operation", "X-BeenThere": "intel-wired-lan@osuosl.org", "X-Mailman-Version": "2.1.29", "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>", "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": "Support capturing and reporting statistics for all of the VFs associated\nwith a given PF device via the ndo_get_vf_stats callback.\n\nSigned-off-by: Jacob Keller <jacob.e.keller@intel.com>\n---\nFixed the patch author.\n\n drivers/net/ethernet/intel/fm10k/fm10k.h | 3 ++\n drivers/net/ethernet/intel/fm10k/fm10k_iov.c | 48 +++++++++++++++++++\n .../net/ethernet/intel/fm10k/fm10k_netdev.c | 1 +\n drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 3 ++\n drivers/net/ethernet/intel/fm10k/fm10k_type.h | 1 +\n 5 files changed, 56 insertions(+)", "diff": "diff --git a/drivers/net/ethernet/intel/fm10k/fm10k.h b/drivers/net/ethernet/intel/fm10k/fm10k.h\nindex b14441944b4b..f306084ca12c 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k.h\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k.h\n@@ -534,6 +534,7 @@ void fm10k_iov_suspend(struct pci_dev *pdev);\n int fm10k_iov_resume(struct pci_dev *pdev);\n void fm10k_iov_disable(struct pci_dev *pdev);\n int fm10k_iov_configure(struct pci_dev *pdev, int num_vfs);\n+void fm10k_iov_update_stats(struct fm10k_intfc *interface);\n s32 fm10k_iov_update_pvid(struct fm10k_intfc *interface, u16 glort, u16 pvid);\n int fm10k_ndo_set_vf_mac(struct net_device *netdev, int vf_idx, u8 *mac);\n int fm10k_ndo_set_vf_vlan(struct net_device *netdev,\n@@ -542,6 +543,8 @@ int fm10k_ndo_set_vf_bw(struct net_device *netdev, int vf_idx,\n \t\t\tint __always_unused min_rate, int max_rate);\n int fm10k_ndo_get_vf_config(struct net_device *netdev,\n \t\t\t int vf_idx, struct ifla_vf_info *ivi);\n+int fm10k_ndo_get_vf_stats(struct net_device *netdev,\n+\t\t\t int vf_idx, struct ifla_vf_stats *stats);\n \n /* DebugFS */\n #ifdef CONFIG_DEBUG_FS\ndiff --git a/drivers/net/ethernet/intel/fm10k/fm10k_iov.c b/drivers/net/ethernet/intel/fm10k/fm10k_iov.c\nindex afe1fafd2447..8c50a128df29 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_iov.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_iov.c\n@@ -520,6 +520,27 @@ int fm10k_iov_configure(struct pci_dev *pdev, int num_vfs)\n \treturn num_vfs;\n }\n \n+/**\n+ * fm10k_iov_update_stats - Update stats for all VFs\n+ * @interface: device private structure\n+ *\n+ * Updates the VF statistics for all enabled VFs. Expects to be called by\n+ * fm10k_update_stats and assumes that locking via the __FM10K_UPDATING_STATS\n+ * bit is already handled.\n+ */\n+void fm10k_iov_update_stats(struct fm10k_intfc *interface)\n+{\n+\tstruct fm10k_iov_data *iov_data = interface->iov_data;\n+\tstruct fm10k_hw *hw = &interface->hw;\n+\tint i;\n+\n+\tif (!iov_data)\n+\t\treturn;\n+\n+\tfor (i = 0; i < iov_data->num_vfs; i++)\n+\t\thw->iov.ops.update_stats(hw, iov_data->vf_info[i].stats, i);\n+}\n+\n static inline void fm10k_reset_vf_info(struct fm10k_intfc *interface,\n \t\t\t\t struct fm10k_vf_info *vf_info)\n {\n@@ -650,3 +671,30 @@ int fm10k_ndo_get_vf_config(struct net_device *netdev,\n \n \treturn 0;\n }\n+\n+int fm10k_ndo_get_vf_stats(struct net_device *netdev,\n+\t\t\t int vf_idx, struct ifla_vf_stats *stats)\n+{\n+\tstruct fm10k_intfc *interface = netdev_priv(netdev);\n+\tstruct fm10k_iov_data *iov_data = interface->iov_data;\n+\tstruct fm10k_hw *hw = &interface->hw;\n+\tstruct fm10k_hw_stats_q *hw_stats;\n+\tu32 idx, qpp;\n+\n+\t/* verify SR-IOV is active and that vf idx is valid */\n+\tif (!iov_data || vf_idx >= iov_data->num_vfs)\n+\t\treturn -EINVAL;\n+\n+\tqpp = fm10k_queues_per_pool(hw);\n+\thw_stats = iov_data->vf_info[vf_idx].stats;\n+\n+\tfor (idx = 0; idx < qpp; idx++) {\n+\t\tstats->rx_packets += hw_stats[idx].rx_packets.count;\n+\t\tstats->tx_packets += hw_stats[idx].tx_packets.count;\n+\t\tstats->rx_bytes += hw_stats[idx].rx_bytes.count;\n+\t\tstats->tx_bytes += hw_stats[idx].tx_bytes.count;\n+\t\tstats->rx_dropped += hw_stats[idx].rx_drops.count;\n+\t}\n+\n+\treturn 0;\n+}\ndiff --git a/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c b/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c\nindex d3e85480f46d..2873e8283192 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c\n@@ -1644,6 +1644,7 @@ static const struct net_device_ops fm10k_netdev_ops = {\n \t.ndo_set_vf_vlan\t= fm10k_ndo_set_vf_vlan,\n \t.ndo_set_vf_rate\t= fm10k_ndo_set_vf_bw,\n \t.ndo_get_vf_config\t= fm10k_ndo_get_vf_config,\n+\t.ndo_get_vf_stats\t= fm10k_ndo_get_vf_stats,\n \t.ndo_udp_tunnel_add\t= fm10k_udp_tunnel_add,\n \t.ndo_udp_tunnel_del\t= fm10k_udp_tunnel_del,\n \t.ndo_dfwd_add_station\t= fm10k_dfwd_add_station,\ndiff --git a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c\nindex bb236fa44048..d122d0087191 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c\n@@ -630,6 +630,9 @@ void fm10k_update_stats(struct fm10k_intfc *interface)\n \tnet_stats->rx_errors = rx_errors;\n \tnet_stats->rx_dropped = interface->stats.nodesc_drop.count;\n \n+\t/* Update VF statistics */\n+\tfm10k_iov_update_stats(interface);\n+\n \tclear_bit(__FM10K_UPDATING_STATS, interface->state);\n }\n \ndiff --git a/drivers/net/ethernet/intel/fm10k/fm10k_type.h b/drivers/net/ethernet/intel/fm10k/fm10k_type.h\nindex 15ac1c7885bc..63968c5d7c5d 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_type.h\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_type.h\n@@ -581,6 +581,7 @@ struct fm10k_vf_info {\n \t * at the same offset as the mailbox\n \t */\n \tstruct fm10k_mbx_info\tmbx;\t\t/* PF side of VF mailbox */\n+\tstruct fm10k_hw_stats_q\tstats[FM10K_MAX_QUEUES_POOL];\n \tint\t\t\trate;\t\t/* Tx BW cap as defined by OS */\n \tu16\t\t\tglort;\t\t/* resource tag for this VF */\n \tu16\t\t\tsw_vid;\t\t/* Switch API assigned VLAN */\n", "prefixes": [ "v2" ] }