Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/989699/?format=api
{ "id": 989699, "url": "http://patchwork.ozlabs.org/api/patches/989699/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20181026174105.11628-16-anirudh.venkataramanan@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": "<20181026174105.11628-16-anirudh.venkataramanan@intel.com>", "list_archive_url": null, "date": "2018-10-26T17:41:04", "name": "[S8,15/16] ice: Avoid nested RTNL locking in ice_dis_vsi", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "4943081ad5b39a5738ad5a8d99c183b80173cc32", "submitter": { "id": 73601, "url": "http://patchwork.ozlabs.org/api/people/73601/?format=api", "name": "Anirudh Venkataramanan", "email": "anirudh.venkataramanan@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/20181026174105.11628-16-anirudh.venkataramanan@intel.com/mbox/", "series": [ { "id": 72783, "url": "http://patchwork.ozlabs.org/api/series/72783/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=72783", "date": "2018-10-26T17:40:52", "name": "Bug fixes for ice, set 1/2", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/72783/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/989699/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/989699/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.136; helo=silver.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 silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\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 42hWk23n0Zz9sLw\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat, 27 Oct 2018 04:50:34 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id D202B2516D;\n\tFri, 26 Oct 2018 17:50:32 +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 Q3xiDl5M9Xm4; Fri, 26 Oct 2018 17:50:31 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id F194225CA8;\n\tFri, 26 Oct 2018 17:50:29 +0000 (UTC)", "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\tby ash.osuosl.org (Postfix) with ESMTP id 126681BF30F\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 26 Oct 2018 17:50:28 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 0FFEF88720\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 26 Oct 2018 17:50:28 +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 Wwsohb4UjbaW for <intel-wired-lan@lists.osuosl.org>;\n\tFri, 26 Oct 2018 17:50:26 +0000 (UTC)", "from mga03.intel.com (mga03.intel.com [134.134.136.65])\n\tby hemlock.osuosl.org (Postfix) with ESMTPS id 6C5D888728\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 26 Oct 2018 17:50:26 +0000 (UTC)", "from orsmga004.jf.intel.com ([10.7.209.38])\n\tby orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t26 Oct 2018 10:41:06 -0700", "from shasta.jf.intel.com ([10.166.241.11])\n\tby orsmga004.jf.intel.com with ESMTP; 26 Oct 2018 10:41:05 -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.54,428,1534834800\"; d=\"scan'208\";a=\"244654996\"", "From": "Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Fri, 26 Oct 2018 10:41:04 -0700", "Message-Id": "<20181026174105.11628-16-anirudh.venkataramanan@intel.com>", "X-Mailer": "git-send-email 2.14.3", "In-Reply-To": "<20181026174105.11628-1-anirudh.venkataramanan@intel.com>", "References": "<20181026174105.11628-1-anirudh.venkataramanan@intel.com>", "Subject": "[Intel-wired-lan] [PATCH S8 15/16] ice: Avoid nested RTNL locking\n\tin ice_dis_vsi", "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>", "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: Dave Ertman <david.m.ertman@intel.com>\n\nice_dis_vsi() performs an rtnl_lock() if it detects a netdev that is\nrunning on the VSI. In cases where the RTNL lock has already been\nacquired, a deadlock results. Add a boolean to pass to ice_dis_vsi to\ntell it if the RTNL lock is already held.\n\nSigned-off-by: Dave Ertman <david.m.ertman@intel.com>\nSigned-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>\n---\n[Anirudh Venkataramanan <anirudh.venkataramanan@intel.com> cleaned up commit message]\n---\n drivers/net/ethernet/intel/ice/ice_main.c | 15 ++++++++++-----\n 1 file changed, 10 insertions(+), 5 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c\nindex ea79e5e1f589..089b0f0b2e71 100644\n--- a/drivers/net/ethernet/intel/ice/ice_main.c\n+++ b/drivers/net/ethernet/intel/ice/ice_main.c\n@@ -3137,8 +3137,9 @@ static void ice_vsi_release_all(struct ice_pf *pf)\n /**\n * ice_dis_vsi - pause a VSI\n * @vsi: the VSI being paused\n+ * @locked: is the rtnl_lock already held\n */\n-static void ice_dis_vsi(struct ice_vsi *vsi)\n+static void ice_dis_vsi(struct ice_vsi *vsi, bool locked)\n {\n \tif (test_bit(__ICE_DOWN, vsi->state))\n \t\treturn;\n@@ -3147,9 +3148,13 @@ static void ice_dis_vsi(struct ice_vsi *vsi)\n \n \tif (vsi->type == ICE_VSI_PF && vsi->netdev) {\n \t\tif (netif_running(vsi->netdev)) {\n-\t\t\trtnl_lock();\n-\t\t\tvsi->netdev->netdev_ops->ndo_stop(vsi->netdev);\n-\t\t\trtnl_unlock();\n+\t\t\tif (!locked) {\n+\t\t\t\trtnl_lock();\n+\t\t\t\tvsi->netdev->netdev_ops->ndo_stop(vsi->netdev);\n+\t\t\t\trtnl_unlock();\n+\t\t\t} else {\n+\t\t\t\tvsi->netdev->netdev_ops->ndo_stop(vsi->netdev);\n+\t\t\t}\n \t\t} else {\n \t\t\tice_vsi_close(vsi);\n \t\t}\n@@ -3188,7 +3193,7 @@ static void ice_pf_dis_all_vsi(struct ice_pf *pf)\n \n \tice_for_each_vsi(pf, v)\n \t\tif (pf->vsi[v])\n-\t\t\tice_dis_vsi(pf->vsi[v]);\n+\t\t\tice_dis_vsi(pf->vsi[v], false);\n }\n \n /**\n", "prefixes": [ "S8", "15/16" ] }