Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/758162/?format=api
{ "id": 758162, "url": "http://patchwork.ozlabs.org/api/patches/758162/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20170503172904.9788-15-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": "<20170503172904.9788-15-jacob.e.keller@intel.com>", "list_archive_url": null, "date": "2017-05-03T17:29:03", "name": "[v4,14/15] igb: check for Tx timestamp timeouts during watchdog", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "f8dcaa0afc19226629e9c5badcd2a24a95b6bd55", "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/20170503172904.9788-15-jacob.e.keller@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/758162/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/758162/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 hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\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 3wJ4sL46dkz9rxm\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 4 May 2017 03:29:26 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 28BDB89AF7;\n\tWed, 3 May 2017 17:29:25 +0000 (UTC)", "from hemlock.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id XwGjBCYfM4wX; Wed, 3 May 2017 17:29:22 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id C599D89ACA;\n\tWed, 3 May 2017 17:29:20 +0000 (UTC)", "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id 82CCD1C0F65\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 3 May 2017 17:29:15 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 7FC8788138\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 3 May 2017 17:29:15 +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 CbCJlE5GMv3f for <intel-wired-lan@lists.osuosl.org>;\n\tWed, 3 May 2017 17:29:14 +0000 (UTC)", "from mga03.intel.com (mga03.intel.com [134.134.136.65])\n\tby whitealder.osuosl.org (Postfix) with ESMTPS id F3FED88574\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 3 May 2017 17:29:13 +0000 (UTC)", "from orsmga002.jf.intel.com ([10.7.209.21])\n\tby orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t03 May 2017 10:29:12 -0700", "from jekeller-desk.amr.corp.intel.com (HELO\n\tjekeller-desk.jekeller.internal) ([10.166.35.158])\n\tby orsmga002.jf.intel.com with ESMTP; 03 May 2017 10:29:12 -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-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.38,284,1491289200\"; d=\"scan'208\";a=\"82071042\"", "From": "Jacob Keller <jacob.e.keller@intel.com>", "To": "Intel Wired LAN <intel-wired-lan@lists.osuosl.org>", "Date": "Wed, 3 May 2017 10:29:03 -0700", "Message-Id": "<20170503172904.9788-15-jacob.e.keller@intel.com>", "X-Mailer": "git-send-email 2.13.0.rc0.317.gcc792a6cad5a", "In-Reply-To": "<20170503172904.9788-1-jacob.e.keller@intel.com>", "References": "<20170503172904.9788-1-jacob.e.keller@intel.com>", "Cc": "Richard Cochran <richardcochran@gmail.com>", "Subject": "[Intel-wired-lan] [PATCH v4 14/15] igb: check for Tx timestamp\n\ttimeouts during watchdog", "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": "The igb driver has logic to handle only one Tx timestamp at a time,\nusing a state bit lock to avoid multiple requests at once.\n\nIt may be possible, if incredibly unlikely, that a Tx timestamp event is\nrequested but never completes. Since we use an interrupt scheme to\ndetermine when the Tx timestamp occurred we would never clear the state\nbit in this case.\n\nAdd an igb_ptp_tx_hang() function similar to the already existing\nigb_ptp_rx_hang() function. This function runs in the watchdog routine\nand makes sure we eventually recover from this case instead of\npermanently disabling Tx timestamps.\n\nNote: there is no currently known way to cause this without hacking the\ndriver code to force it.\n\nSigned-off-by: Jacob Keller <jacob.e.keller@intel.com>\n---\n drivers/net/ethernet/intel/igb/igb.h | 1 +\n drivers/net/ethernet/intel/igb/igb_main.c | 1 +\n drivers/net/ethernet/intel/igb/igb_ptp.c | 29 +++++++++++++++++++++++++++++\n 3 files changed, 31 insertions(+)", "diff": "diff --git a/drivers/net/ethernet/intel/igb/igb.h b/drivers/net/ethernet/intel/igb/igb.h\nindex be35edcf6b08..ff4d9073781a 100644\n--- a/drivers/net/ethernet/intel/igb/igb.h\n+++ b/drivers/net/ethernet/intel/igb/igb.h\n@@ -677,6 +677,7 @@ void igb_ptp_stop(struct igb_adapter *adapter);\n void igb_ptp_reset(struct igb_adapter *adapter);\n void igb_ptp_suspend(struct igb_adapter *adapter);\n void igb_ptp_rx_hang(struct igb_adapter *adapter);\n+void igb_ptp_tx_hang(struct igb_adapter *adapter);\n void igb_ptp_rx_rgtstamp(struct igb_q_vector *q_vector, struct sk_buff *skb);\n void igb_ptp_rx_pktstamp(struct igb_q_vector *q_vector, void *va,\n \t\t\t struct sk_buff *skb);\ndiff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c\nindex 21b455bfb4ca..eec54d9df06b 100644\n--- a/drivers/net/ethernet/intel/igb/igb_main.c\n+++ b/drivers/net/ethernet/intel/igb/igb_main.c\n@@ -4726,6 +4726,7 @@ static void igb_watchdog_task(struct work_struct *work)\n \n \tigb_spoof_check(adapter);\n \tigb_ptp_rx_hang(adapter);\n+\tigb_ptp_tx_hang(adapter);\n \n \t/* Check LVMMC register on i350/i354 only */\n \tif ((adapter->hw.mac.type == e1000_i350) ||\ndiff --git a/drivers/net/ethernet/intel/igb/igb_ptp.c b/drivers/net/ethernet/intel/igb/igb_ptp.c\nindex a2da5738bfb5..b2f67c169bd2 100644\n--- a/drivers/net/ethernet/intel/igb/igb_ptp.c\n+++ b/drivers/net/ethernet/intel/igb/igb_ptp.c\n@@ -711,6 +711,35 @@ void igb_ptp_rx_hang(struct igb_adapter *adapter)\n \t}\n }\n \n+/**\n+ * igb_ptp_tx_hang - detect error case where Tx timestamp never finishes\n+ * @adapter: private network adapter structure\n+ */\n+void igb_ptp_tx_hang(struct igb_adapter *adapter)\n+{\n+\tbool timeout = time_is_before_jiffies(adapter->ptp_tx_start +\n+\t\t\t\t\t IGB_PTP_TX_TIMEOUT);\n+\n+\tif (!adapter->ptp_tx_skb)\n+\t\treturn;\n+\n+\tif (!test_bit(__IGB_PTP_TX_IN_PROGRESS, &adapter->state))\n+\t\treturn;\n+\n+\t/* If we haven't received a timestamp within the timeout, it is\n+\t * reasonable to assume that it will never occur, so we can unlock the\n+\t * timestamp bit when this occurs.\n+\t */\n+\tif (timeout) {\n+\t\tcancel_work_sync(&adapter->ptp_tx_work);\n+\t\tdev_kfree_skb_any(adapter->ptp_tx_skb);\n+\t\tadapter->ptp_tx_skb = NULL;\n+\t\tclear_bit_unlock(__IGB_PTP_TX_IN_PROGRESS, &adapter->state);\n+\t\tadapter->tx_hwtstamp_timeouts++;\n+\t\tdev_warn(&adapter->pdev->dev, \"clearing Tx timestamp hang\\n\");\n+\t}\n+}\n+\n /**\n * igb_ptp_tx_hwtstamp - utility function which checks for TX time stamp\n * @adapter: Board private structure.\n", "prefixes": [ "v4", "14/15" ] }