Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1086450/?format=api
{ "id": 1086450, "url": "http://patchwork.ozlabs.org/api/patches/1086450/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20190416172128.27184-7-anirudh.venkataramanan@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": "<20190416172128.27184-7-anirudh.venkataramanan@intel.com>", "list_archive_url": null, "date": "2019-04-16T17:21:19", "name": "[S18,06/15] ice: Always free/allocate q_vectors", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "b165e19dde1a9f302a4e51cd95475ca25055de58", "submitter": { "id": 73601, "url": "http://patchwork.ozlabs.org/api/people/73601/?format=api", "name": "Anirudh Venkataramanan", "email": "anirudh.venkataramanan@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/20190416172128.27184-7-anirudh.venkataramanan@intel.com/mbox/", "series": [ { "id": 103105, "url": "http://patchwork.ozlabs.org/api/series/103105/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=103105", "date": "2019-04-16T17:21:13", "name": "Fixes and feature updates for ice", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/103105/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1086450/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1086450/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\tspf=pass (mailfrom) smtp.mailfrom=osuosl.org\n\t(client-ip=140.211.166.136; helo=silver.osuosl.org;\n\tenvelope-from=intel-wired-lan-bounces@osuosl.org;\n\treceiver=<UNKNOWN>)", "ozlabs.org;\n\tdmarc=fail (p=none dis=none) header.from=intel.com" ], "Received": [ "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 44kBy102Xmz9s00\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 17 Apr 2019 03:22:16 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 4F6A822053;\n\tTue, 16 Apr 2019 17:22: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 CjstvywmTuyo; Tue, 16 Apr 2019 17:22:10 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id CEF5924F56;\n\tTue, 16 Apr 2019 17:22:09 +0000 (UTC)", "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id 0A0E01BF28D\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 16 Apr 2019 17:22:06 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 0664D86DFF\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 16 Apr 2019 17:22:06 +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 1tXGMjmQ3Igq for <intel-wired-lan@lists.osuosl.org>;\n\tTue, 16 Apr 2019 17:22:03 +0000 (UTC)", "from mga11.intel.com (mga11.intel.com [192.55.52.93])\n\tby whitealder.osuosl.org (Postfix) with ESMTPS id 3FBB287055\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 16 Apr 2019 17:22:02 +0000 (UTC)", "from fmsmga006.fm.intel.com ([10.253.24.20])\n\tby fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t16 Apr 2019 10:22:02 -0700", "from shasta.jf.intel.com ([10.166.244.191])\n\tby fmsmga006.fm.intel.com with ESMTP; 16 Apr 2019 10:22:01 -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-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.60,358,1549958400\"; d=\"scan'208\";a=\"338040567\"", "From": "Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Tue, 16 Apr 2019 10:21:19 -0700", "Message-Id": "<20190416172128.27184-7-anirudh.venkataramanan@intel.com>", "X-Mailer": "git-send-email 2.20.1", "In-Reply-To": "<20190416172128.27184-1-anirudh.venkataramanan@intel.com>", "References": "<20190416172128.27184-1-anirudh.venkataramanan@intel.com>", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [PATCH S18 06/15] ice: Always free/allocate\n\tq_vectors", "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\t<intel-wired-lan.osuosl.org>", "List-Unsubscribe": "<https://lists.osuosl.org/mailman/options/intel-wired-lan>, \n\t<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\t<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: Brett Creeley <brett.creeley@intel.com>\n\nCurrently when probing/removing the driver we allocate/deallocate\neach vsi->q_vectors array in ice_vsi_alloc_arrays() and\nice_vsi_free_arrays() respectively. However, we don't do this\nduring the reset and VSI rebuild flow. This is inconsistent\nand unnecessary to have a difference between the two flows.\n\nThis patch makes the change to always allocate/deallocate the\nvsi->q_vectors array regardless of the driver flow we are in.\n\nAlso, update the comment for ice_vsi_free_arrays() to be more\ndescriptive.\n\nSigned-off-by: Brett Creeley <brett.creeley@intel.com>\nSigned-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>\n---\n drivers/net/ethernet/intel/ice/ice_lib.c | 34 ++++++++++--------------\n 1 file changed, 14 insertions(+), 20 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ice/ice_lib.c b/drivers/net/ethernet/intel/ice/ice_lib.c\nindex caa00e8873ec..7a88bf639376 100644\n--- a/drivers/net/ethernet/intel/ice/ice_lib.c\n+++ b/drivers/net/ethernet/intel/ice/ice_lib.c\n@@ -232,12 +232,11 @@ static int ice_vsi_ctrl_rx_rings(struct ice_vsi *vsi, bool ena)\n /**\n * ice_vsi_alloc_arrays - Allocate queue and vector pointer arrays for the VSI\n * @vsi: VSI pointer\n- * @alloc_qvectors: a bool to specify if q_vectors need to be allocated.\n *\n * On error: returns error code (negative)\n * On success: returns 0\n */\n-static int ice_vsi_alloc_arrays(struct ice_vsi *vsi, bool alloc_qvectors)\n+static int ice_vsi_alloc_arrays(struct ice_vsi *vsi)\n {\n \tstruct ice_pf *pf = vsi->back;\n \n@@ -252,15 +251,11 @@ static int ice_vsi_alloc_arrays(struct ice_vsi *vsi, bool alloc_qvectors)\n \tif (!vsi->rx_rings)\n \t\tgoto err_rxrings;\n \n-\tif (alloc_qvectors) {\n-\t\t/* allocate memory for q_vector pointers */\n-\t\tvsi->q_vectors = devm_kcalloc(&pf->pdev->dev,\n-\t\t\t\t\t vsi->num_q_vectors,\n-\t\t\t\t\t sizeof(*vsi->q_vectors),\n-\t\t\t\t\t GFP_KERNEL);\n-\t\tif (!vsi->q_vectors)\n-\t\t\tgoto err_vectors;\n-\t}\n+\t/* allocate memory for q_vector pointers */\n+\tvsi->q_vectors = devm_kcalloc(&pf->pdev->dev, vsi->num_q_vectors,\n+\t\t\t\t sizeof(*vsi->q_vectors), GFP_KERNEL);\n+\tif (!vsi->q_vectors)\n+\t\tgoto err_vectors;\n \n \treturn 0;\n \n@@ -389,16 +384,15 @@ void ice_vsi_delete(struct ice_vsi *vsi)\n }\n \n /**\n- * ice_vsi_free_arrays - clean up VSI resources\n+ * ice_vsi_free_arrays - De-allocate queue and vector pointer arrays for the VSI\n * @vsi: pointer to VSI being cleared\n- * @free_qvectors: bool to specify if q_vectors should be deallocated\n */\n-static void ice_vsi_free_arrays(struct ice_vsi *vsi, bool free_qvectors)\n+static void ice_vsi_free_arrays(struct ice_vsi *vsi)\n {\n \tstruct ice_pf *pf = vsi->back;\n \n \t/* free the ring and vector containers */\n-\tif (free_qvectors && vsi->q_vectors) {\n+\tif (vsi->q_vectors) {\n \t\tdevm_kfree(&pf->pdev->dev, vsi->q_vectors);\n \t\tvsi->q_vectors = NULL;\n \t}\n@@ -446,7 +440,7 @@ int ice_vsi_clear(struct ice_vsi *vsi)\n \tif (vsi->idx < pf->next_vsi)\n \t\tpf->next_vsi = vsi->idx;\n \n-\tice_vsi_free_arrays(vsi, true);\n+\tice_vsi_free_arrays(vsi);\n \tmutex_unlock(&pf->sw_mutex);\n \tdevm_kfree(&pf->pdev->dev, vsi);\n \n@@ -512,14 +506,14 @@ ice_vsi_alloc(struct ice_pf *pf, enum ice_vsi_type type, u16 vf_id)\n \n \tswitch (vsi->type) {\n \tcase ICE_VSI_PF:\n-\t\tif (ice_vsi_alloc_arrays(vsi, true))\n+\t\tif (ice_vsi_alloc_arrays(vsi))\n \t\t\tgoto err_rings;\n \n \t\t/* Setup default MSIX irq handler for VSI */\n \t\tvsi->irq_handler = ice_msix_clean_rings;\n \t\tbreak;\n \tcase ICE_VSI_VF:\n-\t\tif (ice_vsi_alloc_arrays(vsi, true))\n+\t\tif (ice_vsi_alloc_arrays(vsi))\n \t\t\tgoto err_rings;\n \t\tbreak;\n \tdefault:\n@@ -2809,7 +2803,7 @@ int ice_vsi_rebuild(struct ice_vsi *vsi)\n \tvsi->hw_base_vector = 0;\n \n \tice_vsi_clear_rings(vsi);\n-\tice_vsi_free_arrays(vsi, false);\n+\tice_vsi_free_arrays(vsi);\n \tice_dev_onetime_setup(&pf->hw);\n \tif (vsi->type == ICE_VSI_VF)\n \t\tice_vsi_set_num_qs(vsi, vf->vf_id);\n@@ -2822,7 +2816,7 @@ int ice_vsi_rebuild(struct ice_vsi *vsi)\n \tif (ret < 0)\n \t\tgoto err_vsi;\n \n-\tret = ice_vsi_alloc_arrays(vsi, false);\n+\tret = ice_vsi_alloc_arrays(vsi);\n \tif (ret < 0)\n \t\tgoto err_vsi;\n \n", "prefixes": [ "S18", "06/15" ] }