Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1291748/?format=api
{ "id": 1291748, "url": "http://patchwork.ozlabs.org/api/patches/1291748/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20200516003644.4658-14-anthony.l.nguyen@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": "<20200516003644.4658-14-anthony.l.nguyen@intel.com>", "list_archive_url": null, "date": "2020-05-16T00:36:43", "name": "[S43,14/15] ice: Fix for memory leaks and modify ICE_FREE_CQ_BUFS", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "2f2c3d6b900874ac1a8ff98dce551daf9a59061e", "submitter": { "id": 68875, "url": "http://patchwork.ozlabs.org/api/people/68875/?format=api", "name": "Tony Nguyen", "email": "anthony.l.nguyen@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/20200516003644.4658-14-anthony.l.nguyen@intel.com/mbox/", "series": [ { "id": 177325, "url": "http://patchwork.ozlabs.org/api/series/177325/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=177325", "date": "2020-05-16T00:36:39", "name": "[S43,01/15] ice: Call ice_aq_set_mac_cfg", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/177325/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1291748/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1291748/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<intel-wired-lan-bounces@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" ], "Authentication-Results": [ "ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=osuosl.org\n (client-ip=140.211.166.133; helo=hemlock.osuosl.org;\n envelope-from=intel-wired-lan-bounces@osuosl.org; receiver=<UNKNOWN>)", "ozlabs.org;\n dmarc=fail (p=none dis=none) header.from=intel.com" ], "Received": [ "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 49P5yG0Rk3z9sTM\n\tfor <incoming@patchwork.ozlabs.org>; Sat, 16 May 2020 10:39:34 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 7414C89A8E;\n\tSat, 16 May 2020 00:39:32 +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 zbhR4JqdGLNh; Sat, 16 May 2020 00:39:30 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id A8FD589A87;\n\tSat, 16 May 2020 00:39:30 +0000 (UTC)", "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n by ash.osuosl.org (Postfix) with ESMTP id 11D221BF9C8\n for <intel-wired-lan@lists.osuosl.org>; Sat, 16 May 2020 00:39:23 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n by whitealder.osuosl.org (Postfix) with ESMTP id 0EFED8771C\n for <intel-wired-lan@lists.osuosl.org>; Sat, 16 May 2020 00:39:23 +0000 (UTC)", "from whitealder.osuosl.org ([127.0.0.1])\n by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n with ESMTP id Hq48l1qvKgrk for <intel-wired-lan@lists.osuosl.org>;\n Sat, 16 May 2020 00:39:20 +0000 (UTC)", "from mga14.intel.com (mga14.intel.com [192.55.52.115])\n by whitealder.osuosl.org (Postfix) with ESMTPS id 4978787CB6\n for <intel-wired-lan@lists.osuosl.org>; Sat, 16 May 2020 00:39:20 +0000 (UTC)", "from fmsmga003.fm.intel.com ([10.253.24.29])\n by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 15 May 2020 17:39:19 -0700", "from unknown (HELO localhost.jf.intel.com) ([10.166.241.65])\n by FMSMGA003.fm.intel.com with ESMTP; 15 May 2020 17:39:19 -0700" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "IronPort-SDR": [ "\n 9nN9cyLUc9cP67KKS+Noxe7w+Fs8veYg4I1cC2BK9DXvMDIx4gbZHQWcDJmQGX2ucVfhCBlD0R\n UwhhVYaozICw==", "\n RQphhPBmKKWsAEg9vHqt4bWFFfXrhUGTyBvlpaOXhnmaDFKa6PRe1oPQ+RUyPjoOF1H/9mFwBv\n DtjrFMjweAUw==" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.73,397,1583222400\"; d=\"scan'208\";a=\"307560871\"", "From": "Tony Nguyen <anthony.l.nguyen@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Fri, 15 May 2020 17:36:43 -0700", "Message-Id": "<20200516003644.4658-14-anthony.l.nguyen@intel.com>", "X-Mailer": "git-send-email 2.20.1", "In-Reply-To": "<20200516003644.4658-1-anthony.l.nguyen@intel.com>", "References": "<20200516003644.4658-1-anthony.l.nguyen@intel.com>", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [PATCH S43 14/15] ice: Fix for memory leaks and\n modify ICE_FREE_CQ_BUFS", "X-BeenThere": "intel-wired-lan@osuosl.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "Intel Wired Ethernet Linux Kernel Driver Development\n <intel-wired-lan.osuosl.org>", "List-Unsubscribe": "<https://lists.osuosl.org/mailman/options/intel-wired-lan>,\n <mailto:intel-wired-lan-request@osuosl.org?subject=unsubscribe>", "List-Archive": "<http://lists.osuosl.org/pipermail/intel-wired-lan/>", "List-Post": "<mailto:intel-wired-lan@osuosl.org>", "List-Help": "<mailto:intel-wired-lan-request@osuosl.org?subject=help>", "List-Subscribe": "<https://lists.osuosl.org/mailman/listinfo/intel-wired-lan>,\n <mailto:intel-wired-lan-request@osuosl.org?subject=subscribe>", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "intel-wired-lan-bounces@osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@osuosl.org>" }, "content": "From: Surabhi Boob <surabhi.boob@intel.com>\n\nHandle memory leaks during control queue initialization and\nbuffer allocation failures. The macro ICE_FREE_CQ_BUFS is modified to\nre-use for this fix.\n\nSigned-off-by: Surabhi Boob <surabhi.boob@intel.com>\nSigned-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>\n---\n drivers/net/ethernet/intel/ice/ice_controlq.c | 49 +++++++++++--------\n 1 file changed, 28 insertions(+), 21 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ice/ice_controlq.c b/drivers/net/ethernet/intel/ice/ice_controlq.c\nindex 9a865962296d..62c2c1e621d2 100644\n--- a/drivers/net/ethernet/intel/ice/ice_controlq.c\n+++ b/drivers/net/ethernet/intel/ice/ice_controlq.c\n@@ -199,7 +199,9 @@ ice_alloc_rq_bufs(struct ice_hw *hw, struct ice_ctl_q_info *cq)\n \t\tcq->rq.r.rq_bi[i].pa = 0;\n \t\tcq->rq.r.rq_bi[i].size = 0;\n \t}\n+\tcq->rq.r.rq_bi = NULL;\n \tdevm_kfree(ice_hw_to_dev(hw), cq->rq.dma_head);\n+\tcq->rq.dma_head = NULL;\n \n \treturn ICE_ERR_NO_MEMORY;\n }\n@@ -245,7 +247,9 @@ ice_alloc_sq_bufs(struct ice_hw *hw, struct ice_ctl_q_info *cq)\n \t\tcq->sq.r.sq_bi[i].pa = 0;\n \t\tcq->sq.r.sq_bi[i].size = 0;\n \t}\n+\tcq->sq.r.sq_bi = NULL;\n \tdevm_kfree(ice_hw_to_dev(hw), cq->sq.dma_head);\n+\tcq->sq.dma_head = NULL;\n \n \treturn ICE_ERR_NO_MEMORY;\n }\n@@ -304,6 +308,28 @@ ice_cfg_rq_regs(struct ice_hw *hw, struct ice_ctl_q_info *cq)\n \treturn 0;\n }\n \n+#define ICE_FREE_CQ_BUFS(hw, qi, ring)\t\t\t\t\t\\\n+do {\t\t\t\t\t\t\t\t\t\\\n+\tint i;\t\t\t\t\t\t\t\t\\\n+\t/* free descriptors */\t\t\t\t\t\t\\\n+\tif ((qi)->ring.r.ring##_bi)\t\t\t\t\t\\\n+\t\tfor (i = 0; i < (qi)->num_##ring##_entries; i++)\t\\\n+\t\t\tif ((qi)->ring.r.ring##_bi[i].pa) {\t\t\\\n+\t\t\t\tdmam_free_coherent(ice_hw_to_dev(hw),\t\\\n+\t\t\t\t\t(qi)->ring.r.ring##_bi[i].size,\t\\\n+\t\t\t\t\t(qi)->ring.r.ring##_bi[i].va,\t\\\n+\t\t\t\t\t(qi)->ring.r.ring##_bi[i].pa);\t\\\n+\t\t\t\t\t(qi)->ring.r.ring##_bi[i].va = NULL;\\\n+\t\t\t\t\t(qi)->ring.r.ring##_bi[i].pa = 0;\\\n+\t\t\t\t\t(qi)->ring.r.ring##_bi[i].size = 0;\\\n+\t\t}\t\t\t\t\t\t\t\\\n+\t/* free the buffer info list */\t\t\t\t\t\\\n+\tif ((qi)->ring.cmd_buf)\t\t\t\t\t\t\\\n+\t\tdevm_kfree(ice_hw_to_dev(hw), (qi)->ring.cmd_buf);\t\\\n+\t/* free DMA head */\t\t\t\t\t\t\\\n+\tdevm_kfree(ice_hw_to_dev(hw), (qi)->ring.dma_head);\t\t\\\n+} while (0)\n+\n /**\n * ice_init_sq - main initialization routine for Control ATQ\n * @hw: pointer to the hardware structure\n@@ -357,6 +383,7 @@ static enum ice_status ice_init_sq(struct ice_hw *hw, struct ice_ctl_q_info *cq)\n \tgoto init_ctrlq_exit;\n \n init_ctrlq_free_rings:\n+\tICE_FREE_CQ_BUFS(hw, cq, sq);\n \tice_free_cq_ring(hw, &cq->sq);\n \n init_ctrlq_exit:\n@@ -416,33 +443,13 @@ static enum ice_status ice_init_rq(struct ice_hw *hw, struct ice_ctl_q_info *cq)\n \tgoto init_ctrlq_exit;\n \n init_ctrlq_free_rings:\n+\tICE_FREE_CQ_BUFS(hw, cq, rq);\n \tice_free_cq_ring(hw, &cq->rq);\n \n init_ctrlq_exit:\n \treturn ret_code;\n }\n \n-#define ICE_FREE_CQ_BUFS(hw, qi, ring)\t\t\t\t\t\\\n-do {\t\t\t\t\t\t\t\t\t\\\n-\tint i;\t\t\t\t\t\t\t\t\\\n-\t/* free descriptors */\t\t\t\t\t\t\\\n-\tfor (i = 0; i < (qi)->num_##ring##_entries; i++)\t\t\\\n-\t\tif ((qi)->ring.r.ring##_bi[i].pa) {\t\t\t\\\n-\t\t\tdmam_free_coherent(ice_hw_to_dev(hw),\t\t\\\n-\t\t\t\t\t (qi)->ring.r.ring##_bi[i].size,\\\n-\t\t\t\t\t (qi)->ring.r.ring##_bi[i].va,\\\n-\t\t\t\t\t (qi)->ring.r.ring##_bi[i].pa);\\\n-\t\t\t(qi)->ring.r.ring##_bi[i].va = NULL;\t\t\\\n-\t\t\t(qi)->ring.r.ring##_bi[i].pa = 0;\t\t\\\n-\t\t\t(qi)->ring.r.ring##_bi[i].size = 0;\t\t\\\n-\t\t}\t\t\t\t\t\t\t\\\n-\t/* free the buffer info list */\t\t\t\t\t\\\n-\tif ((qi)->ring.cmd_buf)\t\t\t\t\t\t\\\n-\t\tdevm_kfree(ice_hw_to_dev(hw), (qi)->ring.cmd_buf);\t\\\n-\t/* free DMA head */\t\t\t\t\t\t\\\n-\tdevm_kfree(ice_hw_to_dev(hw), (qi)->ring.dma_head);\t\t\\\n-} while (0)\n-\n /**\n * ice_shutdown_sq - shutdown the Control ATQ\n * @hw: pointer to the hardware structure\n", "prefixes": [ "S43", "14/15" ] }