Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1048615/?format=api
{ "id": 1048615, "url": "http://patchwork.ozlabs.org/api/patches/1048615/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20190227003523.28733-14-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": "<20190227003523.28733-14-anirudh.venkataramanan@intel.com>", "list_archive_url": null, "date": "2019-02-27T00:35:19", "name": "[S13,v2,13/17] ice: Get VF VSI instances directly via PF", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "4d2d5541c709e4ab11c32bbef25f9e76f281df5d", "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/20190227003523.28733-14-anirudh.venkataramanan@intel.com/mbox/", "series": [ { "id": 94355, "url": "http://patchwork.ozlabs.org/api/series/94355/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=94355", "date": "2019-02-27T00:35:10", "name": "Bug fixes and minor feature updates for ice", "version": 2, "mbox": "http://patchwork.ozlabs.org/series/94355/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1048615/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1048615/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 448Gtf3Hqqz9sBR\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 27 Feb 2019 11:35:38 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 138EC232BD;\n\tWed, 27 Feb 2019 00:35: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 pkBV9CzaQcGT; Wed, 27 Feb 2019 00:35:31 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id 47C46233ED;\n\tWed, 27 Feb 2019 00:35:31 +0000 (UTC)", "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id 048FE1BF2A0\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 27 Feb 2019 00:35:28 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 01C6685620\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 27 Feb 2019 00:35:28 +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 FpWL1yRrgIk4 for <intel-wired-lan@lists.osuosl.org>;\n\tWed, 27 Feb 2019 00:35:26 +0000 (UTC)", "from mga12.intel.com (mga12.intel.com [192.55.52.136])\n\tby whitealder.osuosl.org (Postfix) with ESMTPS id DD0FA85722\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 27 Feb 2019 00:35:25 +0000 (UTC)", "from fmsmga001.fm.intel.com ([10.253.24.23])\n\tby fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t26 Feb 2019 16:35:25 -0800", "from shasta.jf.intel.com ([10.166.241.11])\n\tby fmsmga001.fm.intel.com with ESMTP; 26 Feb 2019 16:35:25 -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-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.58,417,1544515200\"; d=\"scan'208\";a=\"150284173\"", "From": "Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Tue, 26 Feb 2019 16:35:19 -0800", "Message-Id": "<20190227003523.28733-14-anirudh.venkataramanan@intel.com>", "X-Mailer": "git-send-email 2.14.5", "In-Reply-To": "<20190227003523.28733-1-anirudh.venkataramanan@intel.com>", "References": "<20190227003523.28733-1-anirudh.venkataramanan@intel.com>", "Subject": "[Intel-wired-lan] [PATCH S13 v2 13/17] ice: Get VF VSI instances\n\tdirectly via PF", "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>", "MIME-Version": "1.0", "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: Akeem G Abodunrin <akeem.g.abodunrin@intel.com>\n\nThis patch changes how we get VF VSIs instances. Instead of relying on\nmailbox virtual channel message to retrieve VSI, it is more reliable\ngetting it directly via VF object in PF data structure.\n\nSigned-off-by: Akeem G Abodunrin <akeem.g.abodunrin@intel.com>\nSigned-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>\n---\n[Anirudh Venkataramanan <anirudh.venkataramanan@intel.com> cleaned up commit message]\n---\n drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c | 35 ++++++++++++++++++------\n 1 file changed, 27 insertions(+), 8 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 70bd81ea1943..b84620068a3c 100644\n--- a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c\n+++ b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c\n@@ -1390,6 +1390,11 @@ static int ice_vc_get_vf_res_msg(struct ice_vf *vf, u8 *msg)\n \n \tvfres->vf_cap_flags = VIRTCHNL_VF_OFFLOAD_L2;\n \tvsi = pf->vsi[vf->lan_vsi_idx];\n+\tif (!vsi) {\n+\t\taq_ret = ICE_ERR_PARAM;\n+\t\tgoto err;\n+\t}\n+\n \tif (!vsi->info.pvid)\n \t\tvfres->vf_cap_flags |= VIRTCHNL_VF_OFFLOAD_VLAN;\n \n@@ -1523,6 +1528,7 @@ static int ice_vc_config_rss_key(struct ice_vf *vf, u8 *msg)\n \tstruct virtchnl_rss_key *vrk =\n \t\t(struct virtchnl_rss_key *)msg;\n \tstruct ice_vsi *vsi = NULL;\n+\tstruct ice_pf *pf = vf->pf;\n \tenum ice_status aq_ret;\n \tint ret;\n \n@@ -1536,7 +1542,7 @@ static int ice_vc_config_rss_key(struct ice_vf *vf, u8 *msg)\n \t\tgoto error_param;\n \t}\n \n-\tvsi = ice_find_vsi_from_id(vf->pf, vrk->vsi_id);\n+\tvsi = pf->vsi[vf->lan_vsi_idx];\n \tif (!vsi) {\n \t\taq_ret = ICE_ERR_PARAM;\n \t\tgoto error_param;\n@@ -1570,6 +1576,7 @@ static int ice_vc_config_rss_lut(struct ice_vf *vf, u8 *msg)\n {\n \tstruct virtchnl_rss_lut *vrl = (struct virtchnl_rss_lut *)msg;\n \tstruct ice_vsi *vsi = NULL;\n+\tstruct ice_pf *pf = vf->pf;\n \tenum ice_status aq_ret;\n \tint ret;\n \n@@ -1583,7 +1590,7 @@ static int ice_vc_config_rss_lut(struct ice_vf *vf, u8 *msg)\n \t\tgoto error_param;\n \t}\n \n-\tvsi = ice_find_vsi_from_id(vf->pf, vrl->vsi_id);\n+\tvsi = pf->vsi[vf->lan_vsi_idx];\n \tif (!vsi) {\n \t\taq_ret = ICE_ERR_PARAM;\n \t\tgoto error_param;\n@@ -1618,6 +1625,7 @@ static int ice_vc_get_stats_msg(struct ice_vf *vf, u8 *msg)\n \tstruct virtchnl_queue_select *vqs =\n \t\t(struct virtchnl_queue_select *)msg;\n \tenum ice_status aq_ret = 0;\n+\tstruct ice_pf *pf = vf->pf;\n \tstruct ice_eth_stats stats;\n \tstruct ice_vsi *vsi;\n \n@@ -1631,7 +1639,7 @@ static int ice_vc_get_stats_msg(struct ice_vf *vf, u8 *msg)\n \t\tgoto error_param;\n \t}\n \n-\tvsi = ice_find_vsi_from_id(vf->pf, vqs->vsi_id);\n+\tvsi = pf->vsi[vf->lan_vsi_idx];\n \tif (!vsi) {\n \t\taq_ret = ICE_ERR_PARAM;\n \t\tgoto error_param;\n@@ -1660,6 +1668,7 @@ static int ice_vc_ena_qs_msg(struct ice_vf *vf, u8 *msg)\n \tstruct virtchnl_queue_select *vqs =\n \t (struct virtchnl_queue_select *)msg;\n \tenum ice_status aq_ret = 0;\n+\tstruct ice_pf *pf = vf->pf;\n \tstruct ice_vsi *vsi;\n \n \tif (!test_bit(ICE_VF_STATE_ACTIVE, vf->vf_states)) {\n@@ -1677,7 +1686,7 @@ static int ice_vc_ena_qs_msg(struct ice_vf *vf, u8 *msg)\n \t\tgoto error_param;\n \t}\n \n-\tvsi = ice_find_vsi_from_id(vf->pf, vqs->vsi_id);\n+\tvsi = pf->vsi[vf->lan_vsi_idx];\n \tif (!vsi) {\n \t\taq_ret = ICE_ERR_PARAM;\n \t\tgoto error_param;\n@@ -1713,6 +1722,7 @@ static int ice_vc_dis_qs_msg(struct ice_vf *vf, u8 *msg)\n \tstruct virtchnl_queue_select *vqs =\n \t (struct virtchnl_queue_select *)msg;\n \tenum ice_status aq_ret = 0;\n+\tstruct ice_pf *pf = vf->pf;\n \tstruct ice_vsi *vsi;\n \n \tif (!test_bit(ICE_VF_STATE_ACTIVE, vf->vf_states) &&\n@@ -1731,7 +1741,7 @@ static int ice_vc_dis_qs_msg(struct ice_vf *vf, u8 *msg)\n \t\tgoto error_param;\n \t}\n \n-\tvsi = ice_find_vsi_from_id(vf->pf, vqs->vsi_id);\n+\tvsi = pf->vsi[vf->lan_vsi_idx];\n \tif (!vsi) {\n \t\taq_ret = ICE_ERR_PARAM;\n \t\tgoto error_param;\n@@ -1797,7 +1807,7 @@ static int ice_vc_cfg_irq_map_msg(struct ice_vf *vf, u8 *msg)\n \t\t\tgoto error_param;\n \t\t}\n \n-\t\tvsi = ice_find_vsi_from_id(vf->pf, vsi_id);\n+\t\tvsi = pf->vsi[vf->lan_vsi_idx];\n \t\tif (!vsi) {\n \t\t\taq_ret = ICE_ERR_PARAM;\n \t\t\tgoto error_param;\n@@ -1868,7 +1878,7 @@ static int ice_vc_cfg_qs_msg(struct ice_vf *vf, u8 *msg)\n \t\tgoto error_param;\n \t}\n \n-\tvsi = ice_find_vsi_from_id(vf->pf, qci->vsi_id);\n+\tvsi = pf->vsi[vf->lan_vsi_idx];\n \tif (!vsi) {\n \t\taq_ret = ICE_ERR_PARAM;\n \t\tgoto error_param;\n@@ -1998,6 +2008,10 @@ ice_vc_handle_mac_addr_msg(struct ice_vf *vf, u8 *msg, bool set)\n \t}\n \n \tvsi = pf->vsi[vf->lan_vsi_idx];\n+\tif (!vsi) {\n+\t\tret = ICE_ERR_PARAM;\n+\t\tgoto handle_mac_exit;\n+\t}\n \n \tfor (i = 0; i < al->num_elements; i++) {\n \t\tu8 *maddr = al->list[i].addr;\n@@ -2291,7 +2305,7 @@ static int ice_vc_process_vlan_msg(struct ice_vf *vf, u8 *msg, bool add_v)\n \t}\n \n \thw = &pf->hw;\n-\tvsi = ice_find_vsi_from_id(vf->pf, vfl->vsi_id);\n+\tvsi = pf->vsi[vf->lan_vsi_idx];\n \tif (!vsi) {\n \t\taq_ret = ICE_ERR_PARAM;\n \t\tgoto error_param;\n@@ -2452,6 +2466,11 @@ static int ice_vc_dis_vlan_stripping(struct ice_vf *vf)\n \t}\n \n \tvsi = pf->vsi[vf->lan_vsi_idx];\n+\tif (!vsi) {\n+\t\taq_ret = ICE_ERR_PARAM;\n+\t\tgoto error_param;\n+\t}\n+\n \tif (ice_vsi_manage_vlan_stripping(vsi, false))\n \t\taq_ret = ICE_ERR_AQ_ERROR;\n \n", "prefixes": [ "S13", "v2", "13/17" ] }