Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/815044/?format=api
{ "id": 815044, "url": "http://patchwork.ozlabs.org/api/patches/815044/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20170916160000.3560-1-v.maffione@gmail.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": "<20170916160000.3560-1-v.maffione@gmail.com>", "list_archive_url": null, "date": "2017-09-16T16:00:00", "name": "[net] driver: e1000: fix race condition between e1000_down() and e1000_watchdog", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "0cc2bdad001142b9c59fade43303148719fc2537", "submitter": { "id": 30369, "url": "http://patchwork.ozlabs.org/api/people/30369/?format=api", "name": "Vincenzo Maffione", "email": "v.maffione@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/20170916160000.3560-1-v.maffione@gmail.com/mbox/", "series": [ { "id": 3684, "url": "http://patchwork.ozlabs.org/api/series/3684/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=3684", "date": "2017-09-16T16:00:00", "name": "[net] driver: e1000: fix race condition between e1000_down() and e1000_watchdog", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/3684/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/815044/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/815044/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\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"dmHJKNlm\"; dkim-atps=neutral" ], "Received": [ "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\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 3xwsrj0Qpdz9s7M\n\tfor <incoming@patchwork.ozlabs.org>;\n\tTue, 19 Sep 2017 03:07:48 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 82C4930B11;\n\tMon, 18 Sep 2017 17:07:47 +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 1cm2GpXHvHHe; Mon, 18 Sep 2017 17:07:46 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id C74942C899;\n\tMon, 18 Sep 2017 17:07:46 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id A08621C290F\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tSat, 16 Sep 2017 16:01:55 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 91EDF2F666\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tSat, 16 Sep 2017 16:01:55 +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 pQdb9+qLGaMV for <intel-wired-lan@lists.osuosl.org>;\n\tSat, 16 Sep 2017 16:01:55 +0000 (UTC)", "from mail-pg0-f67.google.com (mail-pg0-f67.google.com\n\t[74.125.83.67])\n\tby silver.osuosl.org (Postfix) with ESMTPS id 19BD82DA6F\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tSat, 16 Sep 2017 16:01:55 +0000 (UTC)", "by mail-pg0-f67.google.com with SMTP id i130so2885653pgc.0\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tSat, 16 Sep 2017 09:01:55 -0700 (PDT)", "from hadron.hsd1.ca.comcast.net\n\t(c-73-71-190-26.hsd1.ca.comcast.net. [73.71.190.26])\n\tby smtp.gmail.com with ESMTPSA id\n\tx28sm7640070pgc.91.2017.09.16.09.01.52\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tSat, 16 Sep 2017 09:01:53 -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\th=from:to:cc:subject:date:message-id;\n\tbh=W3gDp0I6NXsvnMFsnhz+3MizJpqyXb7gHzdKxuzCwfQ=;\n\tb=dmHJKNlmxS2GnDmSRsbYA4Ut9vCZC38lbV21kKOXkLU6Fqd/jkUG8xQHbxQAmwCc8W\n\t9uOMipOhWs+it90XENAWaUOtt+UqBUFPf3DvJhZQSgIg1o4jBCHpQBBHMYsic+kCYWyJ\n\t+7pCkjicSMwDklNYG4JUvwPtg4t6XZGqSI/KjjrsXCyiIXLyUmq1LLsCROexVOyEOEYc\n\tEPtHIwgWzAUEKBpXdtwKBUjLHN14XqWm046x7zjJF6uvU6VFLNSeK2mzo21EOx0hT2FA\n\t3XrbJ6Yv/C/I6uI89oYEjYqBkdipx8H090+pNcOoc3J9uxwIHD0SQXyZgqSzDy72SqS0\n\t1FBA==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id;\n\tbh=W3gDp0I6NXsvnMFsnhz+3MizJpqyXb7gHzdKxuzCwfQ=;\n\tb=eQl4jWTXjIkUCi+I9VnhtX3AEImMRQ6+OVl7FHH8pgS8RznCE+MIcihLlKNk3zefrh\n\tgkbwgztwb0mlm4a+E2Z+QAtBbRGIJf/unOhbxQqHC4zEowL0EMKqBrwnKGkfoyvNckpn\n\tQi5UlqKORu1MFZwTiazqjC0KLmyQz1OmEsdlFtsMiK58hk359uuw90XhVMF1aTTRxeYv\n\tpOV3qjTgmgYrwjt3puqtKXFycjyW7jcLE7S8RIevhJqv9gfXQbNFra3sNrOhe9QvVkyd\n\tHAaRrzHXrOKfkHToGSwyFX0zoPClajaD/AGK3Y/cJC32QTjJMXtYvZkDmXokmuiHTndh\n\tLkmQ==", "X-Gm-Message-State": "AHPjjUgGZ5nBt/k5MFgBNRwqjJjiMNMtrKv6hRVAYmiw18UTDNfhIbR3\n\tUhl3ZkgwP7zfKQ==", "X-Google-Smtp-Source": "ADKCNb6xtVre3cez3xF13rUVwZaaRY7AkDmPXRnumdYGZ7WNGV0mqlM/7OHVBhFxFTB98PZEuPUCzQ==", "X-Received": "by 10.99.109.142 with SMTP id\n\ti136mr27362974pgc.353.1505577714579; \n\tSat, 16 Sep 2017 09:01:54 -0700 (PDT)", "From": "Vincenzo Maffione <v.maffione@gmail.com>", "To": "jeffrey.t.kirsher@intel.com", "Date": "Sat, 16 Sep 2017 18:00:00 +0200", "Message-Id": "<20170916160000.3560-1-v.maffione@gmail.com>", "X-Mailer": "git-send-email 2.14.1", "X-Mailman-Approved-At": "Mon, 18 Sep 2017 17:07:45 +0000", "Cc": "netdev@vger.kernel.org, intel-wired-lan@lists.osuosl.org,\n\tlinux-kernel@vger.kernel.org, Vincenzo Maffione <v.maffione@gmail.com>", "Subject": "[Intel-wired-lan] [PATCH net] driver: e1000: fix race condition\n\tbetween e1000_down() and e1000_watchdog", "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": "This patch fixes a race condition that can result into the interface being\nup and carrier on, but with transmits disabled in the hardware.\nThe bug may show up by repeatedly IFF_DOWN+IFF_UP the interface, which\nallows e1000_watchdog() interleave with e1000_down().\n\n CPU x CPU y\n --------------------------------------------------------------------\n e1000_down():\n netif_carrier_off()\n e1000_watchdog():\n if (carrier == off) {\n netif_carrier_on();\n enable_hw_transmit();\n }\n disable_hw_transmit();\n e1000_watchdog():\n /* carrier on, do nothing */\n\nSigned-off-by: Vincenzo Maffione <v.maffione@gmail.com>\n---\n drivers/net/ethernet/intel/e1000/e1000_main.c | 11 +++++++++--\n 1 file changed, 9 insertions(+), 2 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c\nindex 98375e1e1185..1982f7917a8d 100644\n--- a/drivers/net/ethernet/intel/e1000/e1000_main.c\n+++ b/drivers/net/ethernet/intel/e1000/e1000_main.c\n@@ -520,8 +520,6 @@ void e1000_down(struct e1000_adapter *adapter)\n \tstruct net_device *netdev = adapter->netdev;\n \tu32 rctl, tctl;\n \n-\tnetif_carrier_off(netdev);\n-\n \t/* disable receives in the hardware */\n \trctl = er32(RCTL);\n \tew32(RCTL, rctl & ~E1000_RCTL_EN);\n@@ -537,6 +535,15 @@ void e1000_down(struct e1000_adapter *adapter)\n \tE1000_WRITE_FLUSH();\n \tmsleep(10);\n \n+\t/* Set the carrier off after transmits have been disabled in the\n+\t * hardware, to avoid race conditions with e1000_watchdog() (which\n+\t * may be running concurrently to us, checking for the carrier\n+\t * bit to decide whether it should enable transmits again). Such\n+\t * a race condition would result into transmission being disabled\n+\t * in the hardware until the next IFF_DOWN+IFF_UP cycle.\n+\t */\n+\tnetif_carrier_off(netdev);\n+\n \tnapi_disable(&adapter->napi);\n \n \te1000_irq_disable(adapter);\n", "prefixes": [ "net" ] }