Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/989694/?format=api
{ "id": 989694, "url": "http://patchwork.ozlabs.org/api/patches/989694/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20181026174105.11628-6-anirudh.venkataramanan@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": "<20181026174105.11628-6-anirudh.venkataramanan@intel.com>", "list_archive_url": null, "date": "2018-10-26T17:40:54", "name": "[S8,05/16] ice: Remove duplicate addition of VLANs in replay path", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "189c2f38f5e93eb0df9de7df5019b273782a1925", "submitter": { "id": 73601, "url": "http://patchwork.ozlabs.org/api/people/73601/?format=api", "name": "Anirudh Venkataramanan", "email": "anirudh.venkataramanan@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/20181026174105.11628-6-anirudh.venkataramanan@intel.com/mbox/", "series": [ { "id": 72783, "url": "http://patchwork.ozlabs.org/api/series/72783/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=72783", "date": "2018-10-26T17:40:52", "name": "Bug fixes for ice, set 1/2", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/72783/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/989694/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/989694/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.136; helo=silver.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 silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\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 42hWd14VvQz9sLt\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat, 27 Oct 2018 04:46:13 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 38DC92476A;\n\tFri, 26 Oct 2018 17:46:12 +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 p+d0kZC3oxvj; Fri, 26 Oct 2018 17:46:08 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id 7D71322BCC;\n\tFri, 26 Oct 2018 17:46:08 +0000 (UTC)", "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\tby ash.osuosl.org (Postfix) with ESMTP id 95AF91BF402\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 26 Oct 2018 17:46:03 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 92183886D0\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 26 Oct 2018 17:46:03 +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 OrgwgLWWVSo1 for <intel-wired-lan@lists.osuosl.org>;\n\tFri, 26 Oct 2018 17:46:02 +0000 (UTC)", "from mga04.intel.com (mga04.intel.com [192.55.52.120])\n\tby hemlock.osuosl.org (Postfix) with ESMTPS id 0BDD98851D\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 26 Oct 2018 17:46:02 +0000 (UTC)", "from orsmga004.jf.intel.com ([10.7.209.38])\n\tby fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t26 Oct 2018 10:41:06 -0700", "from shasta.jf.intel.com ([10.166.241.11])\n\tby orsmga004.jf.intel.com with ESMTP; 26 Oct 2018 10:41:05 -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.54,428,1534834800\"; d=\"scan'208\";a=\"244654986\"", "From": "Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Fri, 26 Oct 2018 10:40:54 -0700", "Message-Id": "<20181026174105.11628-6-anirudh.venkataramanan@intel.com>", "X-Mailer": "git-send-email 2.14.3", "In-Reply-To": "<20181026174105.11628-1-anirudh.venkataramanan@intel.com>", "References": "<20181026174105.11628-1-anirudh.venkataramanan@intel.com>", "Subject": "[Intel-wired-lan] [PATCH S8 05/16] ice: Remove duplicate addition\n\tof VLANs in replay path", "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>", "MIME-Version": "1.0", "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": "ice_restore_vlan and active_vlans were originally put in place to\nreprogram VLAN filters in the replay path. This is now done as part\nof the much broader VSI rebuild/replay framework. So remove both\nice_restore_vlan and active_vlans\n\nSigned-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>\n---\n drivers/net/ethernet/intel/ice/ice.h | 1 -\n drivers/net/ethernet/intel/ice/ice_main.c | 42 ++++--------------------\n drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c | 2 --\n 3 files changed, 6 insertions(+), 39 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ice/ice.h b/drivers/net/ethernet/intel/ice/ice.h\nindex e5b37fa60884..1639e955f158 100644\n--- a/drivers/net/ethernet/intel/ice/ice.h\n+++ b/drivers/net/ethernet/intel/ice/ice.h\n@@ -191,7 +191,6 @@ struct ice_vsi {\n \tu64 tx_linearize;\n \tDECLARE_BITMAP(state, __ICE_STATE_NBITS);\n \tDECLARE_BITMAP(flags, ICE_VSI_FLAG_NBITS);\n-\tunsigned long active_vlans[BITS_TO_LONGS(VLAN_N_VID)];\n \tunsigned int current_netdev_flags;\n \tu32 tx_restart;\n \tu32 tx_busy;\ndiff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c\nindex aee22f11a41a..338abb1b9233 100644\n--- a/drivers/net/ethernet/intel/ice/ice_main.c\n+++ b/drivers/net/ethernet/intel/ice/ice_main.c\n@@ -1622,7 +1622,6 @@ static int ice_vlan_rx_add_vid(struct net_device *netdev,\n {\n \tstruct ice_netdev_priv *np = netdev_priv(netdev);\n \tstruct ice_vsi *vsi = np->vsi;\n-\tint ret;\n \n \tif (vid >= VLAN_N_VID) {\n \t\tnetdev_err(netdev, \"VLAN id requested %d is out of range %d\\n\",\n@@ -1635,7 +1634,8 @@ static int ice_vlan_rx_add_vid(struct net_device *netdev,\n \n \t/* Enable VLAN pruning when VLAN 0 is added */\n \tif (unlikely(!vid)) {\n-\t\tret = ice_cfg_vlan_pruning(vsi, true);\n+\t\tint ret = ice_cfg_vlan_pruning(vsi, true);\n+\n \t\tif (ret)\n \t\t\treturn ret;\n \t}\n@@ -1644,12 +1644,7 @@ static int ice_vlan_rx_add_vid(struct net_device *netdev,\n \t * needed to continue allowing all untagged packets since VLAN prune\n \t * list is applied to all packets by the switch\n \t */\n-\tret = ice_vsi_add_vlan(vsi, vid);\n-\n-\tif (!ret)\n-\t\tset_bit(vid, vsi->active_vlans);\n-\n-\treturn ret;\n+\treturn ice_vsi_add_vlan(vsi, vid);\n }\n \n /**\n@@ -1677,8 +1672,6 @@ static int ice_vlan_rx_kill_vid(struct net_device *netdev,\n \tif (status)\n \t\treturn status;\n \n-\tclear_bit(vid, vsi->active_vlans);\n-\n \t/* Disable VLAN pruning when VLAN 0 is removed */\n \tif (unlikely(!vid))\n \t\tstatus = ice_cfg_vlan_pruning(vsi, false);\n@@ -2515,31 +2508,6 @@ static int ice_vsi_vlan_setup(struct ice_vsi *vsi)\n \treturn ret;\n }\n \n-/**\n- * ice_restore_vlan - Reinstate VLANs when vsi/netdev comes back up\n- * @vsi: the VSI being brought back up\n- */\n-static int ice_restore_vlan(struct ice_vsi *vsi)\n-{\n-\tint err;\n-\tu16 vid;\n-\n-\tif (!vsi->netdev)\n-\t\treturn -EINVAL;\n-\n-\terr = ice_vsi_vlan_setup(vsi);\n-\tif (err)\n-\t\treturn err;\n-\n-\tfor_each_set_bit(vid, vsi->active_vlans, VLAN_N_VID) {\n-\t\terr = ice_vlan_rx_add_vid(vsi->netdev, htons(ETH_P_8021Q), vid);\n-\t\tif (err)\n-\t\t\tbreak;\n-\t}\n-\n-\treturn err;\n-}\n-\n /**\n * ice_vsi_cfg - Setup the VSI\n * @vsi: the VSI being configured\n@@ -2552,7 +2520,9 @@ static int ice_vsi_cfg(struct ice_vsi *vsi)\n \n \tif (vsi->netdev) {\n \t\tice_set_rx_mode(vsi->netdev);\n-\t\terr = ice_restore_vlan(vsi);\n+\n+\t\terr = ice_vsi_vlan_setup(vsi);\n+\n \t\tif (err)\n \t\t\treturn err;\n \t}\ndiff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c\nindex 45f10f8f01dc..9576b958622b 100644\n--- a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c\n+++ b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c\n@@ -2171,7 +2171,6 @@ static int ice_vc_process_vlan_msg(struct ice_vf *vf, u8 *msg, bool add_v)\n \n \t\t\tif (!ice_vsi_add_vlan(vsi, vid)) {\n \t\t\t\tvf->num_vlan++;\n-\t\t\t\tset_bit(vid, vsi->active_vlans);\n \n \t\t\t\t/* Enable VLAN pruning when VLAN 0 is added */\n \t\t\t\tif (unlikely(!vid))\n@@ -2190,7 +2189,6 @@ static int ice_vc_process_vlan_msg(struct ice_vf *vf, u8 *msg, bool add_v)\n \t\t\t */\n \t\t\tif (!ice_vsi_kill_vlan(vsi, vid)) {\n \t\t\t\tvf->num_vlan--;\n-\t\t\t\tclear_bit(vid, vsi->active_vlans);\n \n \t\t\t\t/* Disable VLAN pruning when removing VLAN 0 */\n \t\t\t\tif (unlikely(!vid))\n", "prefixes": [ "S8", "05/16" ] }