Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1138563/?format=api
{ "id": 1138563, "url": "http://patchwork.ozlabs.org/api/patches/1138563/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20190729090454.5501-12-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": "<20190729090454.5501-12-anthony.l.nguyen@intel.com>", "list_archive_url": null, "date": "2019-07-29T09:04:54", "name": "[S24,v2,12/12] ice: Add input handlers for virtual channel handlers", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "bf1351543e2ab9fec9aef7c108a47485b69854b5", "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/20190729090454.5501-12-anthony.l.nguyen@intel.com/mbox/", "series": [ { "id": 122035, "url": "http://patchwork.ozlabs.org/api/series/122035/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=122035", "date": "2019-07-29T09:04:53", "name": "[S24,v2,01/12] ice: Allow egress control packets from PF_VSI", "version": 2, "mbox": "http://patchwork.ozlabs.org/series/122035/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1138563/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1138563/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.133; helo=hemlock.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 hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\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 45y6H02wYGz9sNC\n\tfor <incoming@patchwork.ozlabs.org>;\n\tTue, 30 Jul 2019 03:33:32 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id AE9C0875DA;\n\tMon, 29 Jul 2019 17:33:30 +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 TaCvreVvrND1; Mon, 29 Jul 2019 17:33:29 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 63E8B8789C;\n\tMon, 29 Jul 2019 17:33:29 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id E103D1BF96B\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 29 Jul 2019 17:33:22 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id DE3422043C\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 29 Jul 2019 17:33:22 +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 j6jQFwq5FRde for <intel-wired-lan@lists.osuosl.org>;\n\tMon, 29 Jul 2019 17:33:20 +0000 (UTC)", "from mga05.intel.com (mga05.intel.com [192.55.52.43])\n\tby silver.osuosl.org (Postfix) with ESMTPS id BBD462046A\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 29 Jul 2019 17:33:18 +0000 (UTC)", "from fmsmga003.fm.intel.com ([10.253.24.29])\n\tby fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t29 Jul 2019 10:33:18 -0700", "from unknown (HELO localhost.jf.intel.com) ([10.166.244.174])\n\tby FMSMGA003.fm.intel.com with ESMTP; 29 Jul 2019 10:33:18 -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.64,323,1559545200\"; d=\"scan'208\";a=\"179447248\"", "From": "Tony Nguyen <anthony.l.nguyen@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Mon, 29 Jul 2019 02:04:54 -0700", "Message-Id": "<20190729090454.5501-12-anthony.l.nguyen@intel.com>", "X-Mailer": "git-send-email 2.20.1", "In-Reply-To": "<20190729090454.5501-1-anthony.l.nguyen@intel.com>", "References": "<20190729090454.5501-1-anthony.l.nguyen@intel.com>", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [PATCH S24 v2 12/12] ice: Add input handlers for\n\tvirtual channel handlers", "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: \"Amruth G.P\" <amruth.gouda.parameshwarappa@intel.com>\n\nMove the assignment to local variables after validation.\n\nRemove unnecessary checks in ice_vc_process_vf_msg() as the respective\nfunctions are now performing the checks.\n\nSigned-off-by: Amruth G.P <amruth.gouda.parameshwarappa@intel.com>\nSigned-off-by: Nitesh B Venkatesh <nitesh.b.venkatesh@intel.com>\nSigned-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>\n---\nv2: Move Tx|Rx queue check from ice_vc_get_stats_msg() to\nice_vc_ena_qs_msg()\n---\n .../net/ethernet/intel/ice/ice_virtchnl_pf.c | 64 +++++++++----------\n 1 file changed, 32 insertions(+), 32 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 83e58e71081e..de0a1ef54e83 100644\n--- a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c\n+++ b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c\n@@ -1734,18 +1734,18 @@ static int ice_vc_config_rss_key(struct ice_vf *vf, u8 *msg)\n \t\tgoto error_param;\n \t}\n \n-\tvsi = pf->vsi[vf->lan_vsi_idx];\n-\tif (!vsi) {\n+\tif (vrk->key_len != ICE_VSIQF_HKEY_ARRAY_SIZE) {\n \t\tv_ret = VIRTCHNL_STATUS_ERR_PARAM;\n \t\tgoto error_param;\n \t}\n \n-\tif (vrk->key_len != ICE_VSIQF_HKEY_ARRAY_SIZE) {\n+\tif (!test_bit(ICE_FLAG_RSS_ENA, vf->pf->flags)) {\n \t\tv_ret = VIRTCHNL_STATUS_ERR_PARAM;\n \t\tgoto error_param;\n \t}\n \n-\tif (!test_bit(ICE_FLAG_RSS_ENA, vf->pf->flags)) {\n+\tvsi = pf->vsi[vf->lan_vsi_idx];\n+\tif (!vsi) {\n \t\tv_ret = VIRTCHNL_STATUS_ERR_PARAM;\n \t\tgoto error_param;\n \t}\n@@ -1781,18 +1781,18 @@ static int ice_vc_config_rss_lut(struct ice_vf *vf, u8 *msg)\n \t\tgoto error_param;\n \t}\n \n-\tvsi = pf->vsi[vf->lan_vsi_idx];\n-\tif (!vsi) {\n+\tif (vrl->lut_entries != ICE_VSIQF_HLUT_ARRAY_SIZE) {\n \t\tv_ret = VIRTCHNL_STATUS_ERR_PARAM;\n \t\tgoto error_param;\n \t}\n \n-\tif (vrl->lut_entries != ICE_VSIQF_HLUT_ARRAY_SIZE) {\n+\tif (!test_bit(ICE_FLAG_RSS_ENA, vf->pf->flags)) {\n \t\tv_ret = VIRTCHNL_STATUS_ERR_PARAM;\n \t\tgoto error_param;\n \t}\n \n-\tif (!test_bit(ICE_FLAG_RSS_ENA, vf->pf->flags)) {\n+\tvsi = pf->vsi[vf->lan_vsi_idx];\n+\tif (!vsi) {\n \t\tv_ret = VIRTCHNL_STATUS_ERR_PARAM;\n \t\tgoto error_param;\n \t}\n@@ -1877,6 +1877,12 @@ static int ice_vc_ena_qs_msg(struct ice_vf *vf, u8 *msg)\n \t\tgoto error_param;\n \t}\n \n+\tif (vqs->rx_queues > ICE_MAX_BASE_QS_PER_VF ||\n+\t vqs->tx_queues > ICE_MAX_BASE_QS_PER_VF) {\n+\t\tv_ret = VIRTCHNL_STATUS_ERR_PARAM;\n+\t\tgoto error_param;\n+\t}\n+\n \tvsi = pf->vsi[vf->lan_vsi_idx];\n \tif (!vsi) {\n \t\tv_ret = VIRTCHNL_STATUS_ERR_PARAM;\n@@ -1932,6 +1938,12 @@ static int ice_vc_dis_qs_msg(struct ice_vf *vf, u8 *msg)\n \t\tgoto error_param;\n \t}\n \n+\tif (vqs->rx_queues > ICE_MAX_BASE_QS_PER_VF ||\n+\t vqs->tx_queues > ICE_MAX_BASE_QS_PER_VF) {\n+\t\tv_ret = VIRTCHNL_STATUS_ERR_PARAM;\n+\t\tgoto error_param;\n+\t}\n+\n \tvsi = pf->vsi[vf->lan_vsi_idx];\n \tif (!vsi) {\n \t\tv_ret = VIRTCHNL_STATUS_ERR_PARAM;\n@@ -1984,12 +1996,6 @@ static int ice_vc_cfg_irq_map_msg(struct ice_vf *vf, u8 *msg)\n \tirqmap_info = (struct virtchnl_irq_map_info *)msg;\n \tnum_q_vectors_mapped = irqmap_info->num_vectors;\n \n-\tvsi = pf->vsi[vf->lan_vsi_idx];\n-\tif (!vsi) {\n-\t\tv_ret = VIRTCHNL_STATUS_ERR_PARAM;\n-\t\tgoto error_param;\n-\t}\n-\n \t/* Check to make sure number of VF vectors mapped is not greater than\n \t * number of VF vectors originally allocated, and check that\n \t * there is actually at least a single VF queue vector mapped\n@@ -2001,6 +2007,12 @@ static int ice_vc_cfg_irq_map_msg(struct ice_vf *vf, u8 *msg)\n \t\tgoto error_param;\n \t}\n \n+\tvsi = pf->vsi[vf->lan_vsi_idx];\n+\tif (!vsi) {\n+\t\tv_ret = VIRTCHNL_STATUS_ERR_PARAM;\n+\t\tgoto error_param;\n+\t}\n+\n \tfor (i = 0; i < num_q_vectors_mapped; i++) {\n \t\tstruct ice_q_vector *q_vector;\n \n@@ -2092,10 +2104,6 @@ static int ice_vc_cfg_qs_msg(struct ice_vf *vf, u8 *msg)\n \t\tgoto error_param;\n \t}\n \n-\tvsi = pf->vsi[vf->lan_vsi_idx];\n-\tif (!vsi)\n-\t\tgoto error_param;\n-\n \tif (qci->num_queue_pairs > ICE_MAX_BASE_QS_PER_VF) {\n \t\tdev_err(&pf->pdev->dev,\n \t\t\t\"VF-%d requesting more than supported number of queues: %d\\n\",\n@@ -2104,6 +2112,12 @@ static int ice_vc_cfg_qs_msg(struct ice_vf *vf, u8 *msg)\n \t\tgoto error_param;\n \t}\n \n+\tvsi = pf->vsi[vf->lan_vsi_idx];\n+\tif (!vsi) {\n+\t\tv_ret = VIRTCHNL_STATUS_ERR_PARAM;\n+\t\tgoto error_param;\n+\t}\n+\n \tfor (i = 0; i < qci->num_queue_pairs; i++) {\n \t\tqpi = &qci->qpair[i];\n \t\tif (qpi->txq.vsi_id != qci->vsi_id ||\n@@ -2755,20 +2769,6 @@ void ice_vc_process_vf_msg(struct ice_pf *pf, struct ice_rq_event_info *event)\n \t\t\terr = -EPERM;\n \t\telse\n \t\t\terr = -EINVAL;\n-\t\tgoto error_handler;\n-\t}\n-\n-\t/* Perform additional checks specific to RSS and Virtchnl */\n-\tif (v_opcode == VIRTCHNL_OP_CONFIG_RSS_KEY) {\n-\t\tstruct virtchnl_rss_key *vrk = (struct virtchnl_rss_key *)msg;\n-\n-\t\tif (vrk->key_len != ICE_VSIQF_HKEY_ARRAY_SIZE)\n-\t\t\terr = -EINVAL;\n-\t} else if (v_opcode == VIRTCHNL_OP_CONFIG_RSS_LUT) {\n-\t\tstruct virtchnl_rss_lut *vrl = (struct virtchnl_rss_lut *)msg;\n-\n-\t\tif (vrl->lut_entries != ICE_VSIQF_HLUT_ARRAY_SIZE)\n-\t\t\terr = -EINVAL;\n \t}\n \n error_handler:\n", "prefixes": [ "S24", "v2", "12/12" ] }