Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/678515/?format=api
{ "id": 678515, "url": "http://patchwork.ozlabs.org/api/patches/678515/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1475685046-16900-11-git-send-email-bimmy.pujari@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": "<1475685046-16900-11-git-send-email-bimmy.pujari@intel.com>", "list_archive_url": null, "date": "2016-10-05T16:30:40", "name": "[next,S49-V2,10/15] i40e: avoid looping to check whether we're in vlan mode", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "e09780061fe34c9fbbe691185be9bfb3e4d68359", "submitter": { "id": 68919, "url": "http://patchwork.ozlabs.org/api/people/68919/?format=api", "name": "Pujari, Bimmy", "email": "bimmy.pujari@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/1475685046-16900-11-git-send-email-bimmy.pujari@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/678515/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/678515/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<intel-wired-lan-bounces@lists.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" ], "Received": [ "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3sq1XM2QX6z9sCZ\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 6 Oct 2016 03:32:19 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id D2226C2370;\n\tWed, 5 Oct 2016 16:32:17 +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 IwN1RgO5OEnn; Wed, 5 Oct 2016 16:32:15 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id DE333C2382;\n\tWed, 5 Oct 2016 16:32:14 +0000 (UTC)", "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\tby ash.osuosl.org (Postfix) with ESMTP id 934061CE82D\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 5 Oct 2016 16:32:11 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 901E38B3D5\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 5 Oct 2016 16:32:11 +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 9x3oCHVXauy5 for <intel-wired-lan@lists.osuosl.org>;\n\tWed, 5 Oct 2016 16:32:10 +0000 (UTC)", "from mga05.intel.com (mga05.intel.com [192.55.52.43])\n\tby hemlock.osuosl.org (Postfix) with ESMTPS id C62928B015\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 5 Oct 2016 16:32:10 +0000 (UTC)", "from fmsmga005.fm.intel.com ([10.253.24.32])\n\tby fmsmga105.fm.intel.com with ESMTP; 05 Oct 2016 09:32:10 -0700", "from bimmy.jf.intel.com (HELO bimmy.linux1.jf.intel.com)\n\t([134.134.2.167])\n\tby fmsmga005.fm.intel.com with ESMTP; 05 Oct 2016 09:32:10 -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.31,449,1473145200\"; d=\"scan'208\";a=\"16526388\"", "From": "Bimmy Pujari <bimmy.pujari@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Wed, 5 Oct 2016 09:30:40 -0700", "Message-Id": "<1475685046-16900-11-git-send-email-bimmy.pujari@intel.com>", "X-Mailer": "git-send-email 2.4.11", "In-Reply-To": "<1475685046-16900-1-git-send-email-bimmy.pujari@intel.com>", "References": "<1475685046-16900-1-git-send-email-bimmy.pujari@intel.com>", "Subject": "[Intel-wired-lan] [next PATCH S49-V2 10/15] i40e: avoid looping to\n\tcheck whether we're in vlan mode", "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: Jacob Keller <jacob.e.keller@intel.com>\n\nWe determine that a vsi is in vlan_mode whenever it has any filters\nwith a vlan other than -1 (I40E_VLAN_ALL). The previous method of doing\nso was to perform a loop whenever we needed the check. However, we can\nnotice that only place where filters are added (i40e_add_filter) can\nchange the condition from false to true, and the only place we can\nreturn to false is in i40e_vsi_sync_filters_subtask. Thus, we can remove\nthe loop and use a boolean directly.\n\nDoing this avoids looping over filters repeatedly especially while we're\nalready inside a loop over all the filters. This should reduce the\nlatency of filter operations throughout the driver.\n\nSigned-off-by: Jacob Keller <jacob.e.keller@intel.com>\nChange-ID: Iafde08df588da2a2ea666997d05e11fad8edc338\n---\n drivers/net/ethernet/intel/i40e/i40e.h | 1 +\n drivers/net/ethernet/intel/i40e/i40e_main.c | 48 ++++++++++++++++++++++-------\n 2 files changed, 38 insertions(+), 11 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h\nindex 6545550..60dbb5b 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e.h\n@@ -517,6 +517,7 @@ struct i40e_vsi {\n \tspinlock_t mac_filter_hash_lock;\n \t/* Fixed size hash table with 2^8 buckets for MAC filters */\n \tDECLARE_HASHTABLE(mac_filter_hash, 8);\n+\tbool has_vlan_filter;\n \n \t/* VSI stats */\n \tstruct rtnl_link_stats64 net_stats;\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c\nindex 21725dc..327ffbf 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_main.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c\n@@ -1198,19 +1198,31 @@ struct i40e_mac_filter *i40e_find_mac(struct i40e_vsi *vsi, const u8 *macaddr)\n **/\n bool i40e_is_vsi_in_vlan(struct i40e_vsi *vsi)\n {\n-\tstruct i40e_mac_filter *f;\n-\tstruct hlist_node *h;\n-\tint bkt;\n+\t/* If we have a PVID, always operate in VLAN mode */\n+\tif (vsi->info.pvid)\n+\t\treturn true;\n \n-\t/* Only -1 for all the filters denotes not in vlan mode\n-\t * so we have to go through all the list in order to make sure\n+\t/* We need to operate in VLAN mode whenever we have any filters with\n+\t * a VLAN other than I40E_VLAN_ALL. We could check the table each\n+\t * time, incurring search cost repeatedly. However, we can notice two\n+\t * things:\n+\t *\n+\t * 1) the only place where we can gain a VLAN filter is in\n+\t * i40e_add_filter.\n+\t *\n+\t * 2) the only place where filters are actually removed is in\n+\t * i40e_vsi_sync_filters_subtask.\n+\t *\n+\t * Thus, we can simply use a boolean value, has_vlan_filters which we\n+\t * will set to true when we add a vlan filter in i40e_add_filter. Then\n+\t * we have to perform the full search after deleting filters in\n+\t * i40e_vsi_sync_filters_subtask, but we already have to search\n+\t * filters here and can perform the check at the same time. This\n+\t * results in avoiding embedding a loop for vlan mode inside another\n+\t * loop over all the filters, and should maintain correctness as noted\n+\t * above.\n \t */\n-\thash_for_each_safe(vsi->mac_filter_hash, bkt, h, f, hlist) {\n-\t\tif (f->vlan >= 0 || vsi->info.pvid)\n-\t\t\treturn true;\n-\t}\n-\n-\treturn false;\n+\treturn vsi->has_vlan_filter;\n }\n \n /**\n@@ -1246,6 +1258,12 @@ struct i40e_mac_filter *i40e_add_filter(struct i40e_vsi *vsi,\n \t\tif (!f)\n \t\t\treturn NULL;\n \n+\t\t/* Update the boolean indicating if we need to function in\n+\t\t * vlan mode.\n+\t\t */\n+\t\tif (vlan >= 0)\n+\t\t\tvsi->has_vlan_filter = true;\n+\n \t\tether_addr_copy(f->macaddr, macaddr);\n \t\tf->vlan = vlan;\n \t\t/* If we're in overflow promisc mode, set the state directly\n@@ -1979,6 +1997,14 @@ int i40e_sync_vsi_filters(struct i40e_vsi *vsi)\n \t\tdel_list = NULL;\n \t}\n \n+\t/* After finishing notifying firmware of the deleted filters, update\n+\t * the cached value of vsi->has_vlan_filter. Note that we are safe to\n+\t * use just !!vlan_filters here because if we only have VLAN=0 (that\n+\t * is, non_vlan_filters) these will all be converted to VLAN=-1 in the\n+\t * logic above already so this value would still be correct.\n+\t */\n+\tvsi->has_vlan_filter = !!vlan_filters;\n+\n \tif (!hlist_empty(&tmp_add_list)) {\n \t\t/* Do all the adds now. */\n \t\tfilter_list_len = hw->aq.asq_buf_size /\n", "prefixes": [ "next", "S49-V2", "10/15" ] }