Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/838020/?format=api
{ "id": 838020, "url": "http://patchwork.ozlabs.org/api/patches/838020/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20171114120052.86665-9-alice.michael@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": "<20171114120052.86665-9-alice.michael@intel.com>", "list_archive_url": null, "date": "2017-11-14T12:00:52", "name": "[next,S82-V4,9/9] i40e: restore promiscuous after reset", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "7470b129b01627c7dd0c939e44b013191d10b6eb", "submitter": { "id": 71123, "url": "http://patchwork.ozlabs.org/api/people/71123/?format=api", "name": "Michael, Alice", "email": "alice.michael@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/20171114120052.86665-9-alice.michael@intel.com/mbox/", "series": [ { "id": 13564, "url": "http://patchwork.ozlabs.org/api/series/13564/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=13564", "date": "2017-11-14T12:00:46", "name": "[next,S82-V4,1/9] i40evf: Do not clear MSI-X PBA manually", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/13564/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/838020/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/838020/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.138; helo=whitealder.osuosl.org;\n\tenvelope-from=intel-wired-lan-bounces@osuosl.org;\n\treceiver=<UNKNOWN>)", "Received": [ "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\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 3ybzVf6Pdlz9ryv\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 15 Nov 2017 07:23:54 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 4CBF686DDB;\n\tTue, 14 Nov 2017 20:23:53 +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 5GDHNyxwsON0; Tue, 14 Nov 2017 20:23:49 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id C759D86DE1;\n\tTue, 14 Nov 2017 20:23:46 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id B74371CEF5C\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 14 Nov 2017 20:07:01 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id AA2AB2CFDE\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 14 Nov 2017 20:07:01 +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 Ahs5PsO1FPvc for <intel-wired-lan@lists.osuosl.org>;\n\tTue, 14 Nov 2017 20:07:00 +0000 (UTC)", "from mga02.intel.com (mga02.intel.com [134.134.136.20])\n\tby silver.osuosl.org (Postfix) with ESMTPS id 7E3C52D275\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 14 Nov 2017 20:07:00 +0000 (UTC)", "from fmsmga001.fm.intel.com ([10.253.24.23])\n\tby orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t14 Nov 2017 12:06:59 -0800", "from unknown (HELO localhost.jf.intel.com) ([10.166.16.121])\n\tby fmsmga001.fm.intel.com with ESMTP; 14 Nov 2017 12:06:59 -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-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.44,396,1505804400\"; d=\"scan'208\";a=\"2651479\"", "From": "Alice Michael <alice.michael@intel.com>", "To": "alice.michael@intel.com,\n\tintel-wired-lan@lists.osuosl.org", "Date": "Tue, 14 Nov 2017 07:00:52 -0500", "Message-Id": "<20171114120052.86665-9-alice.michael@intel.com>", "X-Mailer": "git-send-email 2.9.5", "In-Reply-To": "<20171114120052.86665-1-alice.michael@intel.com>", "References": "<20171114120052.86665-1-alice.michael@intel.com>", "Subject": "[Intel-wired-lan] [next PATCH S82-V4 9/9] i40e: restore promiscuous\n\tafter reset", "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": "From: Alan Brady <alan.brady@intel.com>\n\nAfter a reset we rebuild the VSIs which is going to clobber any\npromiscuous settings we had before reset. This makes it so that we\nrestore the promiscuous settings we had before reset.\n\nSigned-off-by: Alan Brady <alan.brady@intel.com>\n---\nTesting-hints:\nSet promiscuous mode, force a reset (ethtool -K <iface> ntuple off/on\nshould work), check if promiscuous traffic is still received after\nreset.\n\nv2:\n- Fix whitespace on i40e_aq_str lines\n- Add error message if i40e_set_promiscuous fails after reset\n\n drivers/net/ethernet/intel/i40e/i40e_main.c | 155 +++++++++++++++-------------\n 1 file changed, 83 insertions(+), 72 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c\nindex 813f71a..906598c 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_main.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c\n@@ -2167,6 +2167,73 @@ i40e_aqc_broadcast_filter(struct i40e_vsi *vsi, const char *vsi_name,\n }\n \n /**\n+ * i40e_set_promiscuous - set promiscuous mode\n+ * @pf: board private structure\n+ * @promisc: promisc on or off\n+ *\n+ * There are different ways of setting promiscuous mode on a PF depending on\n+ * what state/environment we're in. This identifies and sets it appropriately.\n+ * Returns 0 on success.\n+ **/\n+static int i40e_set_promiscuous(struct i40e_pf *pf, bool promisc)\n+{\n+\tstruct i40e_vsi *vsi = pf->vsi[pf->lan_vsi];\n+\tstruct i40e_hw *hw = &pf->hw;\n+\ti40e_status aq_ret;\n+\n+\tif (vsi->type == I40E_VSI_MAIN &&\n+\t pf->lan_veb != I40E_NO_VEB &&\n+\t !(pf->flags & I40E_FLAG_MFP_ENABLED)) {\n+\t\t/* set defport ON for Main VSI instead of true promisc\n+\t\t * this way we will get all unicast/multicast and VLAN\n+\t\t * promisc behavior but will not get VF or VMDq traffic\n+\t\t * replicated on the Main VSI.\n+\t\t */\n+\t\tif (promisc)\n+\t\t\taq_ret = i40e_aq_set_default_vsi(hw,\n+\t\t\t\t\t\t\t vsi->seid,\n+\t\t\t\t\t\t\t NULL);\n+\t\telse\n+\t\t\taq_ret = i40e_aq_clear_default_vsi(hw,\n+\t\t\t\t\t\t\t vsi->seid,\n+\t\t\t\t\t\t\t NULL);\n+\t\tif (aq_ret) {\n+\t\t\tdev_info(&pf->pdev->dev,\n+\t\t\t\t \"Set default VSI failed, err %s, aq_err %s\\n\",\n+\t\t\t\t i40e_stat_str(hw, aq_ret),\n+\t\t\t\t i40e_aq_str(hw, hw->aq.asq_last_status));\n+\t\t}\n+\t} else {\n+\t\taq_ret = i40e_aq_set_vsi_unicast_promiscuous(\n+\t\t\t\t\t\t hw,\n+\t\t\t\t\t\t vsi->seid,\n+\t\t\t\t\t\t promisc, NULL,\n+\t\t\t\t\t\t true);\n+\t\tif (aq_ret) {\n+\t\t\tdev_info(&pf->pdev->dev,\n+\t\t\t\t \"set unicast promisc failed, err %s, aq_err %s\\n\",\n+\t\t\t\t i40e_stat_str(hw, aq_ret),\n+\t\t\t\t i40e_aq_str(hw, hw->aq.asq_last_status));\n+\t\t}\n+\t\taq_ret = i40e_aq_set_vsi_multicast_promiscuous(\n+\t\t\t\t\t\t hw,\n+\t\t\t\t\t\t vsi->seid,\n+\t\t\t\t\t\t promisc, NULL);\n+\t\tif (aq_ret) {\n+\t\t\tdev_info(&pf->pdev->dev,\n+\t\t\t\t \"set multicast promisc failed, err %s, aq_err %s\\n\",\n+\t\t\t\t i40e_stat_str(hw, aq_ret),\n+\t\t\t\t i40e_aq_str(hw, hw->aq.asq_last_status));\n+\t\t}\n+\t}\n+\n+\tif (!aq_ret)\n+\t\tpf->cur_promisc = promisc;\n+\n+\treturn aq_ret;\n+}\n+\n+/**\n * i40e_sync_vsi_filters - Update the VSI filter list to the HW\n * @vsi: ptr to the VSI\n *\n@@ -2467,81 +2534,16 @@ int i40e_sync_vsi_filters(struct i40e_vsi *vsi)\n \t\tcur_promisc = (!!(vsi->current_netdev_flags & IFF_PROMISC) ||\n \t\t\t test_bit(__I40E_VSI_OVERFLOW_PROMISC,\n \t\t\t\t\tvsi->state));\n-\t\tif ((vsi->type == I40E_VSI_MAIN) &&\n-\t\t (pf->lan_veb != I40E_NO_VEB) &&\n-\t\t !(pf->flags & I40E_FLAG_MFP_ENABLED)) {\n-\t\t\t/* set defport ON for Main VSI instead of true promisc\n-\t\t\t * this way we will get all unicast/multicast and VLAN\n-\t\t\t * promisc behavior but will not get VF or VMDq traffic\n-\t\t\t * replicated on the Main VSI.\n-\t\t\t */\n-\t\t\tif (pf->cur_promisc != cur_promisc) {\n-\t\t\t\tpf->cur_promisc = cur_promisc;\n-\t\t\t\tif (cur_promisc)\n-\t\t\t\t\taq_ret =\n-\t\t\t\t\t i40e_aq_set_default_vsi(hw,\n-\t\t\t\t\t\t\t\t vsi->seid,\n-\t\t\t\t\t\t\t\t NULL);\n-\t\t\t\telse\n-\t\t\t\t\taq_ret =\n-\t\t\t\t\t i40e_aq_clear_default_vsi(hw,\n-\t\t\t\t\t\t\t\t vsi->seid,\n-\t\t\t\t\t\t\t\t NULL);\n-\t\t\t\tif (aq_ret) {\n-\t\t\t\t\tretval = i40e_aq_rc_to_posix(aq_ret,\n-\t\t\t\t\t\t\thw->aq.asq_last_status);\n-\t\t\t\t\tdev_info(&pf->pdev->dev,\n-\t\t\t\t\t\t \"Set default VSI failed on %s, err %s, aq_err %s\\n\",\n-\t\t\t\t\t\t vsi_name,\n-\t\t\t\t\t\t i40e_stat_str(hw, aq_ret),\n-\t\t\t\t\t\t i40e_aq_str(hw,\n-\t\t\t\t\t\t hw->aq.asq_last_status));\n-\t\t\t\t}\n-\t\t\t}\n-\t\t} else {\n-\t\t\taq_ret = i40e_aq_set_vsi_unicast_promiscuous(\n-\t\t\t\t\t\t\t hw,\n-\t\t\t\t\t\t\t vsi->seid,\n-\t\t\t\t\t\t\t cur_promisc, NULL,\n-\t\t\t\t\t\t\t true);\n-\t\t\tif (aq_ret) {\n-\t\t\t\tretval =\n-\t\t\t\ti40e_aq_rc_to_posix(aq_ret,\n-\t\t\t\t\t\t hw->aq.asq_last_status);\n-\t\t\t\tdev_info(&pf->pdev->dev,\n-\t\t\t\t\t \"set unicast promisc failed on %s, err %s, aq_err %s\\n\",\n-\t\t\t\t\t vsi_name,\n-\t\t\t\t\t i40e_stat_str(hw, aq_ret),\n-\t\t\t\t\t i40e_aq_str(hw,\n-\t\t\t\t\t\t hw->aq.asq_last_status));\n-\t\t\t}\n-\t\t\taq_ret = i40e_aq_set_vsi_multicast_promiscuous(\n-\t\t\t\t\t\t\t hw,\n-\t\t\t\t\t\t\t vsi->seid,\n-\t\t\t\t\t\t\t cur_promisc, NULL);\n-\t\t\tif (aq_ret) {\n-\t\t\t\tretval =\n-\t\t\t\ti40e_aq_rc_to_posix(aq_ret,\n-\t\t\t\t\t\t hw->aq.asq_last_status);\n-\t\t\t\tdev_info(&pf->pdev->dev,\n-\t\t\t\t\t \"set multicast promisc failed on %s, err %s, aq_err %s\\n\",\n-\t\t\t\t\t vsi_name,\n-\t\t\t\t\t i40e_stat_str(hw, aq_ret),\n-\t\t\t\t\t i40e_aq_str(hw,\n-\t\t\t\t\t\t hw->aq.asq_last_status));\n-\t\t\t}\n-\t\t}\n-\t\taq_ret = i40e_aq_set_vsi_broadcast(&vsi->back->hw,\n-\t\t\t\t\t\t vsi->seid,\n-\t\t\t\t\t\t cur_promisc, NULL);\n+\t\taq_ret = i40e_set_promiscuous(pf, cur_promisc);\n \t\tif (aq_ret) {\n \t\t\tretval = i40e_aq_rc_to_posix(aq_ret,\n-\t\t\t\t\t\t pf->hw.aq.asq_last_status);\n+\t\t\t\t\t\t hw->aq.asq_last_status);\n \t\t\tdev_info(&pf->pdev->dev,\n-\t\t\t\t \"set brdcast promisc failed, err %s, aq_err %s\\n\",\n-\t\t\t\t\t i40e_stat_str(hw, aq_ret),\n-\t\t\t\t\t i40e_aq_str(hw,\n-\t\t\t\t\t\t hw->aq.asq_last_status));\n+\t\t\t\t \"Setting promiscuous %s failed on %s, err %s aq_err %s\\n\",\n+\t\t\t\t cur_promisc ? \"on\" : \"off\",\n+\t\t\t\t vsi_name,\n+\t\t\t\t i40e_stat_str(hw, aq_ret),\n+\t\t\t\t i40e_aq_str(hw, hw->aq.asq_last_status));\n \t\t}\n \t}\n out:\n@@ -9500,6 +9502,15 @@ static void i40e_rebuild(struct i40e_pf *pf, bool reinit, bool lock_acquired)\n \tif (!lock_acquired)\n \t\trtnl_unlock();\n \n+\t/* Restore promiscuous settings */\n+\tret = i40e_set_promiscuous(pf, pf->cur_promisc);\n+\tif (ret)\n+\t\tdev_warn(&pf->pdev->dev,\n+\t\t\t \"Failed to restore promiscuous setting: %s, err %s aq_err %s\\n\",\n+\t\t\t pf->cur_promisc ? \"on\" : \"off\",\n+\t\t\t i40e_stat_str(&pf->hw, ret),\n+\t\t\t i40e_aq_str(&pf->hw, pf->hw.aq.asq_last_status));\n+\n \ti40e_reset_all_vfs(pf, true);\n \n \t/* tell the firmware that we're starting */\n", "prefixes": [ "next", "S82-V4", "9/9" ] }