Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/596418/?format=api
{ "id": 596418, "url": "http://patchwork.ozlabs.org/api/patches/596418/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1457718752-8678-2-git-send-email-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": "<1457718752-8678-2-git-send-email-jacob.e.keller@intel.com>", "list_archive_url": null, "date": "2016-03-11T17:52:32", "name": "[v2] fm10k: prevent RCU issues during AER events", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "250115e207298e45e63788e7438790a81439078b", "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/1457718752-8678-2-git-send-email-jacob.e.keller@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/596418/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/596418/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<intel-wired-lan-bounces@lists.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\tby ozlabs.org (Postfix) with ESMTP id C6DCE140773\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat, 12 Mar 2016 04:52:39 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 2102B95E9B;\n\tFri, 11 Mar 2016 17:52:39 +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 uOSpomEJBa0p; Fri, 11 Mar 2016 17:52:38 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 8CEA395E92;\n\tFri, 11 Mar 2016 17:52:38 +0000 (UTC)", "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\tby ash.osuosl.org (Postfix) with ESMTP id BE35E1C1E7D\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 11 Mar 2016 17:52:36 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id BB4E8A6295\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 11 Mar 2016 17:52:36 +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 oCeXicIYK4_K for <intel-wired-lan@lists.osuosl.org>;\n\tFri, 11 Mar 2016 17:52:36 +0000 (UTC)", "from mga01.intel.com (mga01.intel.com [192.55.52.88])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 354DAA6298\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 11 Mar 2016 17:52:36 +0000 (UTC)", "from fmsmga002.fm.intel.com ([10.253.24.26])\n\tby fmsmga101.fm.intel.com with ESMTP; 11 Mar 2016 09:52:35 -0800", "from jekeller-desk.amr.corp.intel.com (HELO\n\tjekeller-desk.jekeller.internal) ([134.134.3.75])\n\tby fmsmga002.fm.intel.com with ESMTP; 11 Mar 2016 09:52:36 -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.24,321,1455004800\"; d=\"scan'208\";a=\"934841458\"", "From": "Jacob Keller <jacob.e.keller@intel.com>", "To": "Intel Wired LAN <intel-wired-lan@lists.osuosl.org>", "Date": "Fri, 11 Mar 2016 09:52:32 -0800", "Message-Id": "<1457718752-8678-2-git-send-email-jacob.e.keller@intel.com>", "X-Mailer": "git-send-email 2.8.0.rc1.177.g5628860", "In-Reply-To": "<1457718752-8678-1-git-send-email-jacob.e.keller@intel.com>", "References": "<1457718752-8678-1-git-send-email-jacob.e.keller@intel.com>", "Subject": "[Intel-wired-lan] [PATCH v2] fm10k: prevent RCU issues during AER\n\tevents", "X-BeenThere": "intel-wired-lan@lists.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.lists.osuosl.org>", "List-Unsubscribe": "<http://lists.osuosl.org/mailman/options/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@lists.osuosl.org?subject=unsubscribe>", "List-Archive": "<http://lists.osuosl.org/pipermail/intel-wired-lan/>", "List-Post": "<mailto:intel-wired-lan@lists.osuosl.org>", "List-Help": "<mailto:intel-wired-lan-request@lists.osuosl.org?subject=help>", "List-Subscribe": "<http://lists.osuosl.org/mailman/listinfo/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@lists.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@lists.osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@lists.osuosl.org>" }, "content": "During an AER action response, we were calling fm10k_close without\nholding the rtnl_lock() which could lead to possible RCU warnings being\nproduced due to 64bit stat updates among other causes. Similarly, we\nneed rtnl_lock() around fm10k_open during fm10k_io_resume. Follow the\nsame pattern elsewhere in the driver and protect the entire open/close\nsequence.\n\nSigned-off-by: Jacob Keller <jacob.e.keller@intel.com>\n---\n\nNotes:\n - v2\n * add rtnl_lock() calls during fm10k_io_resume as well\n\n drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 11 ++++++++++-\n 1 file changed, 10 insertions(+), 1 deletion(-)", "diff": "diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c\nindex da38af052519..7dc8292546e1 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c\n@@ -2271,6 +2271,8 @@ static pci_ers_result_t fm10k_io_error_detected(struct pci_dev *pdev,\n \tif (state == pci_channel_io_perm_failure)\n \t\treturn PCI_ERS_RESULT_DISCONNECT;\n \n+\trtnl_lock();\n+\n \tif (netif_running(netdev))\n \t\tfm10k_close(netdev);\n \n@@ -2279,6 +2281,8 @@ static pci_ers_result_t fm10k_io_error_detected(struct pci_dev *pdev,\n \t/* free interrupts */\n \tfm10k_clear_queueing_scheme(interface);\n \n+\trtnl_unlock();\n+\n \tpci_disable_device(pdev);\n \n \t/* Request a slot reset. */\n@@ -2349,11 +2353,13 @@ static void fm10k_io_resume(struct pci_dev *pdev)\n \t/* reset statistics starting values */\n \thw->mac.ops.rebind_hw_stats(hw, &interface->stats);\n \n+\trtnl_lock();\n+\n \terr = fm10k_init_queueing_scheme(interface);\n \tif (err) {\n \t\tdev_err(&interface->pdev->dev,\n \t\t\t\"init_queueing_scheme failed: %d\\n\", err);\n-\t\treturn;\n+\t\tgoto unlock;\n \t}\n \n \t/* reassociate interrupts */\n@@ -2370,6 +2376,9 @@ static void fm10k_io_resume(struct pci_dev *pdev)\n \n \tif (!err)\n \t\tnetif_device_attach(netdev);\n+\n+unlock:\n+\trtnl_unlock();\n }\n \n static const struct pci_error_handlers fm10k_err_handler = {\n", "prefixes": [ "v2" ] }