Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1291779/?format=api
{ "id": 1291779, "url": "http://patchwork.ozlabs.org/api/patches/1291779/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20200516005121.4963-4-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-4-anthony.l.nguyen@intel.com>", "list_archive_url": null, "date": "2020-05-16T00:51:10", "name": "[S45,04/15] ice: Separate VF VSI initialization/creation from reset flow", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "30cd2ff25d04fad9c8bcc3cdbb18701577735da9", "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-4-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/1291779/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1291779/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.136; helo=silver.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 silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\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 49P6H32FRmz9sTC\n\tfor <incoming@patchwork.ozlabs.org>; Sat, 16 May 2020 10:54:06 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id F19C6204BE;\n\tSat, 16 May 2020 00:54:04 +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 3ZuSK07NcDPR; Sat, 16 May 2020 00:54:01 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id EC3F822622;\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 7893B1BF9C6\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 70AD222622\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 mFwy84r070Ll 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 88405204BE\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 8CHlcOYIwJiWjo6EWtTLQJrhnPZCw7GX96pqHHwuzkCrt70Pjle0F4tXaFhA3eFb+IOv4rnISR\n i87yNdE3kb9A==", "\n FCXmfdWucHMFYRIvtiiAl9peArbrnCRNrbsbMr3JM4Qn0YnPULIWhAAVhtJ+elPLZ2zWUILcxp\n ulQ3N9tUR37w==" ], "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=\"263360540\"", "From": "Tony Nguyen <anthony.l.nguyen@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Fri, 15 May 2020 17:51:10 -0700", "Message-Id": "<20200516005121.4963-4-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 04/15] ice: Separate VF VSI\n initialization/creation from reset flow", "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 the same flow is used for VF VSI initialization/creation and VF\nVSI reset. This makes the initialization/creation flow unnecessarily\ncomplicated. Fix this by separating the initialization/creation of the\nVF VSI from the reset flow.\n\nSigned-off-by: Brett Creeley <brett.creeley@intel.com>\n---\n .../net/ethernet/intel/ice/ice_virtchnl_pf.c | 110 +++++++++++++++++-\n 1 file changed, 106 insertions(+), 4 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 18fe4cfe4443..5b9f01f1f65b 100644\n--- a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c\n+++ b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c\n@@ -1375,6 +1375,99 @@ static void ice_vc_notify_vf_reset(struct ice_vf *vf)\n \t\t\t NULL);\n }\n \n+/**\n+ * ice_init_vf_vsi_res - initialize/setup VF VSI resources\n+ * @vf: VF to initialize/setup the VSI for\n+ *\n+ * This function creates a VSI for the VF, adds a VLAN 0 filter, and sets up the\n+ * VF VSI's broadcast filter and is only used during initial VF creation.\n+ */\n+static int ice_init_vf_vsi_res(struct ice_vf *vf)\n+{\n+\tstruct ice_pf *pf = vf->pf;\n+\tu8 broadcast[ETH_ALEN];\n+\tenum ice_status status;\n+\tstruct ice_vsi *vsi;\n+\tstruct device *dev;\n+\tint err;\n+\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+\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+\t\tdev_warn(dev, \"Failed to add VLAN 0 filter for VF %d\\n\",\n+\t\t\t vf->vf_id);\n+\t\tgoto release_vsi;\n+\t}\n+\n+\teth_broadcast_addr(broadcast);\n+\tstatus = ice_fltr_add_mac(vsi, broadcast, ICE_FWD_TO_VSI);\n+\tif (status) {\n+\t\tdev_err(dev, \"Failed to add broadcast MAC filter for VF %d, status %s\\n\",\n+\t\t\tvf->vf_id, ice_stat_str(status));\n+\t\terr = ice_status_to_errno(status);\n+\t\tgoto release_vsi;\n+\t}\n+\n+\tvf->num_mac = 1;\n+\n+\treturn 0;\n+\n+release_vsi:\n+\tice_vsi_release(vsi);\n+\treturn err;\n+}\n+\n+/**\n+ * ice_start_vfs - start VFs so they are ready to be used by SR-IOV\n+ * @pf: PF the VFs are associated with\n+ */\n+static int ice_start_vfs(struct ice_pf *pf)\n+{\n+\tstruct ice_hw *hw = &pf->hw;\n+\tint retval, i;\n+\n+\tice_for_each_vf(pf, i) {\n+\t\tstruct ice_vf *vf = &pf->vf[i];\n+\n+\t\tice_clear_vf_reset_trigger(vf);\n+\n+\t\tretval = ice_init_vf_vsi_res(vf);\n+\t\tif (retval) {\n+\t\t\tdev_err(ice_pf_to_dev(pf), \"Failed to initialize VSI resources for VF %d, error %d\\n\",\n+\t\t\t\tvf->vf_id, retval);\n+\t\t\tgoto teardown;\n+\t\t}\n+\n+\t\tset_bit(ICE_VF_STATE_INIT, vf->vf_states);\n+\t\tice_ena_vf_mappings(vf);\n+\t\twr32(hw, VFGEN_RSTAT(vf->vf_id), VIRTCHNL_VFR_VFACTIVE);\n+\t}\n+\n+\tice_flush(hw);\n+\treturn 0;\n+\n+teardown:\n+\tfor (i = i - 1; i >= 0; i--) {\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}\n+\n+\treturn retval;\n+}\n+\n /**\n * ice_alloc_vfs - Allocate and set up VFs resources\n * @pf: pointer to the PF structure\n@@ -1407,6 +1500,13 @@ static int ice_alloc_vfs(struct ice_pf *pf, u16 num_alloc_vfs)\n \tpf->vf = vfs;\n \tpf->num_alloc_vfs = num_alloc_vfs;\n \n+\tif (ice_set_per_vf_res(pf)) {\n+\t\tdev_err(dev, \"Not enough resources for %d VFs, try with fewer number of VFs\\n\",\n+\t\t\tnum_alloc_vfs);\n+\t\tret = -ENOSPC;\n+\t\tgoto err_unroll_sriov;\n+\t}\n+\n \t/* apply default profile */\n \tice_for_each_vf(pf, i) {\n \t\tvfs[i].pf = pf;\n@@ -1416,15 +1516,17 @@ static int ice_alloc_vfs(struct ice_pf *pf, u16 num_alloc_vfs)\n \t\t/* assign default capabilities */\n \t\tset_bit(ICE_VIRTCHNL_VF_CAP_L2, &vfs[i].vf_caps);\n \t\tvfs[i].spoofchk = true;\n+\t\tvfs[i].num_vf_qs = pf->num_qps_per_vf;\n \t}\n \n-\t/* VF resources get allocated with initialization */\n-\tif (!ice_config_res_vfs(pf)) {\n-\t\tret = -EIO;\n+\tif (ice_start_vfs(pf)) {\n+\t\tdev_err(dev, \"Failed to start VF(s)\\n\");\n+\t\tret = -EAGAIN;\n \t\tgoto err_unroll_sriov;\n \t}\n \n-\treturn ret;\n+\tclear_bit(__ICE_VF_DIS, pf->state);\n+\treturn 0;\n \n err_unroll_sriov:\n \tpf->vf = NULL;\n", "prefixes": [ "S45", "04/15" ] }