Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1192291/?format=api
{ "id": 1192291, "url": "http://patchwork.ozlabs.org/api/patches/1192291/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20191108142331.10221-12-anthony.l.nguyen@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": "<20191108142331.10221-12-anthony.l.nguyen@intel.com>", "list_archive_url": null, "date": "2019-11-08T14:23:28", "name": "[S33,12/15] ice: implement VF stats NDO", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "70f60a3da1fb63e1abe89665827493761d81388e", "submitter": { "id": 68875, "url": "http://patchwork.ozlabs.org/api/people/68875/?format=api", "name": "Tony Nguyen", "email": "anthony.l.nguyen@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/20191108142331.10221-12-anthony.l.nguyen@intel.com/mbox/", "series": [ { "id": 141798, "url": "http://patchwork.ozlabs.org/api/series/141798/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=141798", "date": "2019-11-08T14:23:30", "name": "[S33,01/15] ice: Store number of functions for the device", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/141798/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1192291/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1192291/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; spf=pass (sender SPF authorized)\n\tsmtp.mailfrom=osuosl.org (client-ip=140.211.166.133;\n\thelo=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 478wZ81Cw2z9sP4\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat, 9 Nov 2019 09:54:24 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 934E388072;\n\tFri, 8 Nov 2019 22:54:22 +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 wj0xxQEWWIwz; Fri, 8 Nov 2019 22:54:21 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 9F8F08807C;\n\tFri, 8 Nov 2019 22:54:20 +0000 (UTC)", "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\tby ash.osuosl.org (Postfix) with ESMTP id CEFF71BF995\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 8 Nov 2019 22:54:18 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id CC58D864EE\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 8 Nov 2019 22:54:18 +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 dTZtAIXS5qEi for <intel-wired-lan@lists.osuosl.org>;\n\tFri, 8 Nov 2019 22:54:18 +0000 (UTC)", "from mga01.intel.com (mga01.intel.com [192.55.52.88])\n\tby fraxinus.osuosl.org (Postfix) with ESMTPS id 3415C864EC\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 8 Nov 2019 22:54:18 +0000 (UTC)", "from fmsmga008.fm.intel.com ([10.253.24.58])\n\tby fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t08 Nov 2019 14:54:17 -0800", "from unknown (HELO localhost.jf.intel.com) ([10.166.244.174])\n\tby fmsmga008.fm.intel.com with ESMTP; 08 Nov 2019 14:54:17 -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-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.68,283,1569308400\"; d=\"scan'208\";a=\"201478838\"", "From": "Tony Nguyen <anthony.l.nguyen@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Fri, 8 Nov 2019 06:23:28 -0800", "Message-Id": "<20191108142331.10221-12-anthony.l.nguyen@intel.com>", "X-Mailer": "git-send-email 2.20.1", "In-Reply-To": "<20191108142331.10221-1-anthony.l.nguyen@intel.com>", "References": "<20191108142331.10221-1-anthony.l.nguyen@intel.com>", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [PATCH S33 12/15] ice: implement VF stats NDO", "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": "From: Jesse Brandeburg <jesse.brandeburg@intel.com>\n\nImplement the VF stats gathering via the kernel via ndo_get_vf_stats().\nThe driver will show per-VF stats in the output of the\nip -s link show dev <PF> command.\n\nSigned-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>\nSigned-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>\n---\n drivers/net/ethernet/intel/ice/ice_main.c | 1 +\n .../net/ethernet/intel/ice/ice_virtchnl_pf.c | 45 +++++++++++++++++++\n .../net/ethernet/intel/ice/ice_virtchnl_pf.h | 11 +++++\n 3 files changed, 57 insertions(+)", "diff": "diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c\nindex ea577588b274..d282eb05c2e0 100644\n--- a/drivers/net/ethernet/intel/ice/ice_main.c\n+++ b/drivers/net/ethernet/intel/ice/ice_main.c\n@@ -5219,6 +5219,7 @@ static const struct net_device_ops ice_netdev_ops = {\n \t.ndo_set_vf_trust = ice_set_vf_trust,\n \t.ndo_set_vf_vlan = ice_set_vf_port_vlan,\n \t.ndo_set_vf_link_state = ice_set_vf_link_state,\n+\t.ndo_get_vf_stats = ice_get_vf_stats,\n \t.ndo_vlan_rx_add_vid = ice_vlan_rx_add_vid,\n \t.ndo_vlan_rx_kill_vid = ice_vlan_rx_kill_vid,\n \t.ndo_set_features = ice_set_features,\ndiff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c\nindex aa99d7cb7d8e..edb374296d1f 100644\n--- a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c\n+++ b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c\n@@ -3391,3 +3391,48 @@ int ice_set_vf_link_state(struct net_device *netdev, int vf_id, int link_state)\n \n \treturn 0;\n }\n+\n+/**\n+ * ice_get_vf_stats - populate some stats for the VF\n+ * @netdev: the netdev of the PF\n+ * @vf_id: the host OS identifier (0-255)\n+ * @vf_stats: pointer to the OS memory to be initialized\n+ */\n+int ice_get_vf_stats(struct net_device *netdev, int vf_id,\n+\t\t struct ifla_vf_stats *vf_stats)\n+{\n+\tstruct ice_pf *pf = ice_netdev_to_pf(netdev);\n+\tstruct ice_eth_stats *stats;\n+\tstruct ice_vsi *vsi;\n+\tstruct ice_vf *vf;\n+\n+\tif (ice_validate_vf_id(pf, vf_id))\n+\t\treturn -EINVAL;\n+\n+\tvf = &pf->vf[vf_id];\n+\n+\tif (ice_check_vf_init(pf, vf))\n+\t\treturn -EBUSY;\n+\n+\tvsi = pf->vsi[vf->lan_vsi_idx];\n+\tif (!vsi)\n+\t\treturn -EINVAL;\n+\n+\tice_update_eth_stats(vsi);\n+\tstats = &vsi->eth_stats;\n+\n+\tmemset(vf_stats, 0, sizeof(*vf_stats));\n+\n+\tvf_stats->rx_packets = stats->rx_unicast + stats->rx_broadcast +\n+\t\tstats->rx_multicast;\n+\tvf_stats->tx_packets = stats->tx_unicast + stats->tx_broadcast +\n+\t\tstats->tx_multicast;\n+\tvf_stats->rx_bytes = stats->rx_bytes;\n+\tvf_stats->tx_bytes = stats->tx_bytes;\n+\tvf_stats->broadcast = stats->rx_broadcast;\n+\tvf_stats->multicast = stats->rx_multicast;\n+\tvf_stats->rx_dropped = stats->rx_discards;\n+\tvf_stats->tx_dropped = stats->tx_discards;\n+\n+\treturn 0;\n+}\ndiff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h\nindex 2e867ad2e81d..88aa65d5cb31 100644\n--- a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h\n+++ b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h\n@@ -122,6 +122,9 @@ int ice_set_vf_spoofchk(struct net_device *netdev, int vf_id, bool ena);\n int ice_calc_vf_reg_idx(struct ice_vf *vf, struct ice_q_vector *q_vector);\n \n void ice_set_vf_state_qs_dis(struct ice_vf *vf);\n+int\n+ice_get_vf_stats(struct net_device *netdev, int vf_id,\n+\t\t struct ifla_vf_stats *vf_stats);\n #else /* CONFIG_PCI_IOV */\n #define ice_process_vflr_event(pf) do {} while (0)\n #define ice_free_vfs(pf) do {} while (0)\n@@ -194,5 +197,13 @@ ice_calc_vf_reg_idx(struct ice_vf __always_unused *vf,\n {\n \treturn 0;\n }\n+\n+static inline int\n+ice_get_vf_stats(struct net_device __always_unused *netdev,\n+\t\t int __always_unused vf_id,\n+\t\t struct ifla_vf_stats __always_unused *vf_stats)\n+{\n+\treturn -EOPNOTSUPP;\n+}\n #endif /* CONFIG_PCI_IOV */\n #endif /* _ICE_VIRTCHNL_PF_H_ */\n", "prefixes": [ "S33", "12/15" ] }