Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1192294/?format=api
{ "id": 1192294, "url": "http://patchwork.ozlabs.org/api/patches/1192294/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20191108142331.10221-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": "<20191108142331.10221-4-anthony.l.nguyen@intel.com>", "list_archive_url": null, "date": "2019-11-08T14:23:20", "name": "[S33,04/15] ice: Don't modify stripping for add/del VLANs on VF", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "50a5e470c102f12b61f2e42d71fccb8e4ad1f886", "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/20191108142331.10221-4-anthony.l.nguyen@intel.com/mbox/", "series": [ { "id": 141798, "url": "http://patchwork.ozlabs.org/api/series/141798/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=141798", "date": "2019-11-08T14:23:30", "name": "[S33,01/15] ice: Store number of functions for the device", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/141798/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1192294/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1192294/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; spf=pass (sender SPF authorized)\n\tsmtp.mailfrom=osuosl.org (client-ip=140.211.166.137;\n\thelo=fraxinus.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 fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\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 478wZC0kWjz9sPL\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat, 9 Nov 2019 09:54:27 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 9B5B186508;\n\tFri, 8 Nov 2019 22:54:25 +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 AdeQ5iCjWrLS; Fri, 8 Nov 2019 22:54:23 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id BB9A4864EF;\n\tFri, 8 Nov 2019 22:54:23 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id C55471BF5DB\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 8 Nov 2019 22:54:19 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id C23322413D\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 8 Nov 2019 22:54:19 +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 OaOXhxign-bv for <intel-wired-lan@lists.osuosl.org>;\n\tFri, 8 Nov 2019 22:54:17 +0000 (UTC)", "from mga01.intel.com (mga01.intel.com [192.55.52.88])\n\tby silver.osuosl.org (Postfix) with ESMTPS id 60488241F9\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 8 Nov 2019 22:54:17 +0000 (UTC)", "from fmsmga008.fm.intel.com ([10.253.24.58])\n\tby fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t08 Nov 2019 14:54:16 -0800", "from unknown (HELO localhost.jf.intel.com) ([10.166.244.174])\n\tby fmsmga008.fm.intel.com with ESMTP; 08 Nov 2019 14:54:16 -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.68,283,1569308400\"; d=\"scan'208\";a=\"201478829\"", "From": "Tony Nguyen <anthony.l.nguyen@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Fri, 8 Nov 2019 06:23:20 -0800", "Message-Id": "<20191108142331.10221-4-anthony.l.nguyen@intel.com>", "X-Mailer": "git-send-email 2.20.1", "In-Reply-To": "<20191108142331.10221-1-anthony.l.nguyen@intel.com>", "References": "<20191108142331.10221-1-anthony.l.nguyen@intel.com>", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [PATCH S33 04/15] ice: Don't modify stripping for\n\tadd/del VLANs on VF", "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: Brett Creeley <brett.creeley@intel.com>\n\nCurrently when adding/deleting vlans in ice_vc_process_vlan_msg()\nwe are calling ice_vsi_manage_vlan_stripping() to enable/disable\nwhen adding and deleting a VLAN respectively. This is wrong\nbecause adding/deleting VLANs has nothing to do with configuring\nVLAN stripping. VLAN stripping is configured through the\nfollowing VIRTCHNL operations:\n\tVIRTCHNL_OP_ENABLE_VLAN_STRIPPING\n\tVIRTCHNL_OP_DISABLE_VLAN_STRIPPING\n\nUnfortunately we can't just remove this because then stripping\nwill never be configured on VF initialization. Fix this by\nadding a new function that initializes (disables/enables) VLAN\nstripping for the VF based on the device supported capabilities.\nThis allows us to remove the call to\nice_vsi_manage_vlan_stripping() in ice_vc_process_vlan_msg().\n\nSigned-off-by: Brett Creeley <brett.creeley@intel.com>\n---\n .../net/ethernet/intel/ice/ice_virtchnl_pf.c | 39 +++++++++++++++----\n 1 file changed, 31 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 3cb394bdfe51..fd419230a6c0 100644\n--- a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c\n+++ b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c\n@@ -2735,14 +2735,6 @@ static int ice_vc_process_vlan_msg(struct ice_vf *vf, u8 *msg, bool add_v)\n \t\tgoto error_param;\n \t}\n \n-\tif (ice_vsi_manage_vlan_stripping(vsi, add_v)) {\n-\t\tdev_err(&pf->pdev->dev,\n-\t\t\t\"%sable VLAN stripping failed for VSI %i\\n\",\n-\t\t\t add_v ? \"en\" : \"dis\", vsi->vsi_num);\n-\t\tv_ret = VIRTCHNL_STATUS_ERR_PARAM;\n-\t\tgoto error_param;\n-\t}\n-\n \tif (test_bit(ICE_VF_STATE_UC_PROMISC, vf->vf_states) ||\n \t test_bit(ICE_VF_STATE_MC_PROMISC, vf->vf_states))\n \t\tvlan_promisc = true;\n@@ -2933,6 +2925,33 @@ static int ice_vc_dis_vlan_stripping(struct ice_vf *vf)\n \t\t\t\t v_ret, NULL, 0);\n }\n \n+/**\n+ * ice_vf_init_vlan_stripping - enable/disable VLAN stripping on initialization\n+ * @vf: VF to enable/disable VLAN stripping for on initialization\n+ *\n+ * If the VIRTCHNL_VF_OFFLOAD_VLAN flag is set enable VLAN stripping, else if\n+ * the flag is cleared then we want to disable stripping. For example, the flag\n+ * will be cleared when port VLANs are configured by the administrator before\n+ * passing the VF to the guest or if the AVF driver doesn't support VLAN\n+ * offloads.\n+ */\n+static int ice_vf_init_vlan_stripping(struct ice_vf *vf)\n+{\n+\tstruct ice_vsi *vsi = vf->pf->vsi[vf->lan_vsi_idx];\n+\n+\tif (!vsi)\n+\t\treturn -EINVAL;\n+\n+\t/* don't modify stripping if port VLAN is configured */\n+\tif (vsi->info.pvid)\n+\t\treturn 0;\n+\n+\tif (ice_vf_vlan_offload_ena(vf->driver_caps))\n+\t\treturn ice_vsi_manage_vlan_stripping(vsi, true);\n+\telse\n+\t\treturn ice_vsi_manage_vlan_stripping(vsi, false);\n+}\n+\n /**\n * ice_vc_process_vf_msg - Process request from VF\n * @pf: pointer to the PF structure\n@@ -2987,6 +3006,10 @@ void ice_vc_process_vf_msg(struct ice_pf *pf, struct ice_rq_event_info *event)\n \t\tbreak;\n \tcase VIRTCHNL_OP_GET_VF_RESOURCES:\n \t\terr = ice_vc_get_vf_res_msg(vf, msg);\n+\t\tif (ice_vf_init_vlan_stripping(vf))\n+\t\t\tdev_err(&pf->pdev->dev,\n+\t\t\t\t\"Failed to initialize VLAN stripping for VF %d\\n\",\n+\t\t\t\tvf->vf_id);\n \t\tice_vc_notify_vf_link_state(vf);\n \t\tbreak;\n \tcase VIRTCHNL_OP_RESET_VF:\n", "prefixes": [ "S33", "04/15" ] }