Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1213689/?format=api
{ "id": 1213689, "url": "http://patchwork.ozlabs.org/api/patches/1213689/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20191219201000.1712-1-jacob.e.keller@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": "<20191219201000.1712-1-jacob.e.keller@intel.com>", "list_archive_url": null, "date": "2019-12-19T20:10:00", "name": "[v2] fm10k: use txqueue parameter in fm10k_tx_timeout", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "8832dda6a0614ab8e93d886f01de18b0a84b1619", "submitter": { "id": 9784, "url": "http://patchwork.ozlabs.org/api/people/9784/?format=api", "name": "Jacob Keller", "email": "jacob.e.keller@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/20191219201000.1712-1-jacob.e.keller@intel.com/mbox/", "series": [ { "id": 149699, "url": "http://patchwork.ozlabs.org/api/series/149699/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=149699", "date": "2019-12-19T20:10:00", "name": "[v2] fm10k: use txqueue parameter in fm10k_tx_timeout", "version": 2, "mbox": "http://patchwork.ozlabs.org/series/149699/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1213689/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1213689/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; spf=pass (sender SPF authorized)\n\tsmtp.mailfrom=osuosl.org (client-ip=140.211.166.138;\n\thelo=whitealder.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 whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\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 47f2zn2h9rz9sPT\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 20 Dec 2019 07:10:12 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 17EA288092;\n\tThu, 19 Dec 2019 20:10:11 +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 6Z+5vlXn2tNy; Thu, 19 Dec 2019 20:10:07 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id EA8A188086;\n\tThu, 19 Dec 2019 20:10:06 +0000 (UTC)", "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\tby ash.osuosl.org (Postfix) with ESMTP id D956D1BF3F9\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 19 Dec 2019 20:10:05 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id CA69586CBB\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 19 Dec 2019 20:10:05 +0000 (UTC)", "from fraxinus.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id Tv5a_1MDaHVk for <intel-wired-lan@lists.osuosl.org>;\n\tThu, 19 Dec 2019 20:10:04 +0000 (UTC)", "from mga17.intel.com (mga17.intel.com [192.55.52.151])\n\tby fraxinus.osuosl.org (Postfix) with ESMTPS id 9B848870B9\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 19 Dec 2019 20:10:02 +0000 (UTC)", "from orsmga006.jf.intel.com ([10.7.209.51])\n\tby fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t19 Dec 2019 12:10:02 -0800", "from jekeller-desk.amr.corp.intel.com ([10.166.244.172])\n\tby orsmga006.jf.intel.com with ESMTP; 19 Dec 2019 12:10:01 -0800" ], "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.69,333,1571727600\"; d=\"scan'208\";a=\"218277913\"", "From": "Jacob Keller <jacob.e.keller@intel.com>", "To": "Intel Wired LAN <intel-wired-lan@lists.osuosl.org>", "Date": "Thu, 19 Dec 2019 12:10:00 -0800", "Message-Id": "<20191219201000.1712-1-jacob.e.keller@intel.com>", "X-Mailer": "git-send-email 2.24.0.155.gd9f6f3b6195a", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [PATCH v2] fm10k: use txqueue parameter in\n\tfm10k_tx_timeout", "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>", "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": "Make use of the new txqueue parameter to the .ndo_tx_timeout function.\nIn fm10k_tx_timeout, remove the now unnecessary loop to determine which\nTx queue is stuck. Instead, just double check the specified queue\n\nThis could be improved further to attempt resetting only the specific\nqueue that got stuck. However, that is a much larger refactor and has\nbeen left as a future improvement.\n\nSigned-off-by: Jacob Keller <jacob.e.keller@intel.com>\n---\n\nWoops, sorry for the quick v2. Had missed a semicolon and apparently my\nconfig I used to check this after a last minute move to add the Tx queue\nwarning didn't have CONFIG_FM10K enabled.. Woops.\n\n drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 17 ++++++++++-------\n 1 file changed, 10 insertions(+), 7 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c b/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c\nindex ba2566e2123d..0637ccadee79 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c\n@@ -696,21 +696,24 @@ static netdev_tx_t fm10k_xmit_frame(struct sk_buff *skb, struct net_device *dev)\n /**\n * fm10k_tx_timeout - Respond to a Tx Hang\n * @netdev: network interface device structure\n+ * @txqueue: the index of the Tx queue that timed out\n **/\n static void fm10k_tx_timeout(struct net_device *netdev, unsigned int txqueue)\n {\n \tstruct fm10k_intfc *interface = netdev_priv(netdev);\n+\tstruct fm10k_ring *tx_ring;\n \tbool real_tx_hang = false;\n-\tint i;\n-\n-#define TX_TIMEO_LIMIT 16000\n-\tfor (i = 0; i < interface->num_tx_queues; i++) {\n-\t\tstruct fm10k_ring *tx_ring = interface->tx_ring[i];\n \n-\t\tif (check_for_tx_hang(tx_ring) && fm10k_check_tx_hang(tx_ring))\n-\t\t\treal_tx_hang = true;\n+\tif (txqueue >= interface->num_tx_queues) {\n+\t\tWARN(1, \"invalid Tx queue index %d\", txqueue);\n+\t\treturn;\n \t}\n \n+\ttx_ring = interface->tx_ring[txqueue];\n+\tif (check_for_tx_hang(tx_ring) && fm10k_check_tx_hang(tx_ring))\n+\t\treal_tx_hang = true;\n+\n+#define TX_TIMEO_LIMIT 16000\n \tif (real_tx_hang) {\n \t\tfm10k_tx_timeout_reset(interface);\n \t} else {\n", "prefixes": [ "v2" ] }