Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/541155/?format=api
{ "id": 541155, "url": "http://patchwork.ozlabs.org/api/patches/541155/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1446852372-25480-6-git-send-email-joshua.a.hay@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": "<1446852372-25480-6-git-send-email-joshua.a.hay@intel.com>", "list_archive_url": null, "date": "2015-11-06T23:26:03", "name": "[next,S21,05/14] i40e: Fix memory leaks, sideband filter programming", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "91a9c9593eef4c1e33463c4dca651b6e603f0d7e", "submitter": { "id": 19461, "url": "http://patchwork.ozlabs.org/api/people/19461/?format=api", "name": "Joshua Hay", "email": "joshua.a.hay@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/1446852372-25480-6-git-send-email-joshua.a.hay@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/541155/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/541155/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 silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ozlabs.org (Postfix) with ESMTP id 2CFE514016A\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat, 7 Nov 2015 10:26:38 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 55DFC33279;\n\tFri, 6 Nov 2015 23:26:37 +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 u8eeohmGlF2P; Fri, 6 Nov 2015 23:26:33 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id C5700332D5;\n\tFri, 6 Nov 2015 23:26:27 +0000 (UTC)", "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\tby ash.osuosl.org (Postfix) with ESMTP id 14A921C09CC\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 6 Nov 2015 23:26:24 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 10061A3EB9\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 6 Nov 2015 23:26:24 +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 VN5-Hr5YSuGv for <intel-wired-lan@lists.osuosl.org>;\n\tFri, 6 Nov 2015 23:26:15 +0000 (UTC)", "from mga03.intel.com (mga03.intel.com [134.134.136.65])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 9BC55A3ED3\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 6 Nov 2015 23:26:13 +0000 (UTC)", "from fmsmga003.fm.intel.com ([10.253.24.29])\n\tby orsmga103.jf.intel.com with ESMTP; 06 Nov 2015 15:26:13 -0800", "from jahay1-mobl2.amr.corp.intel.com (HELO\n\tlocalhost.localdomain.localdomain) ([134.134.176.151])\n\tby FMSMGA003.fm.intel.com with ESMTP; 06 Nov 2015 15:26:13 -0800" ], "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.20,254,1444719600\"; d=\"scan'208\";a=\"595575985\"", "From": "Joshua Hay <joshua.a.hay@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Fri, 6 Nov 2015 15:26:03 -0800", "Message-Id": "<1446852372-25480-6-git-send-email-joshua.a.hay@intel.com>", "X-Mailer": "git-send-email 2.1.0", "In-Reply-To": "<1446852372-25480-1-git-send-email-joshua.a.hay@intel.com>", "References": "<1446852372-25480-1-git-send-email-joshua.a.hay@intel.com>", "Subject": "[Intel-wired-lan] [next PATCH S21 05/14] i40e: Fix memory leaks,\n\tsideband filter programming", "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: Kiran Patil <kiran.patil@intel.com>\n\nThis patch fixes the memory leak which would be seen otherwise when user\nprograms flow-director filter using ethtool (sideband filter programming).\n\nWhen ethtool is used to program flow directory filter, 'raw_buf' gets\nallocated and it is supposed to be freed as part of queue cleanup. But\ncheck of 'tx_buffer->skb' was preventing it from being freed.\n\nSigned-off-by: Kiran Patil <kiran.patil@intel.com>\nChange-ID: Ief4f0a1a32a653180498bf6e987c1b4342ab8923\n---\n drivers/net/ethernet/intel/i40e/i40e_txrx.c | 19 ++++++++++++++-----\n drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 10 +++++-----\n 2 files changed, 19 insertions(+), 10 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c\nindex 9be0a90..a22efca 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c\n@@ -235,6 +235,9 @@ static int i40e_add_del_fdir_udpv4(struct i40e_vsi *vsi,\n \t\t\t\t \"Filter deleted for PCTYPE %d loc = %d\\n\",\n \t\t\t\t fd_data->pctype, fd_data->fd_id);\n \t}\n+\tif (err)\n+\t\tkfree(raw_packet);\n+\n \treturn err ? -EOPNOTSUPP : 0;\n }\n \n@@ -312,6 +315,9 @@ static int i40e_add_del_fdir_tcpv4(struct i40e_vsi *vsi,\n \t\t\t\t fd_data->pctype, fd_data->fd_id);\n \t}\n \n+\tif (err)\n+\t\tkfree(raw_packet);\n+\n \treturn err ? -EOPNOTSUPP : 0;\n }\n \n@@ -387,6 +393,9 @@ static int i40e_add_del_fdir_ipv4(struct i40e_vsi *vsi,\n \t\t}\n \t}\n \n+\tif (err)\n+\t\tkfree(raw_packet);\n+\n \treturn err ? -EOPNOTSUPP : 0;\n }\n \n@@ -526,11 +535,7 @@ 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\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-\n+\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@@ -542,6 +547,10 @@ static void i40e_unmap_and_free_tx_resource(struct i40e_ring *ring,\n \t\t\t dma_unmap_len(tx_buffer, len),\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 3a531fe..4e6aacb 100644\n--- a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c\n+++ b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c\n@@ -51,11 +51,7 @@ 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\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-\n+\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@@ -67,6 +63,10 @@ static void i40e_unmap_and_free_tx_resource(struct i40e_ring *ring,\n \t\t\t dma_unmap_len(tx_buffer, len),\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", "S21", "05/14" ] }