Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/669012/?format=api
{ "id": 669012, "url": "http://patchwork.ozlabs.org/api/patches/669012/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1473715124-31296-4-git-send-email-bimmy.pujari@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": "<1473715124-31296-4-git-send-email-bimmy.pujari@intel.com>", "list_archive_url": null, "date": "2016-09-12T21:18:39", "name": "[next,S46,3/8] i40e: Fix Flow Director raw_buf cleanup", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "61c284d264852fcec1d958ede4102fb82f1e8241", "submitter": { "id": 68919, "url": "http://patchwork.ozlabs.org/api/people/68919/?format=api", "name": "Pujari, Bimmy", "email": "bimmy.pujari@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/1473715124-31296-4-git-send-email-bimmy.pujari@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/669012/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/669012/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 fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\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 3sY10N6Syzz9sdm\n\tfor <incoming@patchwork.ozlabs.org>;\n\tTue, 13 Sep 2016 07:19:32 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id EAD7C88DF0;\n\tMon, 12 Sep 2016 21:19:30 +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 KuGvf30ZRzz1; Mon, 12 Sep 2016 21:19:24 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 765CB88D80;\n\tMon, 12 Sep 2016 21:19:21 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id 04C311C684F\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 12 Sep 2016 21:19:20 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id F131031601\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 12 Sep 2016 21:19:19 +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 yhVYGtea8Yu3 for <intel-wired-lan@lists.osuosl.org>;\n\tMon, 12 Sep 2016 21:19:17 +0000 (UTC)", "from mga07.intel.com (mga07.intel.com [134.134.136.100])\n\tby silver.osuosl.org (Postfix) with ESMTPS id 5D3B930975\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 12 Sep 2016 21:19:17 +0000 (UTC)", "from orsmga003.jf.intel.com ([10.7.209.27])\n\tby orsmga105.jf.intel.com with ESMTP; 12 Sep 2016 14:19:16 -0700", "from bimmy.jf.intel.com (HELO bimmy.linux1.jf.intel.com)\n\t([134.134.2.177])\n\tby orsmga003.jf.intel.com with ESMTP; 12 Sep 2016 14:19:17 -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.30,324,1470726000\"; d=\"scan'208\";a=\"877982152\"", "From": "Bimmy Pujari <bimmy.pujari@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Mon, 12 Sep 2016 14:18:39 -0700", "Message-Id": "<1473715124-31296-4-git-send-email-bimmy.pujari@intel.com>", "X-Mailer": "git-send-email 2.4.11", "In-Reply-To": "<1473715124-31296-1-git-send-email-bimmy.pujari@intel.com>", "References": "<1473715124-31296-1-git-send-email-bimmy.pujari@intel.com>", "Subject": "[Intel-wired-lan] [next PATCH S46 3/8] i40e: Fix Flow Director\n\traw_buf cleanup", "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": "From: Alexander Duyck <alexander.h.duyck@intel.com>\n\nThe Tx cleanup flow was incorrectly assuming it could check for the flow\ndirector bits after it had unmapped the buffer. However in this case it\nresults in us trying to free a raw_buf as though it is an sk_buff.\n\nTo fix this I am moving up the flag test for the FD_SB bit so that when\nfind a non-NULL skb or raw_buf value we then check the flag and use the\nappropriate call to free the buffer.\n\nSigned-off-by: Alexander Duyck <alexander.h.duyck@intel.com>\nChange-ID: I6284034ba1ea87c9922e56f6eb3181f7f09bddde\n---\nTesting Hints:\n The issue fixed here would present itself as a memory leak or data\n corruption. The trick would be to find a way to cause the Tx ring\n for the Flow Director sideband to have buffers on it when the queue\n is disabled. This would likely require ifconfig up/down on the\n interface in a loop while also adding filters.\n\n 1. ifconfig <iface> up\n 2. disable interrupts for FD SB queue. (via setpci or pciraw)\n 3. dump a number of filters on the ring via ethtool -N <iface>\n 4. shut down interface via ifconfig <iface> down\n\n drivers/net/ethernet/intel/i40e/i40e_txrx.c | 8 ++++----\n drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 8 ++++----\n 2 files changed, 8 insertions(+), 8 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c\nindex 7ada05e..a2077be 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c\n@@ -532,7 +532,10 @@ static void i40e_unmap_and_free_tx_resource(struct i40e_ring *ring,\n \t\t\t\t\t struct i40e_tx_buffer *tx_buffer)\n {\n \tif (tx_buffer->skb) {\n-\t\tdev_kfree_skb_any(tx_buffer->skb);\n+\t\tif (tx_buffer->tx_flags & I40E_TX_FLAGS_FD_SB)\n+\t\t\tkfree(tx_buffer->raw_buf);\n+\t\telse\n+\t\t\tdev_kfree_skb_any(tx_buffer->skb);\n \t\tif (dma_unmap_len(tx_buffer, len))\n \t\t\tdma_unmap_single(ring->dev,\n \t\t\t\t\t dma_unmap_addr(tx_buffer, dma),\n@@ -545,9 +548,6 @@ static void i40e_unmap_and_free_tx_resource(struct i40e_ring *ring,\n \t\t\t DMA_TO_DEVICE);\n \t}\n \n-\tif (tx_buffer->tx_flags & I40E_TX_FLAGS_FD_SB)\n-\t\tkfree(tx_buffer->raw_buf);\n-\n \ttx_buffer->next_to_watch = NULL;\n \ttx_buffer->skb = NULL;\n \tdma_unmap_len_set(tx_buffer, len, 0);\ndiff --git a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c\nindex e3427eb..cb6b130 100644\n--- a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c\n+++ b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c\n@@ -51,7 +51,10 @@ static void i40e_unmap_and_free_tx_resource(struct i40e_ring *ring,\n \t\t\t\t\t struct i40e_tx_buffer *tx_buffer)\n {\n \tif (tx_buffer->skb) {\n-\t\tdev_kfree_skb_any(tx_buffer->skb);\n+\t\tif (tx_buffer->tx_flags & I40E_TX_FLAGS_FD_SB)\n+\t\t\tkfree(tx_buffer->raw_buf);\n+\t\telse\n+\t\t\tdev_kfree_skb_any(tx_buffer->skb);\n \t\tif (dma_unmap_len(tx_buffer, len))\n \t\t\tdma_unmap_single(ring->dev,\n \t\t\t\t\t dma_unmap_addr(tx_buffer, dma),\n@@ -64,9 +67,6 @@ static void i40e_unmap_and_free_tx_resource(struct i40e_ring *ring,\n \t\t\t DMA_TO_DEVICE);\n \t}\n \n-\tif (tx_buffer->tx_flags & I40E_TX_FLAGS_FD_SB)\n-\t\tkfree(tx_buffer->raw_buf);\n-\n \ttx_buffer->next_to_watch = NULL;\n \ttx_buffer->skb = NULL;\n \tdma_unmap_len_set(tx_buffer, len, 0);\n", "prefixes": [ "next", "S46", "3/8" ] }