Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/758164/?format=api
{ "id": 758164, "url": "http://patchwork.ozlabs.org/api/patches/758164/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20170503172904.9788-14-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-14-jacob.e.keller@intel.com>", "list_archive_url": null, "date": "2017-05-03T17:29:02", "name": "[v4,13/15] i40e: check for Tx timestamp timeouts during watchdog", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "e90c55671e9c263ccb84df2a8afbd31b98d06227", "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-14-jacob.e.keller@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/758164/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/758164/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 3wJ4sM1HYrz9rxw\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 4 May 2017 03:29:27 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id B8AF989B04;\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 hiFSgI4yvjBS; Wed, 3 May 2017 17:29:24 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 50E2D89B8D;\n\tWed, 3 May 2017 17:29:21 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id 98DB61C2B9B\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 silver.osuosl.org (Postfix) with ESMTP id 8B29A24312\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 3 May 2017 17:29:15 +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 5BkEHf2oURLw 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 silver.osuosl.org (Postfix) with ESMTPS id E317B30197\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=\"82071038\"", "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:02 -0700", "Message-Id": "<20170503172904.9788-14-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 13/15] i40e: 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 i40e 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 i40e_ptp_tx_hang() function similar to the already existing\ni40e_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/i40e/i40e.h | 2 ++\n drivers/net/ethernet/intel/i40e/i40e_main.c | 1 +\n drivers/net/ethernet/intel/i40e/i40e_ptp.c | 30 +++++++++++++++++++++++++++++\n drivers/net/ethernet/intel/i40e/i40e_txrx.c | 1 +\n 4 files changed, 34 insertions(+)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h\nindex f4465afe1fe1..25bf336c5f38 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e.h\n@@ -502,6 +502,7 @@ struct i40e_pf {\n \tstruct ptp_clock *ptp_clock;\n \tstruct ptp_clock_info ptp_caps;\n \tstruct sk_buff *ptp_tx_skb;\n+\tunsigned long ptp_tx_start;\n \tstruct hwtstamp_config tstamp_config;\n \tstruct mutex tmreg_lock; /* Used to protect the SYSTIME registers. */\n \tu64 ptp_base_adj;\n@@ -957,6 +958,7 @@ bool i40e_dcb_need_reconfig(struct i40e_pf *pf,\n \t\t\t struct i40e_dcbx_config *new_cfg);\n #endif /* CONFIG_I40E_DCB */\n void i40e_ptp_rx_hang(struct i40e_pf *pf);\n+void i40e_ptp_tx_hang(struct i40e_pf *pf);\n void i40e_ptp_tx_hwtstamp(struct i40e_pf *pf);\n void i40e_ptp_rx_hwtstamp(struct i40e_pf *pf, struct sk_buff *skb, u8 index);\n void i40e_ptp_set_increment(struct i40e_pf *pf);\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c\nindex c019dec988e3..e4eb97832413 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_main.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c\n@@ -6373,6 +6373,7 @@ static void i40e_watchdog_subtask(struct i40e_pf *pf)\n \t}\n \n \ti40e_ptp_rx_hang(pf);\n+\ti40e_ptp_tx_hang(pf);\n }\n \n /**\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_ptp.c b/drivers/net/ethernet/intel/i40e/i40e_ptp.c\nindex 876ea169816a..cd35c4b9a8b0 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_ptp.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_ptp.c\n@@ -327,6 +327,36 @@ void i40e_ptp_rx_hang(struct i40e_pf *pf)\n \tpf->rx_hwtstamp_cleared += cleared;\n }\n \n+/**\n+ * i40e_ptp_tx_hang - Detect error case when Tx timestamp register is hung\n+ * @pf: The PF private data structure\n+ *\n+ * This watchdog task is run periodically to make sure that we clear the Tx\n+ * timestamp logic if we don't obtain a timestamp in a reasonable amount of\n+ * time. It is unexpected in the normal case but if it occurs it results in\n+ * permanently prevent timestamps of future packets\n+ **/\n+void i40e_ptp_tx_hang(struct i40e_pf *pf)\n+{\n+\tif (!(pf->flags & I40E_FLAG_PTP) || !pf->ptp_tx)\n+\t\treturn;\n+\n+\t/* Nothing to do if we're not already waiting for a timestamp */\n+\tif (!test_bit(__I40E_PTP_TX_IN_PROGRESS, pf->state))\n+\t\treturn;\n+\n+\t/* We already have a handler routine which is run when we are notified\n+\t * of a Tx timestamp in the hardware. If we don't get an interrupt\n+\t * within a second it is reasonable to assume that we never will.\n+\t */\n+\tif (time_is_before_jiffies(pf->ptp_tx_start + HZ)) {\n+\t\tdev_kfree_skb_any(pf->ptp_tx_skb);\n+\t\tpf->ptp_tx_skb = NULL;\n+\t\tclear_bit_unlock(__I40E_PTP_TX_IN_PROGRESS, pf->state);\n+\t\tpf->tx_hwtstamp_timeouts++;\n+\t}\n+}\n+\n /**\n * i40e_ptp_tx_hwtstamp - Utility function which returns the Tx timestamp\n * @pf: Board private structure\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c\nindex c69ee4b0cfe2..c2e9013d05eb 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c\n@@ -2628,6 +2628,7 @@ static int i40e_tsyn(struct i40e_ring *tx_ring, struct sk_buff *skb,\n \tif (pf->ptp_tx &&\n \t !test_and_set_bit_lock(__I40E_PTP_TX_IN_PROGRESS, pf->state)) {\n \t\tskb_shinfo(skb)->tx_flags |= SKBTX_IN_PROGRESS;\n+\t\tpf->ptp_tx_start = jiffies;\n \t\tpf->ptp_tx_skb = skb_get(skb);\n \t} else {\n \t\tpf->tx_hwtstamp_skipped++;\n", "prefixes": [ "v4", "13/15" ] }