Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1285689/?format=api
{ "id": 1285689, "url": "http://patchwork.ozlabs.org/api/patches/1285689/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20200508004113.39725-5-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": "<20200508004113.39725-5-anthony.l.nguyen@intel.com>", "list_archive_url": null, "date": "2020-05-08T00:41:03", "name": "[S41,05/15] ice: Fix probe/open race condition", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "145a495a8a45ffc7b83774546b441b0029058abc", "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/20200508004113.39725-5-anthony.l.nguyen@intel.com/mbox/", "series": [ { "id": 175527, "url": "http://patchwork.ozlabs.org/api/series/175527/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=175527", "date": "2020-05-08T00:41:10", "name": "[S41,01/15] ice: Add VF promiscuous support", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/175527/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1285689/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1285689/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 spf=pass (sender SPF authorized) smtp.mailfrom=osuosl.org\n (client-ip=140.211.166.137; helo=fraxinus.osuosl.org;\n envelope-from=intel-wired-lan-bounces@osuosl.org; receiver=<UNKNOWN>)", "ozlabs.org;\n dmarc=fail (p=none dis=none) header.from=intel.com" ], "Received": [ "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 49JBQm3Y5xz9sSG\n\tfor <incoming@patchwork.ozlabs.org>; Fri, 8 May 2020 10:43:44 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id AAA8087A65;\n\tFri, 8 May 2020 00:43:42 +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 AVhhtZtvspRS; Fri, 8 May 2020 00:43:37 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 9F03E870E3;\n\tFri, 8 May 2020 00:43:37 +0000 (UTC)", "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n by ash.osuosl.org (Postfix) with ESMTP id B9CE81BF2C4\n for <intel-wired-lan@lists.osuosl.org>; Fri, 8 May 2020 00:43:35 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n by whitealder.osuosl.org (Postfix) with ESMTP id B726987B49\n for <intel-wired-lan@lists.osuosl.org>; Fri, 8 May 2020 00:43:35 +0000 (UTC)", "from whitealder.osuosl.org ([127.0.0.1])\n by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n with ESMTP id z4lhgW+32V9C for <intel-wired-lan@lists.osuosl.org>;\n Fri, 8 May 2020 00:43:34 +0000 (UTC)", "from mga04.intel.com (mga04.intel.com [192.55.52.120])\n by whitealder.osuosl.org (Postfix) with ESMTPS id A6D40878A6\n for <intel-wired-lan@lists.osuosl.org>; Fri, 8 May 2020 00:43:34 +0000 (UTC)", "from orsmga007.jf.intel.com ([10.7.209.58])\n by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 07 May 2020 17:43:33 -0700", "from unknown (HELO localhost.jf.intel.com) ([10.166.241.65])\n by orsmga007.jf.intel.com with ESMTP; 07 May 2020 17:43:33 -0700" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "IronPort-SDR": [ "\n wQJwx2jVECscFVWESXuVRu639obfNUw8JaigTqeSedZ2eUjgWLO8VV/j7z6dtXnIUWfzzua/aq\n Iedyqrz4q1yA==", "\n Tds5I+yZLAUnRG3/ND24jpe4sxOdZ/Fgjnnc4p/9rmppaLbwYSS+V/fexi3hAr7zImqjqcbkC5\n 1mwWzIj8oWpg==" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.73,365,1583222400\"; d=\"scan'208\";a=\"249468770\"", "From": "Tony Nguyen <anthony.l.nguyen@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Thu, 7 May 2020 17:41:03 -0700", "Message-Id": "<20200508004113.39725-5-anthony.l.nguyen@intel.com>", "X-Mailer": "git-send-email 2.20.1", "In-Reply-To": "<20200508004113.39725-1-anthony.l.nguyen@intel.com>", "References": "<20200508004113.39725-1-anthony.l.nguyen@intel.com>", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [PATCH S41 05/15] ice: Fix probe/open race\n condition", "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 <intel-wired-lan.osuosl.org>", "List-Unsubscribe": "<https://lists.osuosl.org/mailman/options/intel-wired-lan>,\n <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 <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: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>\n\nAs soon as the driver registers the PF netdev, userspace utilities\nlike NetworkManager try to bring up the associated interface. When\nthis happens, the driver may not have finished initializing fully,\nresulting in a bunch of errors in the interface up flow.\n\nThe driver already has a mechanism to indicate if it's not up yet;\nby setting the __ICE_DOWN bit in pf->state, but this bit gets\ncleared too early in the current flow. So clear this bit only when\nthe driver is fully up. Also check for the same bit in the ice_open\nflow, and return -EBUSY if the bit is set.\n\nAlso in ice_open, replace references of vsi->back with a local\nvariable.\n\nSigned-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>\nSigned-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>\n---\n drivers/net/ethernet/intel/ice/ice_main.c | 24 +++++++++++++----------\n 1 file changed, 14 insertions(+), 10 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c\nindex 2128238a0f6d..f6c2dd55553f 100644\n--- a/drivers/net/ethernet/intel/ice/ice_main.c\n+++ b/drivers/net/ethernet/intel/ice/ice_main.c\n@@ -2144,10 +2144,8 @@ static irqreturn_t ice_misc_intr(int __always_unused irq, void *data)\n \t}\n \tret = IRQ_HANDLED;\n \n-\tif (!test_bit(__ICE_DOWN, pf->state)) {\n-\t\tice_service_task_schedule(pf);\n-\t\tice_irq_dynamic_ena(hw, NULL, NULL);\n-\t}\n+\tice_service_task_schedule(pf);\n+\tice_irq_dynamic_ena(hw, NULL, NULL);\n \n \treturn ret;\n }\n@@ -3339,9 +3337,6 @@ ice_probe(struct pci_dev *pdev, const struct pci_device_id __always_unused *ent)\n \t\tgoto err_init_interrupt_unroll;\n \t}\n \n-\t/* Driver is mostly up */\n-\tclear_bit(__ICE_DOWN, pf->state);\n-\n \t/* In case of MSIX we are going to setup the misc vector right here\n \t * to handle admin queue events etc. In case of legacy and MSI\n \t * the misc functionality and queue processing is combined in\n@@ -3397,9 +3392,9 @@ ice_probe(struct pci_dev *pdev, const struct pci_device_id __always_unused *ent)\n \n \tice_verify_cacheline_size(pf);\n \n-\t/* If no DDP driven features have to be setup, return here */\n+\t/* If no DDP driven features have to be setup, we are done with probe */\n \tif (ice_is_safe_mode(pf))\n-\t\treturn 0;\n+\t\tgoto probe_done;\n \n \t/* initialize DDP driven features */\n \n@@ -3434,6 +3429,9 @@ ice_probe(struct pci_dev *pdev, const struct pci_device_id __always_unused *ent)\n \t/* print PCI link speed and width */\n \tpcie_print_link_status(pf->pdev);\n \n+probe_done:\n+\t/* ready to go, so clear down state bit */\n+\tclear_bit(__ICE_DOWN, pf->state);\n \treturn 0;\n \n err_init_peer_unroll:\n@@ -5348,14 +5346,20 @@ int ice_open(struct net_device *netdev)\n {\n \tstruct ice_netdev_priv *np = netdev_priv(netdev);\n \tstruct ice_vsi *vsi = np->vsi;\n+\tstruct ice_pf *pf = vsi->back;\n \tstruct ice_port_info *pi;\n \tint err;\n \n-\tif (test_bit(__ICE_NEEDS_RESTART, vsi->back->state)) {\n+\tif (test_bit(__ICE_NEEDS_RESTART, pf->state)) {\n \t\tnetdev_err(netdev, \"driver needs to be unloaded and reloaded\\n\");\n \t\treturn -EIO;\n \t}\n \n+\tif (test_bit(__ICE_DOWN, pf->state)) {\n+\t\tnetdev_err(netdev, \"device is not ready yet\\n\");\n+\t\treturn -EBUSY;\n+\t}\n+\n \tnetif_carrier_off(netdev);\n \n \tpi = vsi->port_info;\n", "prefixes": [ "S41", "05/15" ] }