Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/758155/?format=api
{ "id": 758155, "url": "http://patchwork.ozlabs.org/api/patches/758155/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20170503172904.9788-7-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-7-jacob.e.keller@intel.com>", "list_archive_url": null, "date": "2017-05-03T17:28:55", "name": "[v4,06/15] igb: avoid permanent lock of *_PTP_TX_IN_PROGRESS", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "5771c95d34a0b012c98d9d33a6cf9746578fae30", "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-7-jacob.e.keller@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/758155/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/758155/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 3wJ4sC42wNz9rvt\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 4 May 2017 03:29:19 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 2DF7489AA2;\n\tWed, 3 May 2017 17:29:17 +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 Wm6XHC4dp-c1; Wed, 3 May 2017 17:29:16 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 2250B89AA7;\n\tWed, 3 May 2017 17:29:16 +0000 (UTC)", "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id 0C4881C2B0D\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 3 May 2017 17:29:14 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 0C92688542\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 3 May 2017 17:29:14 +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 aLckax5wRkmT 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 whitealder.osuosl.org (Postfix) with ESMTPS id 67F5288138\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=\"82071015\"", "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:55 -0700", "Message-Id": "<20170503172904.9788-7-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 06/15] igb: 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 igb driver uses a state bit lock to avoid handling more than one Tx\ntimestamp request at once. This is required because hardware is limited\nto a single set of registers for Tx timestamps.\n\nThe state bit lock is not properly cleaned up during\nigb_xmit_frame_ring() if the transmit fails such as due to DMA or TSO\nfailure. In some hardware this results in blocking timestamps until the\nservice task times out. In other hardware this results in a permanent\nlock of the timestamp bit because we never receive an interrupt\nindicating the timestamp occurred, since indeed the packet was never\ntransmitted.\n\nFix this by checking for DMA and TSO errors in igb_xmit_frame_ring() and\nproperly cleaning up after ourselves when these occur.\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/igb/igb_main.c | 23 ++++++++++++++++++-----\n 1 file changed, 18 insertions(+), 5 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c\nindex dbb4e3cf7dbf..978908f426a7 100644\n--- a/drivers/net/ethernet/intel/igb/igb_main.c\n+++ b/drivers/net/ethernet/intel/igb/igb_main.c\n@@ -5201,9 +5201,9 @@ static inline int igb_maybe_stop_tx(struct igb_ring *tx_ring, const u16 size)\n \treturn __igb_maybe_stop_tx(tx_ring, size);\n }\n \n-static void igb_tx_map(struct igb_ring *tx_ring,\n-\t\t struct igb_tx_buffer *first,\n-\t\t const u8 hdr_len)\n+static int igb_tx_map(struct igb_ring *tx_ring,\n+\t\t struct igb_tx_buffer *first,\n+\t\t const u8 hdr_len)\n {\n \tstruct sk_buff *skb = first->skb;\n \tstruct igb_tx_buffer *tx_buffer;\n@@ -5314,7 +5314,7 @@ static void igb_tx_map(struct igb_ring *tx_ring,\n \t\t */\n \t\tmmiowb();\n \t}\n-\treturn;\n+\treturn 0;\n \n dma_error:\n \tdev_err(tx_ring->dev, \"TX DMA map failed\\n\");\n@@ -5345,6 +5345,8 @@ static void igb_tx_map(struct igb_ring *tx_ring,\n \ttx_buffer->skb = NULL;\n \n \ttx_ring->next_to_use = i;\n+\n+\treturn -1;\n }\n \n netdev_tx_t igb_xmit_frame_ring(struct sk_buff *skb,\n@@ -5410,13 +5412,24 @@ netdev_tx_t igb_xmit_frame_ring(struct sk_buff *skb,\n \telse if (!tso)\n \t\tigb_tx_csum(tx_ring, first);\n \n-\tigb_tx_map(tx_ring, first, hdr_len);\n+\tif (igb_tx_map(tx_ring, first, hdr_len))\n+\t\tgoto cleanup_tx_tstamp;\n \n \treturn NETDEV_TX_OK;\n \n out_drop:\n \tdev_kfree_skb_any(first->skb);\n \tfirst->skb = NULL;\n+cleanup_tx_tstamp:\n+\tif (unlikely(tx_flags & IGB_TX_FLAGS_TSTAMP)) {\n+\t\tstruct igb_adapter *adapter = netdev_priv(tx_ring->netdev);\n+\n+\t\tdev_kfree_skb_any(adapter->ptp_tx_skb);\n+\t\tadapter->ptp_tx_skb = NULL;\n+\t\tif (adapter->hw.mac.type == e1000_82576)\n+\t\t\tcancel_work_sync(&adapter->ptp_tx_work);\n+\t\tclear_bit_unlock(__IGB_PTP_TX_IN_PROGRESS, &adapter->state);\n+\t}\n \n \treturn NETDEV_TX_OK;\n }\n", "prefixes": [ "v4", "06/15" ] }