Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/610121/?format=api
{ "id": 610121, "url": "http://patchwork.ozlabs.org/api/patches/610121/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1460542112-20166-2-git-send-email-harshitha.ramamurthy@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": "<1460542112-20166-2-git-send-email-harshitha.ramamurthy@intel.com>", "list_archive_url": null, "date": "2016-04-13T10:08:21", "name": "[next,S34,01/12] i40e: Change the default for VFs to be not privileged", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "b4a44538053f11642042521f3a4b5f20defc053b", "submitter": { "id": 68642, "url": "http://patchwork.ozlabs.org/api/people/68642/?format=api", "name": "Harshitha Ramamurthy", "email": "harshitha.ramamurthy@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/1460542112-20166-2-git-send-email-harshitha.ramamurthy@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/610121/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/610121/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<intel-wired-lan-bounces@lists.osuosl.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "intel-wired-lan@osuosl.org" ], "Delivered-To": [ "patchwork-incoming@bilbo.ozlabs.org", "intel-wired-lan@osuosl.org" ], "Received": [ "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ozlabs.org (Postfix) with ESMTP id 3qlX4w0RQHz9sD5\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 14 Apr 2016 04:14:24 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 31B9E33A20;\n\tWed, 13 Apr 2016 18:14:23 +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 kPaMUmoAjMDr; Wed, 13 Apr 2016 18:14:17 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id 02C9033A12;\n\tWed, 13 Apr 2016 18:14:17 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id 02A861C10B8\n\tfor <intel-wired-lan@osuosl.org>;\n\tWed, 13 Apr 2016 18:14:14 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id F312F339FE\n\tfor <intel-wired-lan@osuosl.org>;\n\tWed, 13 Apr 2016 18:14:13 +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 qB6cplVCTliS for <intel-wired-lan@osuosl.org>;\n\tWed, 13 Apr 2016 18:14:11 +0000 (UTC)", "from mga09.intel.com (mga09.intel.com [134.134.136.24])\n\tby silver.osuosl.org (Postfix) with ESMTP id 3FE5933A13\n\tfor <intel-wired-lan@osuosl.org>;\n\tWed, 13 Apr 2016 18:14:11 +0000 (UTC)", "from fmsmga002.fm.intel.com ([10.253.24.26])\n\tby orsmga102.jf.intel.com with ESMTP; 13 Apr 2016 11:14:11 -0700", "from harshitha-linux1.jf.intel.com ([10.166.45.81])\n\tby fmsmga002.fm.intel.com with ESMTP; 13 Apr 2016 11:14:11 -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-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.24,480,1455004800\"; d=\"scan'208\";a=\"957967567\"", "From": "Harshitha Ramamurthy <harshitha.ramamurthy@intel.com>", "To": "intel-wired-lan@osuosl.org", "Date": "Wed, 13 Apr 2016 03:08:21 -0700", "Message-Id": "<1460542112-20166-2-git-send-email-harshitha.ramamurthy@intel.com>", "X-Mailer": "git-send-email 2.4.3", "In-Reply-To": "<1460542112-20166-1-git-send-email-harshitha.ramamurthy@intel.com>", "References": "<1460542112-20166-1-git-send-email-harshitha.ramamurthy@intel.com>", "Subject": "[Intel-wired-lan] [next PATCH S34 01/12] i40e: Change the default\n\tfor VFs to be not privileged", "X-BeenThere": "intel-wired-lan@lists.osuosl.org", "X-Mailman-Version": "2.1.18-1", "Precedence": "list", "List-Id": "Intel Wired Ethernet Linux Kernel Driver Development\n\t<intel-wired-lan.lists.osuosl.org>", "List-Unsubscribe": "<http://lists.osuosl.org/mailman/options/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@lists.osuosl.org?subject=unsubscribe>", "List-Archive": "<http://lists.osuosl.org/pipermail/intel-wired-lan/>", "List-Post": "<mailto:intel-wired-lan@lists.osuosl.org>", "List-Help": "<mailto:intel-wired-lan-request@lists.osuosl.org?subject=help>", "List-Subscribe": "<http://lists.osuosl.org/mailman/listinfo/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@lists.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@lists.osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@lists.osuosl.org>" }, "content": "From: Anjali Singhai Jain <anjali.singhai@intel.com>\n\nMake sure a VF is not trusted/privileged until its explicitly\nset for trust through the new NDO op interface.\n\nSigned-off-by: Anjali Singhai Jain <anjali.singhai@intel.com>\nChange-Id: I476385c290d2b4901d8fceb29de43546accdc499\n---\nTesting Hints (Required if no HSD):\nWith this now a VF cannot add filters or enable promisc unless trusted.\n\n drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 20 ++++++++++----------\n 1 file changed, 10 insertions(+), 10 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c\nindex 5be10cf..e2c3149 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c\n@@ -860,7 +860,11 @@ static int i40e_alloc_vf_res(struct i40e_vf *vf)\n \tif (ret)\n \t\tgoto error_alloc;\n \ttotal_queue_pairs += pf->vsi[vf->lan_vsi_idx]->alloc_queue_pairs;\n-\tset_bit(I40E_VIRTCHNL_VF_CAP_PRIVILEGE, &vf->vf_caps);\n+\n+\tif (vf->trusted)\n+\t\tset_bit(I40E_VIRTCHNL_VF_CAP_PRIVILEGE, &vf->vf_caps);\n+\telse\n+\t\tclear_bit(I40E_VIRTCHNL_VF_CAP_PRIVILEGE, &vf->vf_caps);\n \n \t/* store the total qps number for the runtime\n \t * VF req validation\n@@ -1847,15 +1851,17 @@ static inline int i40e_check_vf_permission(struct i40e_vf *vf, u8 *macaddr)\n \t\tdev_err(&pf->pdev->dev, \"invalid VF MAC addr %pM\\n\", macaddr);\n \t\tret = I40E_ERR_INVALID_MAC_ADDR;\n \t} else if (vf->pf_set_mac && !is_multicast_ether_addr(macaddr) &&\n+\t\t !test_bit(I40E_VIRTCHNL_VF_CAP_PRIVILEGE, &vf->vf_caps) &&\n \t\t !ether_addr_equal(macaddr, vf->default_lan_addr.addr)) {\n \t\t/* If the host VMM administrator has set the VF MAC address\n \t\t * administratively via the ndo_set_vf_mac command then deny\n \t\t * permission to the VF to add or delete unicast MAC addresses.\n+\t\t * Unless the VF is privileged and then it can do whatever.\n \t\t * The VF may request to set the MAC address filter already\n \t\t * assigned to it so do not return an error in that case.\n \t\t */\n \t\tdev_err(&pf->pdev->dev,\n-\t\t\t\"VF attempting to override administratively set MAC address\\nPlease reload the VF driver to resume normal operation\\n\");\n+\t\t\t\"VF attempting to override administratively set MAC address, reload the VF driver to resume normal operation\\n\");\n \t\tret = -EPERM;\n \t}\n \treturn ret;\n@@ -1880,7 +1886,6 @@ static int i40e_vc_add_mac_addr_msg(struct i40e_vf *vf, u8 *msg, u16 msglen)\n \tint i;\n \n \tif (!test_bit(I40E_VF_STAT_ACTIVE, &vf->vf_states) ||\n-\t !test_bit(I40E_VIRTCHNL_VF_CAP_PRIVILEGE, &vf->vf_caps) ||\n \t !i40e_vc_isvalid_vsi_id(vf, vsi_id)) {\n \t\tret = I40E_ERR_PARAM;\n \t\tgoto error_param;\n@@ -1954,7 +1959,6 @@ static int i40e_vc_del_mac_addr_msg(struct i40e_vf *vf, u8 *msg, u16 msglen)\n \tint i;\n \n \tif (!test_bit(I40E_VF_STAT_ACTIVE, &vf->vf_states) ||\n-\t !test_bit(I40E_VIRTCHNL_VF_CAP_PRIVILEGE, &vf->vf_caps) ||\n \t !i40e_vc_isvalid_vsi_id(vf, vsi_id)) {\n \t\tret = I40E_ERR_PARAM;\n \t\tgoto error_param;\n@@ -2207,7 +2211,6 @@ static int i40e_vc_config_rss_key(struct i40e_vf *vf, u8 *msg, u16 msglen)\n \ti40e_status aq_ret = 0;\n \n \tif (!test_bit(I40E_VF_STAT_ACTIVE, &vf->vf_states) ||\n-\t !test_bit(I40E_VIRTCHNL_VF_CAP_PRIVILEGE, &vf->vf_caps) ||\n \t !i40e_vc_isvalid_vsi_id(vf, vsi_id) ||\n \t (vrk->key_len != I40E_HKEY_ARRAY_SIZE)) {\n \t\taq_ret = I40E_ERR_PARAM;\n@@ -2240,7 +2243,6 @@ static int i40e_vc_config_rss_lut(struct i40e_vf *vf, u8 *msg, u16 msglen)\n \ti40e_status aq_ret = 0;\n \n \tif (!test_bit(I40E_VF_STAT_ACTIVE, &vf->vf_states) ||\n-\t !test_bit(I40E_VIRTCHNL_VF_CAP_PRIVILEGE, &vf->vf_caps) ||\n \t !i40e_vc_isvalid_vsi_id(vf, vsi_id) ||\n \t (vrl->lut_entries != I40E_VF_HLUT_ARRAY_SIZE)) {\n \t\taq_ret = I40E_ERR_PARAM;\n@@ -2270,8 +2272,7 @@ static int i40e_vc_get_rss_hena(struct i40e_vf *vf, u8 *msg, u16 msglen)\n \ti40e_status aq_ret = 0;\n \tint len = 0;\n \n-\tif (!test_bit(I40E_VF_STAT_ACTIVE, &vf->vf_states) ||\n-\t !test_bit(I40E_VIRTCHNL_VF_CAP_PRIVILEGE, &vf->vf_caps)) {\n+\tif (!test_bit(I40E_VF_STAT_ACTIVE, &vf->vf_states)) {\n \t\taq_ret = I40E_ERR_PARAM;\n \t\tgoto err;\n \t}\n@@ -2307,8 +2308,7 @@ static int i40e_vc_set_rss_hena(struct i40e_vf *vf, u8 *msg, u16 msglen)\n \tstruct i40e_hw *hw = &pf->hw;\n \ti40e_status aq_ret = 0;\n \n-\tif (!test_bit(I40E_VF_STAT_ACTIVE, &vf->vf_states) ||\n-\t !test_bit(I40E_VIRTCHNL_VF_CAP_PRIVILEGE, &vf->vf_caps)) {\n+\tif (!test_bit(I40E_VF_STAT_ACTIVE, &vf->vf_states)) {\n \t\taq_ret = I40E_ERR_PARAM;\n \t\tgoto err;\n \t}\n", "prefixes": [ "next", "S34", "01/12" ] }