Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1291775/?format=api
{ "id": 1291775, "url": "http://patchwork.ozlabs.org/api/patches/1291775/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20200516005121.4963-10-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": "<20200516005121.4963-10-anthony.l.nguyen@intel.com>", "list_archive_url": null, "date": "2020-05-16T00:51:16", "name": "[S45,10/15] ice: Refactor VF VSI release and setup functions", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "abf3bda3229ffb746556b73817b6e4d97def6600", "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/20200516005121.4963-10-anthony.l.nguyen@intel.com/mbox/", "series": [ { "id": 177330, "url": "http://patchwork.ozlabs.org/api/series/177330/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=177330", "date": "2020-05-16T00:51:18", "name": "[S45,01/15] ice: Refactor ice_ena_vf_mappings to split MSIX and queue mappings", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/177330/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1291775/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1291775/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.137; helo=fraxinus.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 fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\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 49P6H04nnBz9sTN\n\tfor <incoming@patchwork.ozlabs.org>; Sat, 16 May 2020 10:54:04 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 0286288017;\n\tSat, 16 May 2020 00:54:03 +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 436yXx308pBL; Sat, 16 May 2020 00:54:01 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 3CA4687F8B;\n\tSat, 16 May 2020 00:54:01 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n by ash.osuosl.org (Postfix) with ESMTP id 326FA1BF9C6\n for <intel-wired-lan@lists.osuosl.org>; Sat, 16 May 2020 00:53:58 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n by silver.osuosl.org (Postfix) with ESMTP id 2E66122731\n for <intel-wired-lan@lists.osuosl.org>; Sat, 16 May 2020 00:53:58 +0000 (UTC)", "from silver.osuosl.org ([127.0.0.1])\n by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n with ESMTP id 3caOV69zLvOe for <intel-wired-lan@lists.osuosl.org>;\n Sat, 16 May 2020 00:53:56 +0000 (UTC)", "from mga18.intel.com (mga18.intel.com [134.134.136.126])\n by silver.osuosl.org (Postfix) with ESMTPS id B38AC22622\n for <intel-wired-lan@lists.osuosl.org>; Sat, 16 May 2020 00:53:56 +0000 (UTC)", "from orsmga003.jf.intel.com ([10.7.209.27])\n by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 15 May 2020 17:53:54 -0700", "from unknown (HELO localhost.jf.intel.com) ([10.166.241.65])\n by orsmga003.jf.intel.com with ESMTP; 15 May 2020 17:53:54 -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 09x4UUFKOX6WAwSpbGqoDqFQ+ZO/jISyu7JXwm509MYoFmrbjF+OTqZ5cyTWcbRBPUYbN7tWnN\n Ny2Xa+vrg5zQ==", "\n BuQUzi5zRMgfFzzUq6vg649z5TX8x6Bm1jbCmd9p7ejsfj1Hd3mTbXPAf20sybF4bN6pQdtjdh\n 2awfzeWLfTmg==" ], "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=\"263360546\"", "From": "Tony Nguyen <anthony.l.nguyen@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Fri, 15 May 2020 17:51:16 -0700", "Message-Id": "<20200516005121.4963-10-anthony.l.nguyen@intel.com>", "X-Mailer": "git-send-email 2.20.1", "In-Reply-To": "<20200516005121.4963-1-anthony.l.nguyen@intel.com>", "References": "<20200516005121.4963-1-anthony.l.nguyen@intel.com>", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [PATCH S45 10/15] ice: Refactor VF VSI release\n and setup functions", "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: Brett Creeley <brett.creeley@intel.com>\n\nCurrently when a VF VSI calls ice_vsi_release() and ice_vsi_setup() it\nsubsequently clears/sets the VF cached variables for lan_vsi_idx and\nlan_vsi_num. This works fine, but can be improved by handling this in\nthe VF specific VSI release and setup functions.\n\nAlso, when a VF VSI is setup too many parameters are passed that can be\nderived from the VF. Fix this by only calling VF VSI setup with the bare\nminimum parameters.\n\nAlso, add functionality to invalidate a VF's VSI when it's released\nand/or setup fails. This will make it so a VF VSI cannot be accessed via\nits cached vsi_idx/vsi_num in these cases.\n\nFinally when a VF's VSI is invalidated set the lan_vsi_idx and\nlan_vsi_num to ICE_NO_VSI to clearly show that there is no valid VSI\nassociated with this VF.\n\nSigned-off-by: Brett Creeley <brett.creeley@intel.com>\n---\n .../net/ethernet/intel/ice/ice_virtchnl_pf.c | 86 ++++++++++++-------\n 1 file changed, 55 insertions(+), 31 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c\nindex 9cd9904815b9..f5596b45b996 100644\n--- a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c\n+++ b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c\n@@ -181,6 +181,26 @@ static void ice_vc_notify_vf_link_state(struct ice_vf *vf)\n \t\t\t sizeof(pfe), NULL);\n }\n \n+/**\n+ * ice_vf_invalidate_vsi - invalidate vsi_idx/vsi_num to remove VSI access\n+ * @vf: VF to remove access to VSI for\n+ */\n+static void ice_vf_invalidate_vsi(struct ice_vf *vf)\n+{\n+\tvf->lan_vsi_idx = ICE_NO_VSI;\n+\tvf->lan_vsi_num = ICE_NO_VSI;\n+}\n+\n+/**\n+ * ice_vf_vsi_release - invalidate the VF's VSI after freeing it\n+ * @vf: invalidate this VF's VSI after freeing it\n+ */\n+static void ice_vf_vsi_release(struct ice_vf *vf)\n+{\n+\tice_vsi_release(vf->pf->vsi[vf->lan_vsi_idx]);\n+\tice_vf_invalidate_vsi(vf);\n+}\n+\n /**\n * ice_free_vf_res - Free a VF's resources\n * @vf: pointer to the VF info\n@@ -196,10 +216,8 @@ static void ice_free_vf_res(struct ice_vf *vf)\n \tclear_bit(ICE_VF_STATE_INIT, vf->vf_states);\n \n \t/* free VSI and disconnect it from the parent uplink */\n-\tif (vf->lan_vsi_idx) {\n-\t\tice_vsi_release(pf->vsi[vf->lan_vsi_idx]);\n-\t\tvf->lan_vsi_idx = 0;\n-\t\tvf->lan_vsi_num = 0;\n+\tif (vf->lan_vsi_idx != ICE_NO_VSI) {\n+\t\tice_vf_vsi_release(vf);\n \t\tvf->num_mac = 0;\n \t}\n \n@@ -505,19 +523,40 @@ static int ice_vsi_manage_pvid(struct ice_vsi *vsi, u16 pvid_info, bool enable)\n \treturn ret;\n }\n \n+/**\n+ * ice_vf_get_port_info - Get the VF's port info structure\n+ * @vf: VF used to get the port info structure for\n+ */\n+static struct ice_port_info *ice_vf_get_port_info(struct ice_vf *vf)\n+{\n+\treturn vf->pf->hw.port_info;\n+}\n+\n /**\n * ice_vf_vsi_setup - Set up a VF VSI\n- * @pf: board private structure\n- * @pi: pointer to the port_info instance\n- * @vf_id: defines VF ID to which this VSI connects.\n+ * @vf: VF to setup VSI for\n *\n * Returns pointer to the successfully allocated VSI struct on success,\n * otherwise returns NULL on failure.\n */\n-static struct ice_vsi *\n-ice_vf_vsi_setup(struct ice_pf *pf, struct ice_port_info *pi, u16 vf_id)\n+static struct ice_vsi *ice_vf_vsi_setup(struct ice_vf *vf)\n {\n-\treturn ice_vsi_setup(pf, pi, ICE_VSI_VF, vf_id);\n+\tstruct ice_port_info *pi = ice_vf_get_port_info(vf);\n+\tstruct ice_pf *pf = vf->pf;\n+\tstruct ice_vsi *vsi;\n+\n+\tvsi = ice_vsi_setup(pf, pi, ICE_VSI_VF, vf->vf_id);\n+\n+\tif (!vsi) {\n+\t\tdev_err(ice_pf_to_dev(pf), \"Failed to create VF VSI\\n\");\n+\t\tice_vf_invalidate_vsi(vf);\n+\t\treturn NULL;\n+\t}\n+\n+\tvf->lan_vsi_idx = vsi->idx;\n+\tvf->lan_vsi_num = vsi->vsi_num;\n+\n+\treturn vsi;\n }\n \n /**\n@@ -1043,19 +1082,9 @@ static void ice_vf_rebuild_host_cfg(struct ice_vf *vf)\n */\n static int ice_vf_rebuild_vsi_with_release(struct ice_vf *vf)\n {\n-\tstruct ice_pf *pf = vf->pf;\n-\tstruct ice_vsi *vsi;\n-\n-\tvsi = pf->vsi[vf->lan_vsi_idx];\n-\tice_vsi_release(vsi);\n-\tvsi = ice_vf_vsi_setup(pf, pf->hw.port_info, vf->vf_id);\n-\tif (!vsi) {\n-\t\tdev_err(ice_pf_to_dev(pf), \"Failed to create VF VSI\\n\");\n+\tice_vf_vsi_release(vf);\n+\tif (!ice_vf_vsi_setup(vf))\n \t\treturn -ENOMEM;\n-\t}\n-\n-\tvf->lan_vsi_idx = vsi->idx;\n-\tvf->lan_vsi_num = vsi->vsi_num;\n \n \treturn 0;\n }\n@@ -1395,14 +1424,9 @@ static int ice_init_vf_vsi_res(struct ice_vf *vf)\n \tvf->first_vector_idx = ice_calc_vf_first_vector_idx(pf, vf);\n \n \tdev = ice_pf_to_dev(pf);\n-\tvsi = ice_vf_vsi_setup(pf, pf->hw.port_info, vf->vf_id);\n-\tif (!vsi) {\n-\t\tdev_err(dev, \"Failed to create VF VSI\\n\");\n+\tvsi = ice_vf_vsi_setup(vf);\n+\tif (!vsi)\n \t\treturn -ENOMEM;\n-\t}\n-\n-\tvf->lan_vsi_idx = vsi->idx;\n-\tvf->lan_vsi_num = vsi->vsi_num;\n \n \terr = ice_vsi_add_vlan(vsi, 0, ICE_FWD_TO_VSI);\n \tif (err) {\n@@ -1425,7 +1449,7 @@ static int ice_init_vf_vsi_res(struct ice_vf *vf)\n \treturn 0;\n \n release_vsi:\n-\tice_vsi_release(vsi);\n+\tice_vf_vsi_release(vf);\n \treturn err;\n }\n \n@@ -1463,7 +1487,7 @@ static int ice_start_vfs(struct ice_pf *pf)\n \t\tstruct ice_vf *vf = &pf->vf[i];\n \n \t\tice_dis_vf_mappings(vf);\n-\t\tice_vsi_release(pf->vsi[vf->lan_vsi_idx]);\n+\t\tice_vf_vsi_release(vf);\n \t}\n \n \treturn retval;\n", "prefixes": [ "S45", "10/15" ] }