Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/758166/?format=api
{ "id": 758166, "url": "http://patchwork.ozlabs.org/api/patches/758166/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20170503172904.9788-6-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-6-jacob.e.keller@intel.com>", "list_archive_url": null, "date": "2017-05-03T17:28:54", "name": "[v4,05/15] i40e: avoid permanent lock of *_PTP_TX_IN_PROGRESS", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "6b458c8824665eabf6af30b6210d0b25f0507628", "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-6-jacob.e.keller@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/758166/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/758166/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 3wJ4sN4KnHz9rxm\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 4 May 2017 03:29:28 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id EDF3E89AC7;\n\tWed, 3 May 2017 17:29:26 +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 5rJFZgeOx8f2; Wed, 3 May 2017 17:29:25 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id AE9E789B23;\n\tWed, 3 May 2017 17:29:22 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id EB60F1C0F65\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 E594E24312\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 UMtQSMsIhNcc for <intel-wired-lan@lists.osuosl.org>;\n\tWed, 3 May 2017 17:29:13 +0000 (UTC)", "from mga03.intel.com (mga03.intel.com [134.134.136.65])\n\tby silver.osuosl.org (Postfix) with ESMTPS id 237F13015E\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:11 -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=\"82071011\"", "From": "Jacob Keller <jacob.e.keller@intel.com>", "To": "Intel Wired LAN <intel-wired-lan@lists.osuosl.org>", "Date": "Wed, 3 May 2017 10:28:54 -0700", "Message-Id": "<20170503172904.9788-6-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 05/15] i40e: avoid permanent lock of\n\t*_PTP_TX_IN_PROGRESS", "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 uses a bit lock to indicate when a Tx timestamp is in\nprogress to avoid attempting to timestamp multiple packets at once. This\nis required because hardware only has registers to handle one request at\na time.\n\nThere is a corner case where we failed to cleanup the bit lock after\na failed transmit. This can potentially result in a state bit being\nlocked forever.\n\nAdd some cleanup code to i40e_xmit_frame_ring to check and make sure we\ncleanup incase of these failures. We also modify i40e_tx_map to return\nan error code indication DMA failure.\n\nReported-by: Reported-by: David Mirabito <davidm@metamako.com>\nSigned-off-by: Jacob Keller <jacob.e.keller@intel.com>\n---\n drivers/net/ethernet/intel/i40e/i40e_txrx.c | 26 ++++++++++++++++++++------\n 1 file changed, 20 insertions(+), 6 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c\nindex 29321a6167a6..19984be0f70c 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c\n@@ -2932,10 +2932,12 @@ bool __i40e_chk_linearize(struct sk_buff *skb)\n * @hdr_len: size of the packet header\n * @td_cmd: the command field in the descriptor\n * @td_offset: offset for checksum or crc\n+ *\n+ * Returns 0 on success, -1 on failure to DMA\n **/\n-static inline void i40e_tx_map(struct i40e_ring *tx_ring, struct sk_buff *skb,\n-\t\t\t struct i40e_tx_buffer *first, u32 tx_flags,\n-\t\t\t const u8 hdr_len, u32 td_cmd, u32 td_offset)\n+static inline int i40e_tx_map(struct i40e_ring *tx_ring, struct sk_buff *skb,\n+\t\t\t struct i40e_tx_buffer *first, u32 tx_flags,\n+\t\t\t const u8 hdr_len, u32 td_cmd, u32 td_offset)\n {\n \tunsigned int data_len = skb->data_len;\n \tunsigned int size = skb_headlen(skb);\n@@ -3093,7 +3095,7 @@ static inline void i40e_tx_map(struct i40e_ring *tx_ring, struct sk_buff *skb,\n \t\tmmiowb();\n \t}\n \n-\treturn;\n+\treturn 0;\n \n dma_error:\n \tdev_info(tx_ring->dev, \"TX DMA map failed\\n\");\n@@ -3110,6 +3112,8 @@ static inline void i40e_tx_map(struct i40e_ring *tx_ring, struct sk_buff *skb,\n \t}\n \n \ttx_ring->next_to_use = i;\n+\n+\treturn -1;\n }\n \n /**\n@@ -3210,8 +3214,9 @@ static netdev_tx_t i40e_xmit_frame_ring(struct sk_buff *skb,\n \t */\n \ti40e_atr(tx_ring, skb, tx_flags);\n \n-\ti40e_tx_map(tx_ring, skb, first, tx_flags, hdr_len,\n-\t\t td_cmd, td_offset);\n+\tif (i40e_tx_map(tx_ring, skb, first, tx_flags, hdr_len,\n+\t\t\ttd_cmd, td_offset))\n+\t\tgoto cleanup_tx_tstamp;\n \n \treturn NETDEV_TX_OK;\n \n@@ -3219,6 +3224,15 @@ static netdev_tx_t i40e_xmit_frame_ring(struct sk_buff *skb,\n \ti40e_trace(xmit_frame_ring_drop, first->skb, tx_ring);\n \tdev_kfree_skb_any(first->skb);\n \tfirst->skb = NULL;\n+cleanup_tx_tstamp:\n+\tif (unlikely(tx_flags & I40E_TX_FLAGS_TSYN)) {\n+\t\tstruct i40e_pf *pf = i40e_netdev_to_pf(tx_ring->netdev);\n+\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}\n+\n \treturn NETDEV_TX_OK;\n }\n \n", "prefixes": [ "v4", "05/15" ] }