Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1090459/?format=api
{ "id": 1090459, "url": "http://patchwork.ozlabs.org/api/patches/1090459/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20190424122055.27896-10-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": "<20190424122055.27896-10-alice.michael@intel.com>", "list_archive_url": null, "date": "2019-04-24T12:20:55", "name": "[next,S5,10/10] i40e: Missing response checks in driver when starting/stopping FW LLDP", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "b8a2e530674355a7d4361ac6ebe5fd1e32e869fc", "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/20190424122055.27896-10-alice.michael@intel.com/mbox/", "series": [ { "id": 104485, "url": "http://patchwork.ozlabs.org/api/series/104485/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=104485", "date": "2019-04-24T12:20:48", "name": "[next,S5,01/10] i40e: let untrusted VF to create up to 16 VLANs", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/104485/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1090459/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1090459/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 44qBv35L6Wz9s00\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 25 Apr 2019 06:37:03 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 2D8EE87D6C;\n\tWed, 24 Apr 2019 20:37:02 +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 NFqF+RthbTvC; Wed, 24 Apr 2019 20:37:00 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 2EF6387D56;\n\tWed, 24 Apr 2019 20:37:00 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id 58B951BF3C0\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 24 Apr 2019 20:36:57 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 55E392277A\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 24 Apr 2019 20:36:57 +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 AJVtzBoxpQ56 for <intel-wired-lan@lists.osuosl.org>;\n\tWed, 24 Apr 2019 20:36:56 +0000 (UTC)", "from mga01.intel.com (mga01.intel.com [192.55.52.88])\n\tby silver.osuosl.org (Postfix) with ESMTPS id 11D0030A33\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 24 Apr 2019 20:36:56 +0000 (UTC)", "from fmsmga002.fm.intel.com ([10.253.24.26])\n\tby fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t24 Apr 2019 13:36:56 -0700", "from alicemic-2.jf.intel.com ([10.166.16.121])\n\tby fmsmga002.fm.intel.com with ESMTP; 24 Apr 2019 13:36:55 -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.60,390,1549958400\"; d=\"scan'208\";a=\"164544031\"", "From": "Alice Michael <alice.michael@intel.com>", "To": "alice.michael@intel.com,\n\tintel-wired-lan@lists.osuosl.org", "Date": "Wed, 24 Apr 2019 05:20:55 -0700", "Message-Id": "<20190424122055.27896-10-alice.michael@intel.com>", "X-Mailer": "git-send-email 2.19.2", "In-Reply-To": "<20190424122055.27896-1-alice.michael@intel.com>", "References": "<20190424122055.27896-1-alice.michael@intel.com>", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [next PATCH S5 10/10] i40e: Missing response\n\tchecks in driver when starting/stopping FW LLDP", "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>", "Cc": "Aleksandr Loktionov <aleksandr.loktionov@intel.com>", "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: Aleksandr Loktionov <aleksandr.loktionov@intel.com>\n\nDriver updated pf->flags before calling i40e_aq_start_lldp().\nThis patch moved down updating pf->flags down so flags will be\nupdated only in case of successful i40e_aq_start_lldp() call.\nAlso was introduced is_reset_needed local flag to avoid unnecessary h/w\nreset in case 40e_aq_start_lldp() didn't change lldp state.\n\nSigned-off-by: Aleksandr Loktionov <aleksandr.loktionov@intel.com>\n---\n .../net/ethernet/intel/i40e/i40e_ethtool.c | 45 ++++++++++---------\n 1 file changed, 24 insertions(+), 21 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\nindex 0837c6b3e15e..bc70b0d581a1 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\n@@ -4856,6 +4856,7 @@ static int i40e_set_priv_flags(struct net_device *dev, u32 flags)\n \tenum i40e_admin_queue_err adq_err;\n \tstruct i40e_vsi *vsi = np->vsi;\n \tstruct i40e_pf *pf = vsi->back;\n+\tbool is_reset_needed;\n \ti40e_status status;\n \tu32 i, j;\n \n@@ -4900,6 +4901,10 @@ static int i40e_set_priv_flags(struct net_device *dev, u32 flags)\n flags_complete:\n \tchanged_flags = orig_flags ^ new_flags;\n \n+\tis_reset_needed = !!(changed_flags & (I40E_FLAG_VEB_STATS_ENABLED |\n+\t\tI40E_FLAG_LEGACY_RX | I40E_FLAG_SOURCE_PRUNING_DISABLED |\n+\t\tI40E_FLAG_DISABLE_FW_LLDP));\n+\n \t/* Before we finalize any flag changes, we need to perform some\n \t * checks to ensure that the changes are supported and safe.\n \t */\n@@ -4934,13 +4939,6 @@ static int i40e_set_priv_flags(struct net_device *dev, u32 flags)\n \t\treturn -EOPNOTSUPP;\n \t}\n \n-\t/* Now that we've checked to ensure that the new flags are valid, load\n-\t * them into place. Since we only modify flags either (a) during\n-\t * initialization or (b) while holding the RTNL lock, we don't need\n-\t * anything fancy here.\n-\t */\n-\tpf->flags = new_flags;\n-\n \t/* Process any additional changes needed as a result of flag changes.\n \t * The changed_flags value reflects the list of bits that were\n \t * changed in the code above.\n@@ -4948,7 +4946,7 @@ static int i40e_set_priv_flags(struct net_device *dev, u32 flags)\n \n \t/* Flush current ATR settings if ATR was disabled */\n \tif ((changed_flags & I40E_FLAG_FD_ATR_ENABLED) &&\n-\t !(pf->flags & I40E_FLAG_FD_ATR_ENABLED)) {\n+\t !(new_flags & I40E_FLAG_FD_ATR_ENABLED)) {\n \t\tset_bit(__I40E_FD_ATR_AUTO_DISABLED, pf->state);\n \t\tset_bit(__I40E_FD_FLUSH_REQUESTED, pf->state);\n \t}\n@@ -4957,7 +4955,7 @@ static int i40e_set_priv_flags(struct net_device *dev, u32 flags)\n \t\tu16 sw_flags = 0, valid_flags = 0;\n \t\tint ret;\n \n-\t\tif (!(pf->flags & I40E_FLAG_TRUE_PROMISC_SUPPORT))\n+\t\tif (!(new_flags & I40E_FLAG_TRUE_PROMISC_SUPPORT))\n \t\t\tsw_flags = I40E_AQ_SET_SWITCH_CFG_PROMISC;\n \t\tvalid_flags = I40E_AQ_SET_SWITCH_CFG_PROMISC;\n \t\tret = i40e_aq_set_switch_config(&pf->hw, sw_flags, valid_flags,\n@@ -4976,13 +4974,13 @@ static int i40e_set_priv_flags(struct net_device *dev, u32 flags)\n \t (changed_flags & I40E_FLAG_BASE_R_FEC)) {\n \t\tu8 fec_cfg = 0;\n \n-\t\tif (pf->flags & I40E_FLAG_RS_FEC &&\n-\t\t pf->flags & I40E_FLAG_BASE_R_FEC) {\n+\t\tif (new_flags & I40E_FLAG_RS_FEC &&\n+\t\t new_flags & I40E_FLAG_BASE_R_FEC) {\n \t\t\tfec_cfg = I40E_AQ_SET_FEC_AUTO;\n-\t\t} else if (pf->flags & I40E_FLAG_RS_FEC) {\n+\t\t} else if (new_flags & I40E_FLAG_RS_FEC) {\n \t\t\tfec_cfg = (I40E_AQ_SET_FEC_REQUEST_RS |\n \t\t\t\t I40E_AQ_SET_FEC_ABILITY_RS);\n-\t\t} else if (pf->flags & I40E_FLAG_BASE_R_FEC) {\n+\t\t} else if (new_flags & I40E_FLAG_BASE_R_FEC) {\n \t\t\tfec_cfg = (I40E_AQ_SET_FEC_REQUEST_KR |\n \t\t\t\t I40E_AQ_SET_FEC_ABILITY_KR);\n \t\t}\n@@ -4990,14 +4988,14 @@ static int i40e_set_priv_flags(struct net_device *dev, u32 flags)\n \t\t\tdev_warn(&pf->pdev->dev, \"Cannot change FEC config\\n\");\n \t}\n \n-\tif ((changed_flags & pf->flags &\n+\tif ((changed_flags & new_flags &\n \t I40E_FLAG_LINK_DOWN_ON_CLOSE_ENABLED) &&\n-\t (pf->flags & I40E_FLAG_MFP_ENABLED))\n+\t (new_flags & I40E_FLAG_MFP_ENABLED))\n \t\tdev_warn(&pf->pdev->dev,\n \t\t\t \"Turning on link-down-on-close flag may affect other partitions\\n\");\n \n \tif (changed_flags & I40E_FLAG_DISABLE_FW_LLDP) {\n-\t\tif (pf->flags & I40E_FLAG_DISABLE_FW_LLDP) {\n+\t\tif (new_flags & I40E_FLAG_DISABLE_FW_LLDP) {\n \t\t\tstruct i40e_dcbx_config *dcbcfg;\n \n \t\t\ti40e_aq_stop_lldp(&pf->hw, true, false, NULL);\n@@ -5022,7 +5020,8 @@ static int i40e_set_priv_flags(struct net_device *dev, u32 flags)\n \t\t\t\tcase I40E_AQ_RC_EEXIST:\n \t\t\t\t\tdev_warn(&pf->pdev->dev,\n \t\t\t\t\t\t \"FW LLDP agent is already running\\n\");\n-\t\t\t\t\treturn 0;\n+\t\t\t\t\tis_reset_needed = false;\n+\t\t\t\t\tbreak;\n \t\t\t\tcase I40E_AQ_RC_EPERM:\n \t\t\t\t\tdev_warn(&pf->pdev->dev,\n \t\t\t\t\t\t \"Device configuration forbids SW from starting the LLDP agent.\\n\");\n@@ -5040,13 +5039,17 @@ static int i40e_set_priv_flags(struct net_device *dev, u32 flags)\n \t\t}\n \t}\n \n+\t/* Now that we've checked to ensure that the new flags are valid, load\n+\t * them into place. Since we only modify flags either (a) during\n+\t * initialization or (b) while holding the RTNL lock, we don't need\n+\t * anything fancy here.\n+\t */\n+\tpf->flags = new_flags;\n+\n \t/* Issue reset to cause things to take effect, as additional bits\n \t * are added we will need to create a mask of bits requiring reset\n \t */\n-\tif (changed_flags & (I40E_FLAG_VEB_STATS_ENABLED |\n-\t\t\t I40E_FLAG_LEGACY_RX |\n-\t\t\t I40E_FLAG_SOURCE_PRUNING_DISABLED |\n-\t\t\t I40E_FLAG_DISABLE_FW_LLDP))\n+\tif (is_reset_needed)\n \t\ti40e_do_reset(pf, BIT(__I40E_PF_RESET_REQUESTED), true);\n \n \treturn 0;\n", "prefixes": [ "next", "S5", "10/10" ] }