Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1227517/?format=api
{ "id": 1227517, "url": "http://patchwork.ozlabs.org/api/patches/1227517/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20200122152138.41585-5-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": "<20200122152138.41585-5-anthony.l.nguyen@intel.com>", "list_archive_url": null, "date": "2020-01-22T15:21:28", "name": "[S38,05/15] ice: Only allow tagged bcast/mcast traffic for VF in port VLAN", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "6f5d96594f8d6e9e9e5f65745e1f8addd1a1e188", "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/20200122152138.41585-5-anthony.l.nguyen@intel.com/mbox/", "series": [ { "id": 154777, "url": "http://patchwork.ozlabs.org/api/series/154777/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=154777", "date": "2020-01-22T15:21:26", "name": "[S38,01/15] ice: Add initial support for QinQ", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/154777/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1227517/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1227517/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.138;\n\thelo=whitealder.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 whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\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 4832MM5pt9z9sRW\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 23 Jan 2020 10:54:55 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 1FDCD84397;\n\tWed, 22 Jan 2020 23:54:54 +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 Hsq+osPpA20T; Wed, 22 Jan 2020 23:54:52 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id C67A384C63;\n\tWed, 22 Jan 2020 23:54:51 +0000 (UTC)", "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\tby ash.osuosl.org (Postfix) with ESMTP id 790521BF988\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 22 Jan 2020 23:54:25 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 761AC81A67\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 22 Jan 2020 23: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 nlEYYcjnFAwr for <intel-wired-lan@lists.osuosl.org>;\n\tWed, 22 Jan 2020 23:54:23 +0000 (UTC)", "from mga17.intel.com (mga17.intel.com [192.55.52.151])\n\tby fraxinus.osuosl.org (Postfix) with ESMTPS id E4B6883445\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 22 Jan 2020 23:54:22 +0000 (UTC)", "from fmsmga002.fm.intel.com ([10.253.24.26])\n\tby fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t22 Jan 2020 15:54:22 -0800", "from unknown (HELO localhost.jf.intel.com) ([10.166.244.174])\n\tby fmsmga002.fm.intel.com with ESMTP; 22 Jan 2020 15:54:21 -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.70,351,1574150400\"; d=\"scan'208\";a=\"259651614\"", "From": "Tony Nguyen <anthony.l.nguyen@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Wed, 22 Jan 2020 07:21:28 -0800", "Message-Id": "<20200122152138.41585-5-anthony.l.nguyen@intel.com>", "X-Mailer": "git-send-email 2.20.1", "In-Reply-To": "<20200122152138.41585-1-anthony.l.nguyen@intel.com>", "References": "<20200122152138.41585-1-anthony.l.nguyen@intel.com>", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [PATCH S38 05/15] ice: Only allow tagged\n\tbcast/mcast traffic for VF in port VLAN", "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 the VF can see other's broadcast and multicast traffic because\nit always has a VLAN filter for VLAN 0. Fix this by removing/adding the\nVF's VLAN 0 filter when a port VLAN is added/removed respectively.\n\nThis required a few changes.\n\n1. Move where we add VLAN 0 by default for the VF into\nice_alloc_vsi_res() because this is when we determine if a port VLAN is\npresent for load and reset.\n\n2. Moved where we kill the old port VLAN filter in\nice_set_vf_port_vlan() to the very end of the function because it allows\nus to save the old port VLAN configuration upon any failure case.\n\n3. During adding/removing of a port VLAN via ice_set_vf_port_vlan() we\nalso need to remove/add the VLAN 0 filter rule respectively.\n\n4. Improve log messages.\n\nSigned-off-by: Brett Creeley <brett.creeley@intel.com>\n---\n .../net/ethernet/intel/ice/ice_virtchnl_pf.c | 49 ++++++++++++-------\n 1 file changed, 31 insertions(+), 18 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 250fbfd4c5ff..993bc89c920e 100644\n--- a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c\n+++ b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c\n@@ -528,7 +528,18 @@ static int ice_alloc_vsi_res(struct ice_vf *vf)\n \t/* Check if port VLAN exist before, and restore it accordingly */\n \tif (vf->port_vlan_info) {\n \t\tice_vsi_manage_pvid(vsi, vf->port_vlan_info, true);\n-\t\tice_vsi_add_vlan(vsi, vf->port_vlan_info & VLAN_VID_MASK);\n+\t\tif (ice_vsi_add_vlan(vsi, vf->port_vlan_info & VLAN_VID_MASK))\n+\t\t\tdev_warn(ice_pf_to_dev(pf), \"Failed to add Port VLAN %d filter for VF %d\\n\",\n+\t\t\t\t vf->port_vlan_info & VLAN_VID_MASK, vf->vf_id);\n+\t} else {\n+\t\t/* set VLAN 0 filter by default when no port VLAN is\n+\t\t * enabled. If a port VLAN is enabled we don't want\n+\t\t * untagged broadcast/multicast traffic seen on the VF\n+\t\t * interface.\n+\t\t */\n+\t\tif (ice_vsi_add_vlan(vsi, 0))\n+\t\t\tdev_warn(ice_pf_to_dev(pf), \"Failed to add VLAN 0 filter for VF %d, MDD events will trigger. Reset the VF, disable spoofchk, or enable 8021q module on the guest\\n\",\n+\t\t\t\t vf->vf_id);\n \t}\n \n \teth_broadcast_addr(broadcast);\n@@ -936,17 +947,9 @@ static void ice_cleanup_and_realloc_vf(struct ice_vf *vf)\n \n \t/* reallocate VF resources to finish resetting the VSI state */\n \tif (!ice_alloc_vf_res(vf)) {\n-\t\tstruct ice_vsi *vsi;\n-\n \t\tice_ena_vf_mappings(vf);\n \t\tset_bit(ICE_VF_STATE_ACTIVE, vf->vf_states);\n \t\tclear_bit(ICE_VF_STATE_DIS, vf->vf_states);\n-\n-\t\tvsi = pf->vsi[vf->lan_vsi_idx];\n-\t\tif (ice_vsi_add_vlan(vsi, 0))\n-\t\t\tdev_warn(ice_pf_to_dev(pf),\n-\t\t\t\t \"Failed to add VLAN 0 filter for VF %d, MDD events will trigger. Reset the VF, disable spoofchk, or enable 8021q module on the guest\",\n-\t\t\t\t vf->vf_id);\n \t}\n \n \t/* Tell the VF driver the reset is done. This needs to be done only\n@@ -2694,15 +2697,24 @@ ice_set_vf_port_vlan(struct net_device *netdev, int vf_id, u16 vlan_id, u8 qos,\n \t\treturn ret;\n \t}\n \n-\t/* If PVID, then remove all filters on the old VLAN */\n-\tif (vf->port_vlan_info)\n-\t\tice_vsi_kill_vlan(vsi, vf->port_vlan_info & VLAN_VID_MASK);\n-\n \tif (vlan_id || qos) {\n+\t\t/* remove VLAN 0 filter set by default when transitioning from\n+\t\t * no port VLAN to a port VLAN. No change to old port VLAN on\n+\t\t * failure.\n+\t\t */\n+\t\tret = ice_vsi_kill_vlan(vsi, 0);\n+\t\tif (ret)\n+\t\t\treturn ret;\n \t\tret = ice_vsi_manage_pvid(vsi, vlanprio, true);\n \t\tif (ret)\n-\t\t\tgoto error_manage_pvid;\n+\t\t\treturn ret;\n \t} else {\n+\t\t/* add VLAN 0 filter back when transitioning from port VLAN to\n+\t\t * no port VLAN. No change to old port VLAN on failure.\n+\t\t */\n+\t\tret = ice_vsi_add_vlan(vsi, 0);\n+\t\tif (ret)\n+\t\t\treturn ret;\n \t\tret = ice_vsi_manage_pvid(vsi, 0, false);\n \t\tif (ret)\n \t\t\tgoto error_manage_pvid;\n@@ -2712,15 +2724,16 @@ ice_set_vf_port_vlan(struct net_device *netdev, int vf_id, u16 vlan_id, u8 qos,\n \t\tdev_info(dev, \"Setting VLAN %d, QoS 0x%x on VF %d\\n\",\n \t\t\t vlan_id, qos, vf_id);\n \n-\t\t/* add new VLAN filter for each MAC */\n+\t\t/* add VLAN filter for the port VLAN */\n \t\tret = ice_vsi_add_vlan(vsi, vlan_id);\n \t\tif (ret)\n \t\t\tgoto error_manage_pvid;\n \t}\n+\t/* remove old port VLAN filter with valid VLAN ID or QoS fields */\n+\tif (vf->port_vlan_info)\n+\t\tice_vsi_kill_vlan(vsi, vf->port_vlan_info & VLAN_VID_MASK);\n \n-\t/* The Port VLAN needs to be saved across resets the same as the\n-\t * default LAN MAC address.\n-\t */\n+\t/* keep port VLAN information persistent on resets */\n \tvf->port_vlan_info = le16_to_cpu(vsi->info.pvid);\n \n error_manage_pvid:\n", "prefixes": [ "S38", "05/15" ] }