Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/542065/?format=api
{ "id": 542065, "url": "http://patchwork.ozlabs.org/api/patches/542065/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1447113021-1611-5-git-send-email-bpoirier@suse.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": "<1447113021-1611-5-git-send-email-bpoirier@suse.com>", "list_archive_url": null, "date": "2015-11-09T23:50:21", "name": "[v3,4/4] e1000e: Fix msi-x interrupt automask", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "a17bc962ccc14e9f42f449864449e35f460ef47e", "submitter": { "id": 67008, "url": "http://patchwork.ozlabs.org/api/people/67008/?format=api", "name": "Benjamin Poirier", "email": "bpoirier@suse.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/1447113021-1611-5-git-send-email-bpoirier@suse.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/542065/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/542065/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 whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ozlabs.org (Postfix) with ESMTP id F40101401AD\n\tfor <incoming@patchwork.ozlabs.org>;\n\tTue, 10 Nov 2015 10:51:37 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 4E6F9886F1;\n\tMon, 9 Nov 2015 23:51:37 +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 DhsWKY7vlqNR; Mon, 9 Nov 2015 23:51:35 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id E1CCF8877D;\n\tMon, 9 Nov 2015 23:51:35 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id CFF291C0FC9\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 9 Nov 2015 23:51:33 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id CB5E623273\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 9 Nov 2015 23:51:33 +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 dPZf1dQyU+Xx for <intel-wired-lan@lists.osuosl.org>;\n\tMon, 9 Nov 2015 23:51:32 +0000 (UTC)", "from mx2.suse.de (mx2.suse.de [195.135.220.15])\n\tby silver.osuosl.org (Postfix) with ESMTPS id 97DD41FE3B\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 9 Nov 2015 23:51:32 +0000 (UTC)", "from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254])\n\tby mx2.suse.de (Postfix) with ESMTP id 1E7FEAC0B;\n\tMon, 9 Nov 2015 23:51:11 +0000 (UTC)" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org", "by amavisd-new at test-mx.suse.de" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "From": "Benjamin Poirier <bpoirier@suse.com>", "To": "Jeff Kirsher <jeffrey.t.kirsher@intel.com>", "Date": "Mon, 9 Nov 2015 15:50:21 -0800", "Message-Id": "<1447113021-1611-5-git-send-email-bpoirier@suse.com>", "X-Mailer": "git-send-email 2.6.2", "In-Reply-To": "<1447113021-1611-1-git-send-email-bpoirier@suse.com>", "References": "<1447113021-1611-1-git-send-email-bpoirier@suse.com>", "Cc": "Frank Steiner <steiner-reg@bio.ifi.lmu.de>, linux-kernel@vger.kernel.org,\n\tintel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org", "Subject": "[Intel-wired-lan] [PATCH v3 4/4] e1000e: Fix msi-x interrupt\n\tautomask", "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": "Since the introduction of 82574 support in e1000e, the driver has worked\non the assumption that msi-x interrupt generation is automatically\ndisabled after each irq. As it turns out, this is not the case.\nCurrently, rx interrupts can fire multiple times before and during napi\nprocessing. This can be a problem for users because frames that arrive\nin a certain window (after adapter->clean_rx() but before\nnapi_complete_done() has cleared NAPI_STATE_SCHED) generate an interrupt\nwhich does not lead to napi_schedule(). These frames sit in the rx queue\nuntil another frame arrives (a tcp retransmit for example).\n\nWhile the EIAC and CTRL_EXT registers are properly configured for irq\nautomask, the modification of IAM in e1000_configure_msix() is what\nprevents automask from working as intended.\n\nThis patch removes that erroneous write and fixes interrupt rearming for\ntx interrupts. It also clears IAME from CTRL_EXT. This is not strictly\nnecessary for operation of the driver but it is to avoid disruption from\npotential programs that access the registers directly, like `ethregs -c`.\n\nReported-by: Frank Steiner <steiner-reg@bio.ifi.lmu.de>\nSigned-off-by: Benjamin Poirier <bpoirier@suse.com>\n---\n drivers/net/ethernet/intel/e1000e/netdev.c | 11 +++++------\n 1 file changed, 5 insertions(+), 6 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c\nindex ed7cc8e..2a22ed7 100644\n--- a/drivers/net/ethernet/intel/e1000e/netdev.c\n+++ b/drivers/net/ethernet/intel/e1000e/netdev.c\n@@ -1931,6 +1931,9 @@ static irqreturn_t e1000_intr_msix_tx(int __always_unused irq, void *data)\n \t\t/* Ring was not completely cleaned, so fire another interrupt */\n \t\tew32(ICS, tx_ring->ims_val);\n \n+\tif (!test_bit(__E1000_DOWN, &adapter->state))\n+\t\tew32(IMS, adapter->tx_ring->ims_val);\n+\n \treturn IRQ_HANDLED;\n }\n \n@@ -2018,12 +2021,8 @@ static void e1000_configure_msix(struct e1000_adapter *adapter)\n \tew32(IVAR, ivar);\n \n \t/* enable MSI-X PBA support */\n-\tctrl_ext = er32(CTRL_EXT);\n-\tctrl_ext |= E1000_CTRL_EXT_PBA_CLR;\n-\n-\t/* Auto-Mask Other interrupts upon ICR read */\n-\tew32(IAM, ~E1000_EIAC_MASK_82574 | E1000_IMS_OTHER);\n-\tctrl_ext |= E1000_CTRL_EXT_EIAME;\n+\tctrl_ext = er32(CTRL_EXT) & ~E1000_CTRL_EXT_IAME;\n+\tctrl_ext |= E1000_CTRL_EXT_PBA_CLR | E1000_CTRL_EXT_EIAME;\n \tew32(CTRL_EXT, ctrl_ext);\n \te1e_flush();\n }\n", "prefixes": [ "v3", "4/4" ] }