Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1227509/?format=api
{ "id": 1227509, "url": "http://patchwork.ozlabs.org/api/patches/1227509/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20200122152138.41585-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": "<20200122152138.41585-4-anthony.l.nguyen@intel.com>", "list_archive_url": null, "date": "2020-01-22T15:21:27", "name": "[S38,04/15] ice: Fix Port VLAN priority bits", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "7d6c5a89b650a599f722524a99fc97d81a576306", "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-4-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/1227509/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1227509/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 4832Ls2pcCz9sRW\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 23 Jan 2020 10:54:29 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id E2A508303A;\n\tWed, 22 Jan 2020 23:54:27 +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 sa0nRRjARY3m; Wed, 22 Jan 2020 23:54:25 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 59A488558D;\n\tWed, 22 Jan 2020 23:54:25 +0000 (UTC)", "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\tby ash.osuosl.org (Postfix) with ESMTP id 9A6AD1BF988\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 22 Jan 2020 23:54:23 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 97A2D834A3\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 22 Jan 2020 23:54:23 +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 TzAdVtm2gmWI for <intel-wired-lan@lists.osuosl.org>;\n\tWed, 22 Jan 2020 23:54:22 +0000 (UTC)", "from mga17.intel.com (mga17.intel.com [192.55.52.151])\n\tby fraxinus.osuosl.org (Postfix) with ESMTPS id C9D65822C2\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:21 -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=\"259651613\"", "From": "Tony Nguyen <anthony.l.nguyen@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Wed, 22 Jan 2020 07:21:27 -0800", "Message-Id": "<20200122152138.41585-4-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 04/15] ice: Fix Port VLAN priority bits", "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 configuring a port VLAN for a VF we are only shifting the\nQoS bits by 12. This is incorrect. Fix this by getting rid of the ICE\nspecific VLAN defines and use the kernel VLAN defines instead.\n\nAlso, don't assign a value to vlanprio until the VLAN ID and QoS\nparameters have been validated.\n\nAlso, there are many places we do (le16_to_cpu(vsi->info.pvid) &\nVLAN_VID_MASK). Instead do (vf->port_vlan_info & VLAN_VID_MASK) because\nwe always save what's stored in vsi->info.pvid to vf->port_vlan_info in\nthe CPU's endianness.\n\nSigned-off-by: Brett Creeley <brett.creeley@intel.com>\n---\n .../net/ethernet/intel/ice/ice_virtchnl_pf.c | 27 +++++++++----------\n .../net/ethernet/intel/ice/ice_virtchnl_pf.h | 5 ----\n 2 files changed, 13 insertions(+), 19 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 0133a79bbf4c..250fbfd4c5ff 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,7 @@ 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 & ICE_VLAN_M);\n+\t\tice_vsi_add_vlan(vsi, vf->port_vlan_info & VLAN_VID_MASK);\n \t}\n \n \teth_broadcast_addr(broadcast);\n@@ -2659,19 +2659,20 @@ int\n ice_set_vf_port_vlan(struct net_device *netdev, int vf_id, u16 vlan_id, u8 qos,\n \t\t __be16 vlan_proto)\n {\n-\tu16 vlanprio = vlan_id | (qos << ICE_VLAN_PRIORITY_S);\n \tstruct ice_pf *pf = ice_netdev_to_pf(netdev);\n \tstruct ice_vsi *vsi;\n \tstruct device *dev;\n \tstruct ice_vf *vf;\n+\tu16 vlanprio;\n \tint ret = 0;\n \n \tdev = ice_pf_to_dev(pf);\n \tif (ice_validate_vf_id(pf, vf_id))\n \t\treturn -EINVAL;\n \n-\tif (vlan_id > ICE_MAX_VLANID || qos > 7) {\n-\t\tdev_err(dev, \"Invalid VF Parameters\\n\");\n+\tif (vlan_id >= VLAN_N_VID || qos > 7) {\n+\t\tdev_err(dev, \"Invalid Port VLAN parameters for VF %d, ID %d, QoS %d\\n\",\n+\t\t\tvf_id, vlan_id, qos);\n \t\treturn -EINVAL;\n \t}\n \n@@ -2685,16 +2686,17 @@ ice_set_vf_port_vlan(struct net_device *netdev, int vf_id, u16 vlan_id, u8 qos,\n \tif (ice_check_vf_init(pf, vf))\n \t\treturn -EBUSY;\n \n-\tif (le16_to_cpu(vsi->info.pvid) == vlanprio) {\n+\tvlanprio = vlan_id | (qos << VLAN_PRIO_SHIFT);\n+\n+\tif (vf->port_vlan_info == vlanprio) {\n \t\t/* duplicate request, so just return success */\n \t\tdev_dbg(dev, \"Duplicate pvid %d request\\n\", vlanprio);\n \t\treturn ret;\n \t}\n \n \t/* If PVID, then remove all filters on the old VLAN */\n-\tif (vsi->info.pvid)\n-\t\tice_vsi_kill_vlan(vsi, (le16_to_cpu(vsi->info.pvid) &\n-\t\t\t\t VLAN_VID_MASK));\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\tret = ice_vsi_manage_pvid(vsi, vlanprio, true);\n@@ -2775,7 +2777,7 @@ static int ice_vc_process_vlan_msg(struct ice_vf *vf, u8 *msg, bool add_v)\n \t}\n \n \tfor (i = 0; i < vfl->num_elements; i++) {\n-\t\tif (vfl->vlan_id[i] > ICE_MAX_VLANID) {\n+\t\tif (vfl->vlan_id[i] >= VLAN_N_VID) {\n \t\t\tv_ret = VIRTCHNL_STATUS_ERR_PARAM;\n \t\t\tdev_err(dev, \"invalid VF VLAN id %d\\n\",\n \t\t\t\tvfl->vlan_id[i]);\n@@ -3206,14 +3208,12 @@ int\n ice_get_vf_cfg(struct net_device *netdev, int vf_id, struct ifla_vf_info *ivi)\n {\n \tstruct ice_pf *pf = ice_netdev_to_pf(netdev);\n-\tstruct ice_vsi *vsi;\n \tstruct ice_vf *vf;\n \n \tif (ice_validate_vf_id(pf, vf_id))\n \t\treturn -EINVAL;\n \n \tvf = &pf->vf[vf_id];\n-\tvsi = pf->vsi[vf->lan_vsi_idx];\n \n \tif (ice_check_vf_init(pf, vf))\n \t\treturn -EBUSY;\n@@ -3222,9 +3222,8 @@ ice_get_vf_cfg(struct net_device *netdev, int vf_id, struct ifla_vf_info *ivi)\n \tether_addr_copy(ivi->mac, vf->dflt_lan_addr.addr);\n \n \t/* VF configuration for VLAN and applicable QoS */\n-\tivi->vlan = le16_to_cpu(vsi->info.pvid) & ICE_VLAN_M;\n-\tivi->qos = (le16_to_cpu(vsi->info.pvid) & ICE_PRIORITY_M) >>\n-\t\t ICE_VLAN_PRIORITY_S;\n+\tivi->vlan = vf->port_vlan_info & VLAN_VID_MASK;\n+\tivi->qos = (vf->port_vlan_info & VLAN_PRIO_MASK) >> VLAN_PRIO_SHIFT;\n \n \tivi->trusted = vf->trusted;\n \tivi->spoofchk = vf->spoofchk;\ndiff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h\nindex 80bb1acc7c28..a1bb196d417a 100644\n--- a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h\n+++ b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h\n@@ -5,11 +5,6 @@\n #define _ICE_VIRTCHNL_PF_H_\n #include \"ice.h\"\n \n-#define ICE_MAX_VLANID\t\t\t4095\n-#define ICE_VLAN_PRIORITY_S\t\t12\n-#define ICE_VLAN_M\t\t\t0xFFF\n-#define ICE_PRIORITY_M\t\t\t0x7000\n-\n /* Restrict number of MAC Addr and VLAN that non-trusted VF can programmed */\n #define ICE_MAX_VLAN_PER_VF\t\t8\n #define ICE_MAX_MACADDR_PER_VF\t\t12\n", "prefixes": [ "S38", "04/15" ] }