Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/770016/?format=api
{ "id": 770016, "url": "http://patchwork.ozlabs.org/api/patches/770016/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20170601224051.6106-16-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": "<20170601224051.6106-16-jacob.e.keller@intel.com>", "list_archive_url": null, "date": "2017-06-01T22:40:51", "name": "[15/15] fm10k: use the MAC/VLAN queue for VF<->PF MAC/VLAN requests", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "6d8b12ae4e8c1133035e416065b3d4857e436c0e", "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/20170601224051.6106-16-jacob.e.keller@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/770016/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/770016/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" ], "Received": [ "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\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 3wf2Pw0BBhz9sN8\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 2 Jun 2017 08:41:23 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 7CDFA30C66;\n\tThu, 1 Jun 2017 22:41:22 +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 kzYKnbqDye8M; Thu, 1 Jun 2017 22:41:16 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id 11E3D30C9D;\n\tThu, 1 Jun 2017 22:41:09 +0000 (UTC)", "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\tby ash.osuosl.org (Postfix) with ESMTP id C6E541C0479\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 1 Jun 2017 22:40:58 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id BA12E88B37\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 1 Jun 2017 22:40:58 +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 bHDdtSuUykR7 for <intel-wired-lan@lists.osuosl.org>;\n\tThu, 1 Jun 2017 22:40:58 +0000 (UTC)", "from mga14.intel.com (mga14.intel.com [192.55.52.115])\n\tby fraxinus.osuosl.org (Postfix) with ESMTPS id E3F2188B3C\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 1 Jun 2017 22:40:57 +0000 (UTC)", "from fmsmga001.fm.intel.com ([10.253.24.23])\n\tby fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t01 Jun 2017 15:40:57 -0700", "from jekeller-desk.amr.corp.intel.com ([10.166.35.158])\n\tby fmsmga001.fm.intel.com with ESMTP; 01 Jun 2017 15:40:56 -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.39,281,1493708400\"; d=\"scan'208\";\n\ta=\"1155582891\"", "From": "Jacob Keller <jacob.e.keller@intel.com>", "To": "Intel Wired LAN <intel-wired-lan@lists.osuosl.org>", "Date": "Thu, 1 Jun 2017 15:40:51 -0700", "Message-Id": "<20170601224051.6106-16-jacob.e.keller@intel.com>", "X-Mailer": "git-send-email 2.13.0.311.g0339965c70d6", "In-Reply-To": "<20170601224051.6106-1-jacob.e.keller@intel.com>", "References": "<20170601224051.6106-1-jacob.e.keller@intel.com>", "Subject": "[Intel-wired-lan] [PATCH 15/15] fm10k: use the MAC/VLAN queue for\n\tVF<->PF MAC/VLAN requests", "X-BeenThere": "intel-wired-lan@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.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": "Now that we have a working MAC/VLAN queue for handling MAC/VLAN messages\nfrom the netdev, replace the default handler for the VF<->PF messages.\nThis new handler is very similar to the default code, but uses the\nMAC/VLAN queue instead of sending the message directly. Unfortunately we\ncan't easily re-use the default code, so we'll just replace the entire\nfunction.\n\nThis ensures that a VF requesting a large number of VLANs or MAC\naddresses does not start a reset cycle, as explained in the commit which\nintroduced the message queue.\n\nSigned-off-by: Jacob Keller <jacob.e.keller@intel.com>\nReviewed-by: Kwan, Ngai-mint <ngai-mint.kwan@intel.com>\n---\n drivers/net/ethernet/intel/fm10k/fm10k_iov.c | 132 ++++++++++++++++++++++++++-\n drivers/net/ethernet/intel/fm10k/fm10k_pf.c | 2 +-\n drivers/net/ethernet/intel/fm10k/fm10k_pf.h | 3 +-\n 3 files changed, 133 insertions(+), 4 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_iov.c b/drivers/net/ethernet/intel/fm10k/fm10k_iov.c\nindex 03897720bf0b..7e53521667b8 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_iov.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_iov.c\n@@ -35,10 +35,133 @@ static s32 fm10k_iov_msg_error(struct fm10k_hw *hw, u32 **results,\n \treturn fm10k_tlv_msg_error(hw, results, mbx);\n }\n \n+/**\n+ * fm10k_iov_msg_queue_mac_vlan - Message handler for MAC/VLAN request from VF\n+ * @hw: Pointer to hardware structure\n+ * @results: Pointer array to message, results[0] is pointer to message\n+ * @mbx: Pointer to mailbox information structure\n+ *\n+ * This function is a custom handler for MAC/VLAN requests from the VF. The\n+ * assumption is that it is acceptable to directly hande off the message from\n+ * the VF to the PF's switch manager. However, we use a MAC/VLAN message\n+ * queue to avoid overloading the mailbox when a large number of requests\n+ * come in.\n+ **/\n+static s32 fm10k_iov_msg_queue_mac_vlan(struct fm10k_hw *hw, u32 **results,\n+\t\t\t\t\tstruct fm10k_mbx_info *mbx)\n+{\n+\tstruct fm10k_vf_info *vf_info = (struct fm10k_vf_info *)mbx;\n+\tstruct fm10k_intfc *interface = hw->back;\n+\tu8 mac[ETH_ALEN];\n+\tu32 *result;\n+\tint err = 0;\n+\tbool set;\n+\tu16 vlan;\n+\tu32 vid;\n+\n+\t/* we shouldn't be updating rules on a disabled interface */\n+\tif (!FM10K_VF_FLAG_ENABLED(vf_info))\n+\t\terr = FM10K_ERR_PARAM;\n+\n+\tif (!err && !!results[FM10K_MAC_VLAN_MSG_VLAN]) {\n+\t\tresult = results[FM10K_MAC_VLAN_MSG_VLAN];\n+\n+\t\t/* record VLAN id requested */\n+\t\terr = fm10k_tlv_attr_get_u32(result, &vid);\n+\t\tif (err)\n+\t\t\treturn err;\n+\n+\t\tset = !(vid & FM10K_VLAN_CLEAR);\n+\t\tvid &= ~FM10K_VLAN_CLEAR;\n+\n+\t\t/* if the length field has been set, this is a multi-bit\n+\t\t * update request. For multi-bit requests, simply disallow\n+\t\t * them when the pf_vid has been set. In this case, the PF\n+\t\t * should have already cleared the VLAN_TABLE, and if we\n+\t\t * allowed them, it could allow a rogue VF to receive traffic\n+\t\t * on a VLAN it was not assigned. In the single-bit case, we\n+\t\t * need to modify requests for VLAN 0 to use the default PF or\n+\t\t * SW vid when assigned.\n+\t\t */\n+\n+\t\tif (vid >> 16) {\n+\t\t\t/* prevent multi-bit requests when PF has\n+\t\t\t * administratively set the VLAN for this VF\n+\t\t\t */\n+\t\t\tif (vf_info->pf_vid)\n+\t\t\t\treturn FM10K_ERR_PARAM;\n+\t\t} else {\n+\t\t\terr = fm10k_iov_select_vid(vf_info, (u16)vid);\n+\t\t\tif (err < 0)\n+\t\t\t\treturn err;\n+\n+\t\t\tvid = err;\n+\t\t}\n+\n+\t\t/* update VSI info for VF in regards to VLAN table */\n+\t\terr = hw->mac.ops.update_vlan(hw, vid, vf_info->vsi, set);\n+\t}\n+\n+\tif (!err && !!results[FM10K_MAC_VLAN_MSG_MAC]) {\n+\t\tresult = results[FM10K_MAC_VLAN_MSG_MAC];\n+\n+\t\t/* record unicast MAC address requested */\n+\t\terr = fm10k_tlv_attr_get_mac_vlan(result, mac, &vlan);\n+\t\tif (err)\n+\t\t\treturn err;\n+\n+\t\t/* block attempts to set MAC for a locked device */\n+\t\tif (is_valid_ether_addr(vf_info->mac) &&\n+\t\t !ether_addr_equal(mac, vf_info->mac))\n+\t\t\treturn FM10K_ERR_PARAM;\n+\n+\t\tset = !(vlan & FM10K_VLAN_CLEAR);\n+\t\tvlan &= ~FM10K_VLAN_CLEAR;\n+\n+\t\terr = fm10k_iov_select_vid(vf_info, vlan);\n+\t\tif (err < 0)\n+\t\t\treturn err;\n+\n+\t\tvlan = (u16)err;\n+\n+\t\t/* Add this request to the MAC/VLAN queue */\n+\t\terr = fm10k_queue_mac_request(interface, vf_info->glort,\n+\t\t\t\t\t mac, vlan, set);\n+\t}\n+\n+\tif (!err && !!results[FM10K_MAC_VLAN_MSG_MULTICAST]) {\n+\t\tresult = results[FM10K_MAC_VLAN_MSG_MULTICAST];\n+\n+\t\t/* record multicast MAC address requested */\n+\t\terr = fm10k_tlv_attr_get_mac_vlan(result, mac, &vlan);\n+\t\tif (err)\n+\t\t\treturn err;\n+\n+\t\t/* verify that the VF is allowed to request multicast */\n+\t\tif (!(vf_info->vf_flags & FM10K_VF_FLAG_MULTI_ENABLED))\n+\t\t\treturn FM10K_ERR_PARAM;\n+\n+\t\tset = !(vlan & FM10K_VLAN_CLEAR);\n+\t\tvlan &= ~FM10K_VLAN_CLEAR;\n+\n+\t\terr = fm10k_iov_select_vid(vf_info, vlan);\n+\t\tif (err < 0)\n+\t\t\treturn err;\n+\n+\t\tvlan = (u16)err;\n+\n+\t\t/* Add this request to the MAC/VLAN queue */\n+\t\terr = fm10k_queue_mac_request(interface, vf_info->glort,\n+\t\t\t\t\t mac, vlan, set);\n+\t}\n+\n+\treturn err;\n+}\n+\n static const struct fm10k_msg_data iov_mbx_data[] = {\n \tFM10K_TLV_MSG_TEST_HANDLER(fm10k_tlv_msg_test),\n \tFM10K_VF_MSG_MSIX_HANDLER(fm10k_iov_msg_msix_pf),\n-\tFM10K_VF_MSG_MAC_VLAN_HANDLER(fm10k_iov_msg_mac_vlan_pf),\n+\tFM10K_VF_MSG_MAC_VLAN_HANDLER(fm10k_iov_msg_queue_mac_vlan),\n \tFM10K_VF_MSG_LPORT_STATE_HANDLER(fm10k_iov_msg_lport_state_pf),\n \tFM10K_TLV_MSG_ERROR_HANDLER(fm10k_iov_msg_error),\n };\n@@ -126,8 +249,10 @@ s32 fm10k_iov_mbx(struct fm10k_intfc *interface)\n \t\thw->mbx.ops.process(hw, &hw->mbx);\n \n \t\t/* verify port mapping is valid, if not reset port */\n-\t\tif (vf_info->vf_flags && !fm10k_glort_valid_pf(hw, glort))\n+\t\tif (vf_info->vf_flags && !fm10k_glort_valid_pf(hw, glort)) {\n \t\t\thw->iov.ops.reset_lport(hw, vf_info);\n+\t\t\tfm10k_clear_macvlan_queue(interface, glort, false);\n+\t\t}\n \n \t\t/* reset VFs that have mailbox timed out */\n \t\tif (!mbx->timeout) {\n@@ -190,6 +315,7 @@ void fm10k_iov_suspend(struct pci_dev *pdev)\n \n \t\thw->iov.ops.reset_resources(hw, vf_info);\n \t\thw->iov.ops.reset_lport(hw, vf_info);\n+\t\tfm10k_clear_macvlan_queue(interface, vf_info->glort, false);\n \t}\n }\n \n@@ -414,6 +540,8 @@ static inline void fm10k_reset_vf_info(struct fm10k_intfc *interface,\n \t/* disable LPORT for this VF which clears switch rules */\n \thw->iov.ops.reset_lport(hw, vf_info);\n \n+\tfm10k_clear_macvlan_queue(interface, vf_info->glort, false);\n+\n \t/* assign new MAC+VLAN for this VF */\n \thw->iov.ops.assign_default_mac_vlan(hw, vf_info);\n \ndiff --git a/drivers/net/ethernet/intel/fm10k/fm10k_pf.c b/drivers/net/ethernet/intel/fm10k/fm10k_pf.c\nindex 9e4fb3a44376..425d814aed4d 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_pf.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_pf.c\n@@ -1186,7 +1186,7 @@ s32 fm10k_iov_msg_msix_pf(struct fm10k_hw *hw, u32 **results,\n * Will report an error if the VLAN ID is out of range. For VID = 0, it will\n * return either the pf_vid or sw_vid depending on which one is set.\n */\n-static s32 fm10k_iov_select_vid(struct fm10k_vf_info *vf_info, u16 vid)\n+s32 fm10k_iov_select_vid(struct fm10k_vf_info *vf_info, u16 vid)\n {\n \tif (!vid)\n \t\treturn vf_info->pf_vid ? vf_info->pf_vid : vf_info->sw_vid;\ndiff --git a/drivers/net/ethernet/intel/fm10k/fm10k_pf.h b/drivers/net/ethernet/intel/fm10k/fm10k_pf.h\nindex 3336d3c10760..e04d41f1a532 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_pf.h\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_pf.h\n@@ -1,5 +1,5 @@\n /* Intel(R) Ethernet Switch Host Interface Driver\n- * Copyright(c) 2013 - 2016 Intel Corporation.\n+ * Copyright(c) 2013 - 2017 Intel Corporation.\n *\n * This program is free software; you can redistribute it and/or modify it\n * under the terms and conditions of the GNU General Public License,\n@@ -114,6 +114,7 @@ extern const struct fm10k_tlv_attr fm10k_err_msg_attr[];\n #define FM10K_PF_MSG_ERR_HANDLER(msg, func) \\\n \tFM10K_MSG_HANDLER(FM10K_PF_MSG_ID_##msg, fm10k_err_msg_attr, func)\n \n+s32 fm10k_iov_select_vid(struct fm10k_vf_info *vf_info, u16 vid);\n s32 fm10k_iov_msg_msix_pf(struct fm10k_hw *, u32 **, struct fm10k_mbx_info *);\n s32 fm10k_iov_msg_mac_vlan_pf(struct fm10k_hw *, u32 **,\n \t\t\t struct fm10k_mbx_info *);\n", "prefixes": [ "15/15" ] }