Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/788803/?format=api
{ "id": 788803, "url": "http://patchwork.ozlabs.org/api/patches/788803/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20170714132709.52657-3-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": "<20170714132709.52657-3-alice.michael@intel.com>", "list_archive_url": null, "date": "2017-07-14T13:27:02", "name": "[next,S77-V3,03/10] i40e: use separate state bit for miscellaneous IRQ setup", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "2739e8b0f82636602390e83295f9c6783932da12", "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/20170714132709.52657-3-alice.michael@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/788803/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/788803/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 hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\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 3x8QqN4H35z9s7F\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat, 15 Jul 2017 07:31:28 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id CAA578A438;\n\tFri, 14 Jul 2017 21:31:26 +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 1uJIEySo-gNe; Fri, 14 Jul 2017 21:31:24 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 1A15B8A433;\n\tFri, 14 Jul 2017 21:31:24 +0000 (UTC)", "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\tby ash.osuosl.org (Postfix) with ESMTP id EDEED1CE81B\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 14 Jul 2017 21:31:19 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id E73C78A420\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 14 Jul 2017 21:31:19 +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 DU8VDXmIO292 for <intel-wired-lan@lists.osuosl.org>;\n\tFri, 14 Jul 2017 21:31:16 +0000 (UTC)", "from mga07.intel.com (mga07.intel.com [134.134.136.100])\n\tby hemlock.osuosl.org (Postfix) with ESMTPS id DA95F8A41F\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 14 Jul 2017 21:31:16 +0000 (UTC)", "from orsmga005.jf.intel.com ([10.7.209.41])\n\tby orsmga105.jf.intel.com with ESMTP; 14 Jul 2017 14:31:16 -0700", "from unknown (HELO localhost.jf.intel.com) ([10.166.16.121])\n\tby orsmga005.jf.intel.com with ESMTP; 14 Jul 2017 14:31:16 -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.40,360,1496127600\"; d=\"scan'208\";a=\"125288623\"", "From": "Alice Michael <alice.michael@intel.com>", "To": "alice.michael@intel.com,\n\tintel-wired-lan@lists.osuosl.org", "Date": "Fri, 14 Jul 2017 09:27:02 -0400", "Message-Id": "<20170714132709.52657-3-alice.michael@intel.com>", "X-Mailer": "git-send-email 2.9.3", "In-Reply-To": "<20170714132709.52657-1-alice.michael@intel.com>", "References": "<20170714132709.52657-1-alice.michael@intel.com>", "Subject": "[Intel-wired-lan] [next PATCH S77-V3 03/10] i40e: use separate\n\tstate bit for miscellaneous IRQ setup", "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": "From: Jacob Keller <jacob.e.keller@intel.com>\n\nWe currently (mis)use the __I40E_RECOVERY_PENDING bit to determine when\nwe should actually request a new IRQ in i40e_setup_misc_vector().\n\nThis led to a design mistake where we open-coded the re-setup of the\nmiscellaneous vector in i40e_resume() instead of using the function\nprovided. If we did not open-code this and instead tried to use the\ni40e_setup_misc_vector() function, it would lead to never reallocating\nthe IRQ.\n\nThis would lead to a second i40e_suspend() call failing to free the\nvector due to a NULL pointer dereference.\n\nA future patch is going to re-work how the i40e_suspend() and\ni40e_resume() flows work to clear all IRQ vectors, which would require\nus to use i40e_setup_misc_vector() directly. Since during this time the\n__I40E_RECOVERY_PENDING bit is set, we'll never re-allocate the vector.\n\nRather than leaving the open-coded setup in i40e_resume() lets just fix\nthe problem properly in i40e_setup_misc_vector().\n\nIntroduce a new state bit which indicates when the IRQ has been\nassigned, which will be set when i40e_setup_misc_vector is first called.\nThis ultimately resolves the issue of re-requesting the vector, without\noverloading the __I40E_RECOVERY_PENDING state. This ensures that the\nsuspend/resume cycle can use the setup function instead of open-coding\nthe re-request during resume.\n\nAdditionally, since the only callers of i40e_stop_misc_vector also want\nto free it, move this code directly into the function to avoid\nduplication. Due to the new functionality, rename it to\ni40e_free_misc_vector().\n\nThis lets us drop the extra calls to free and re-enable the vector\nduring i40e_suspend() and i40e_resume(). We don't need to call\ni40e_setup_misc_Vector() in i40e_resume() because it gets called by the\ni40e_rebuild() call.\n\nSigned-off-by: Jacob Keller <jacob.e.keller@intel.com>\n---\n drivers/net/ethernet/intel/i40e/i40e.h | 1 +\n drivers/net/ethernet/intel/i40e/i40e_main.c | 39 +++++++++++------------------\n 2 files changed, 15 insertions(+), 25 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h\nindex 5f75e67..2f1f65e 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e.h\n@@ -136,6 +136,7 @@ enum i40e_state_t {\n \t__I40E_MDD_EVENT_PENDING,\n \t__I40E_VFLR_EVENT_PENDING,\n \t__I40E_RESET_RECOVERY_PENDING,\n+\t__I40E_MISC_IRQ_REQUESTED,\n \t__I40E_RESET_INTR_RECEIVED,\n \t__I40E_REINIT_REQUESTED,\n \t__I40E_PF_RESET_REQUESTED,\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c\nindex 43ed431..c41815f 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_main.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c\n@@ -3605,14 +3605,20 @@ static int i40e_vsi_enable_irq(struct i40e_vsi *vsi)\n }\n \n /**\n- * i40e_stop_misc_vector - Stop the vector that handles non-queue events\n+ * i40e_free_misc_vector - Free the vector that handles non-queue events\n * @pf: board private structure\n **/\n-static void i40e_stop_misc_vector(struct i40e_pf *pf)\n+static void i40e_free_misc_vector(struct i40e_pf *pf)\n {\n \t/* Disable ICR 0 */\n \twr32(&pf->hw, I40E_PFINT_ICR0_ENA, 0);\n \ti40e_flush(&pf->hw);\n+\n+\tif (pf->flags & I40E_FLAG_MSIX_ENABLED && pf->msix_entries) {\n+\t\tsynchronize_irq(pf->msix_entries[0].vector);\n+\t\tfree_irq(pf->msix_entries[0].vector, pf);\n+\t\tclear_bit(__I40E_MISC_IRQ_REQUESTED, pf->state);\n+\t}\n }\n \n /**\n@@ -4467,11 +4473,7 @@ static void i40e_clear_interrupt_scheme(struct i40e_pf *pf)\n {\n \tint i;\n \n-\ti40e_stop_misc_vector(pf);\n-\tif (pf->flags & I40E_FLAG_MSIX_ENABLED && pf->msix_entries) {\n-\t\tsynchronize_irq(pf->msix_entries[0].vector);\n-\t\tfree_irq(pf->msix_entries[0].vector, pf);\n-\t}\n+\ti40e_free_misc_vector(pf);\n \n \ti40e_put_lump(pf->irq_pile, pf->iwarp_base_vector,\n \t\t I40E_IWARP_IRQ_PILE_ID);\n@@ -8351,13 +8353,12 @@ static int i40e_setup_misc_vector(struct i40e_pf *pf)\n \tstruct i40e_hw *hw = &pf->hw;\n \tint err = 0;\n \n-\t/* Only request the irq if this is the first time through, and\n-\t * not when we're rebuilding after a Reset\n-\t */\n-\tif (!test_bit(__I40E_RESET_RECOVERY_PENDING, pf->state)) {\n+\t/* Only request the IRQ once, the first time through. */\n+\tif (!test_and_set_bit(__I40E_MISC_IRQ_REQUESTED, pf->state)) {\n \t\terr = request_irq(pf->msix_entries[0].vector,\n \t\t\t\t i40e_intr, 0, pf->int_name, pf);\n \t\tif (err) {\n+\t\t\tclear_bit(__I40E_MISC_IRQ_REQUESTED, pf->state);\n \t\t\tdev_info(&pf->pdev->dev,\n \t\t\t\t \"request_irq for %s failed: %d\\n\",\n \t\t\t\t pf->int_name, err);\n@@ -12055,11 +12056,8 @@ static int i40e_suspend(struct pci_dev *pdev, pm_message_t state)\n \twr32(hw, I40E_PFPM_APM, (pf->wol_en ? I40E_PFPM_APM_APME_MASK : 0));\n \twr32(hw, I40E_PFPM_WUFC, (pf->wol_en ? I40E_PFPM_WUFC_MAG_MASK : 0));\n \n-\ti40e_stop_misc_vector(pf);\n-\tif (pf->msix_entries) {\n-\t\tsynchronize_irq(pf->msix_entries[0].vector);\n-\t\tfree_irq(pf->msix_entries[0].vector, pf);\n-\t}\n+\ti40e_free_misc_vector(pf);\n+\n \tretval = pci_save_state(pdev);\n \tif (retval)\n \t\treturn retval;\n@@ -12099,15 +12097,6 @@ static int i40e_resume(struct pci_dev *pdev)\n \t/* handling the reset will rebuild the device state */\n \tif (test_and_clear_bit(__I40E_SUSPENDED, pf->state)) {\n \t\tclear_bit(__I40E_DOWN, pf->state);\n-\t\tif (pf->msix_entries) {\n-\t\t\terr = request_irq(pf->msix_entries[0].vector,\n-\t\t\t\t\t i40e_intr, 0, pf->int_name, pf);\n-\t\t\tif (err) {\n-\t\t\t\tdev_err(&pf->pdev->dev,\n-\t\t\t\t\t\"request_irq for %s failed: %d\\n\",\n-\t\t\t\t\tpf->int_name, err);\n-\t\t\t}\n-\t\t}\n \t\ti40e_reset_and_rebuild(pf, false, false);\n \t}\n \n", "prefixes": [ "next", "S77-V3", "03/10" ] }