Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1272315/?format=api
{ "id": 1272315, "url": "http://patchwork.ozlabs.org/api/patches/1272315/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20200417163531.5041.22649.stgit@localhost.localdomain/", "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": "<20200417163531.5041.22649.stgit@localhost.localdomain>", "list_archive_url": null, "date": "2020-04-17T16:35:31", "name": "[net-queue] e1000: Do not perform reset in reset_task if we are already down", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "27289aba6667a2dcb594ed29c6151af284dfc463", "submitter": { "id": 252, "url": "http://patchwork.ozlabs.org/api/people/252/?format=api", "name": "Alexander Duyck", "email": "alexander.duyck@gmail.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/20200417163531.5041.22649.stgit@localhost.localdomain/mbox/", "series": [ { "id": 170930, "url": "http://patchwork.ozlabs.org/api/series/170930/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=170930", "date": "2020-04-17T16:35:31", "name": "[net-queue] e1000: Do not perform reset in reset_task if we are already down", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/170930/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1272315/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1272315/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.136; helo=silver.osuosl.org;\n envelope-from=intel-wired-lan-bounces@osuosl.org; receiver=<UNKNOWN>)", "ozlabs.org;\n dmarc=fail (p=none dis=none) header.from=gmail.com", "ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256\n header.s=20161025 header.b=Wlb80tES;\n\tdkim-atps=neutral" ], "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 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 493hXs69W8z9sRN\n\tfor <incoming@patchwork.ozlabs.org>; Sat, 18 Apr 2020 02:35:40 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 294C922720;\n\tFri, 17 Apr 2020 16:35:39 +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 GybuRJs9Wx1A; Fri, 17 Apr 2020 16:35:37 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id 54ED822708;\n\tFri, 17 Apr 2020 16:35:37 +0000 (UTC)", "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n by ash.osuosl.org (Postfix) with ESMTP id 419B31BF28E\n for <intel-wired-lan@lists.osuosl.org>; Fri, 17 Apr 2020 16:35:36 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n by fraxinus.osuosl.org (Postfix) with ESMTP id 3D279866C8\n for <intel-wired-lan@lists.osuosl.org>; Fri, 17 Apr 2020 16:35:36 +0000 (UTC)", "from fraxinus.osuosl.org ([127.0.0.1])\n by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n with ESMTP id LHyFHi34CecW for <intel-wired-lan@lists.osuosl.org>;\n Fri, 17 Apr 2020 16:35:35 +0000 (UTC)", "from mail-qk1-f195.google.com (mail-qk1-f195.google.com\n [209.85.222.195])\n by fraxinus.osuosl.org (Postfix) with ESMTPS id 8A9FB866AD\n for <intel-wired-lan@lists.osuosl.org>; Fri, 17 Apr 2020 16:35:35 +0000 (UTC)", "by mail-qk1-f195.google.com with SMTP id s63so3050968qke.4\n for <intel-wired-lan@lists.osuosl.org>; Fri, 17 Apr 2020 09:35:35 -0700 (PDT)", "from localhost.localdomain ([2001:470:b:9c3:9e5c:8eff:fe4f:f2d0])\n by smtp.gmail.com with ESMTPSA id g12sm17440621qtu.69.2020.04.17.09.35.32\n (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128);\n Fri, 17 Apr 2020 09:35:32 -0700 (PDT)" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;\n h=subject:from:to:cc:date:message-id:user-agent:mime-version\n :content-transfer-encoding;\n bh=3uELr8a2YBlygOjULXHfTsQ5W5OUjM3HBq49e4sxrQ8=;\n b=Wlb80tESjlhP0DPrVosDOIf78j+RGf9xqOjWNPyljdGYM35GyngClPCiyXzoiQxH9U\n jnla2a2AX44KFHYDsq2V/mebMtIzFixocqPuyqWSstv9jFXqx+xzsmXIwA7tWFnGoAp5\n DvDsvAq6G/PtrXOLa8BHxuTYWWbzNeXoTSBtBsSjIcUhWJzOqFo+ZlVM7lmpco61kmZp\n QAjhbxpwDh7/Tf6sLyS6AWbhdfZHaOziZPg8NEGgCOan9BSHfhyGsjlaRNS2R7bSbTOJ\n 5djCbR4BcrUIPbrXmQ+GpqL1l1jonsvqD6vdgOJyrimmdtcQghKlPRBjQYCXij9sNvpg\n AhuQ==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20161025;\n h=x-gm-message-state:subject:from:to:cc:date:message-id:user-agent\n :mime-version:content-transfer-encoding;\n bh=3uELr8a2YBlygOjULXHfTsQ5W5OUjM3HBq49e4sxrQ8=;\n b=KJP7oYGDioerTmzGYYLQW1IP4yMADvjsybxync4FXCrKAJ5PilslLvUyrwIDl7WxHE\n 5rrdqt6Zlk5ZtjFmUD+RWh+OrRCw2jREYlFz+eHFIMgG5D8Az2x6mq72qG7QlKQYtGVS\n w1fCcSnolJ7se+75NqP8Dog5sevdYBCalgrleFes/gf4oM5fg6hWOcJLK4k2jD7dRAir\n w501XORQxzDF0UQ0dGDr0djhijyXfQAV0htGuU5YPowaapfiE2V3o2hT5Ko/9fi7y40J\n pGNA2gj5TVUSm39/Vv7bQ5A3Qs3SbV64JOCdDUMR6ToBXta6z/XSKXmhG1rVsatr+tp6\n IKWg==", "X-Gm-Message-State": "AGi0Pub/nL/neBNvDH/thqWbzAz1U/gM9FnYZpoELMfJWxNRuEmwFxnL\n +YsP02kvlDtIjKXwI3fGM+U=", "X-Google-Smtp-Source": "\n APiQypI+pT5MAJm0YqrCO54KsIwIRA4IbCHScStwYEKpUT5MghkIfcxJaldnITGI2xo3iRTd7eh0Pw==", "X-Received": "by 2002:a37:a5c7:: with SMTP id o190mr4265184qke.5.1587141333289;\n Fri, 17 Apr 2020 09:35:33 -0700 (PDT)", "From": "Alexander Duyck <alexander.duyck@gmail.com>", "To": "jeffrey.t.kirsher@intel.com", "Date": "Fri, 17 Apr 2020 09:35:31 -0700", "Message-ID": "<20200417163531.5041.22649.stgit@localhost.localdomain>", "User-Agent": "StGit/0.17.1-dirty", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [net-queue PATCH] e1000: Do not perform reset in\n reset_task if we are already down", "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>", "Cc": "mussitantesmortem@gmail.com, intel-wired-lan@lists.osuosl.org", "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: Alexander Duyck <alexander.h.duyck@linux.intel.com>\n\nWe are seeing a deadlock in e1000 down when NAPI is being disabled. Looking\nover the kernel function trace of the system it appears that the interface\nis being closed and then a reset is hitting which deadlocks the interface\nas the NAPI interface is already disabled.\n\nTo prevent this from happening I am disabling the reset task when\n__E1000_DOWN is already set. In addition code has been added so that we set\nthe __E1000_DOWN while holding the __E1000_RESET flag in e1000_close in\norder to guarantee that the reset task will not run after we have started\nthe close call.\n\nTested-by: Maxim Zhukov <mussitantesmortem@gmail.com>\nSigned-off-by: Alexander Duyck <alexander.h.duyck@linux.intel.com>\n---\n drivers/net/ethernet/intel/e1000/e1000_main.c | 18 ++++++++++++++----\n 1 file changed, 14 insertions(+), 4 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c\nindex f7103356ef56..566bbcb74056 100644\n--- a/drivers/net/ethernet/intel/e1000/e1000_main.c\n+++ b/drivers/net/ethernet/intel/e1000/e1000_main.c\n@@ -542,8 +542,13 @@ void e1000_reinit_locked(struct e1000_adapter *adapter)\n \tWARN_ON(in_interrupt());\n \twhile (test_and_set_bit(__E1000_RESETTING, &adapter->flags))\n \t\tmsleep(1);\n-\te1000_down(adapter);\n-\te1000_up(adapter);\n+\n+\t/* only run the task if not already down */\n+\tif (!test_bit(__E1000_DOWN, &adapter->flags)) {\n+\t\te1000_down(adapter);\n+\t\te1000_up(adapter);\n+\t}\n+\n \tclear_bit(__E1000_RESETTING, &adapter->flags);\n }\n \n@@ -1433,10 +1438,15 @@ int e1000_close(struct net_device *netdev)\n \tstruct e1000_hw *hw = &adapter->hw;\n \tint count = E1000_CHECK_RESET_COUNT;\n \n-\twhile (test_bit(__E1000_RESETTING, &adapter->flags) && count--)\n+\twhile (test_and_set_bit(__E1000_RESETTING, &adapter->flags) && count--)\n \t\tusleep_range(10000, 20000);\n \n-\tWARN_ON(test_bit(__E1000_RESETTING, &adapter->flags));\n+\tWARN_ON(count < 0);\n+\n+\t/* signal that we're down so that the reset task will no longer run */\n+\tset_bit(__E1000_DOWN, &adapter->flags);\n+\tclear_bit(__E1000_RESETTING, &adapter->flags);\n+\n \te1000_down(adapter);\n \te1000_power_down_phy(adapter);\n \te1000_free_irq(adapter);\n", "prefixes": [ "net-queue" ] }