Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/990486/?format=api
{ "id": 990486, "url": "http://patchwork.ozlabs.org/api/patches/990486/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20181029182721.19003-1-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": "<20181029182721.19003-1-alice.michael@intel.com>", "list_archive_url": null, "date": "2018-10-29T18:27:21", "name": "[next] i40e: prevent overlapping tx_timeout recover", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "1cf268e5f3b0d0bf253f7acca1d32c6121a41b12", "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/20181029182721.19003-1-alice.michael@intel.com/mbox/", "series": [ { "id": 73079, "url": "http://patchwork.ozlabs.org/api/series/73079/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=73079", "date": "2018-10-29T18:27:21", "name": "[next] i40e: prevent overlapping tx_timeout recover", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/73079/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/990486/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/990486/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 42kNPt4yr1z9s7W\n\tfor <incoming@patchwork.ozlabs.org>;\n\tTue, 30 Oct 2018 05:28:02 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id B15EA231E9;\n\tMon, 29 Oct 2018 18:28:00 +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 FTnfegkaI2mo; Mon, 29 Oct 2018 18:28:00 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id 06F2E23307;\n\tMon, 29 Oct 2018 18:28:00 +0000 (UTC)", "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id B2E3D1BF4E3\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 29 Oct 2018 18:27:58 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id ADB7586E33\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 29 Oct 2018 18:27:58 +0000 (UTC)", "from whitealder.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id SCFPaO-lIf0F for <intel-wired-lan@lists.osuosl.org>;\n\tMon, 29 Oct 2018 18:27:58 +0000 (UTC)", "from mga06.intel.com (mga06.intel.com [134.134.136.31])\n\tby whitealder.osuosl.org (Postfix) with ESMTPS id E046D868A5\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 29 Oct 2018 18:27:57 +0000 (UTC)", "from fmsmga002.fm.intel.com ([10.253.24.26])\n\tby orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t29 Oct 2018 11:27:56 -0700", "from alicemic-2.jf.intel.com ([10.166.16.121])\n\tby fmsmga002.fm.intel.com with ESMTP; 29 Oct 2018 11:27:56 -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,441,1534834800\"; d=\"scan'208\";a=\"99742970\"", "From": "Alice Michael <alice.michael@intel.com>", "To": "alice.michael@intel.com,\n\tintel-wired-lan@lists.osuosl.org", "Date": "Mon, 29 Oct 2018 11:27:21 -0700", "Message-Id": "<20181029182721.19003-1-alice.michael@intel.com>", "X-Mailer": "git-send-email 2.9.5", "Subject": "[Intel-wired-lan] [next PATCH] i40e: prevent overlapping tx_timeout\n\trecover", "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: Alan Brady <alan.brady@intel.com>\n\nIf a TX hang occurs, we attempt to recover by incrementally resetting.\nIf we're starved for CPU time, it's possible the reset doesn't actually\ncomplete (or even fire) before another tx_timeout fires causing us to\nfly through the different resets without actually doing them.\n\nThis adds a bit to set and check if a timeout recovery is already\npending and, if so, bail out of tx_timeout. The bit will get cleared at\nthe end of i40e_rebuild when reset is complete.\n\nSigned-off-by: Alan Brady <alan.brady@intel.com>\n---\n drivers/net/ethernet/intel/i40e/i40e.h | 1 +\n drivers/net/ethernet/intel/i40e/i40e_main.c | 5 +++++\n 2 files changed, 6 insertions(+)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h\nindex 876cac3..8245ff1 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e.h\n@@ -122,6 +122,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_TIMEOUT_RECOVERY_PENDING,\n \t__I40E_MISC_IRQ_REQUESTED,\n \t__I40E_RESET_INTR_RECEIVED,\n \t__I40E_REINIT_REQUESTED,\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c\nindex f4905fe..9d52d7e 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_main.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c\n@@ -338,6 +338,10 @@ static void i40e_tx_timeout(struct net_device *netdev)\n \t\t (pf->tx_timeout_last_recovery + netdev->watchdog_timeo)))\n \t\treturn; /* don't do any new action before the next timeout */\n \n+\t/* don't kick off another recovery if one is already pending */\n+\tif (test_and_set_bit(__I40E_TIMEOUT_RECOVERY_PENDING, pf->state))\n+\t\treturn;\n+\n \tif (tx_ring) {\n \t\thead = i40e_get_head(tx_ring);\n \t\t/* Read interrupt register */\n@@ -9631,6 +9635,7 @@ static void i40e_rebuild(struct i40e_pf *pf, bool reinit, bool lock_acquired)\n \tclear_bit(__I40E_RESET_FAILED, pf->state);\n clear_recovery:\n \tclear_bit(__I40E_RESET_RECOVERY_PENDING, pf->state);\n+\tclear_bit(__I40E_TIMEOUT_RECOVERY_PENDING, pf->state);\n }\n \n /**\n", "prefixes": [ "next" ] }