Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/676702/?format=api
{ "id": 676702, "url": "http://patchwork.ozlabs.org/api/patches/676702/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1475169095-20873-8-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": "<1475169095-20873-8-git-send-email-bimmy.pujari@intel.com>", "list_archive_url": null, "date": "2016-09-29T17:11:27", "name": "[next,S49,07/15] i40e: store MAC/VLAN filters in a hash with the MAC Address as key", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": false, "hash": "66383ef7fcb329ffc04a20b2e7006a57bca7d167", "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/1475169095-20873-8-git-send-email-bimmy.pujari@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/676702/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/676702/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 silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\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 3slLlD6FfCz9sBR\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 30 Sep 2016 03:14:00 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 48ECF32EB3;\n\tThu, 29 Sep 2016 17:13:59 +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 UKgryMimBtr2; Thu, 29 Sep 2016 17:13:32 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id DD72233003;\n\tThu, 29 Sep 2016 17:13:05 +0000 (UTC)", "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\tby ash.osuosl.org (Postfix) with ESMTP id 648261C1ECC\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 29 Sep 2016 17:13:03 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 6160C952AC\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 29 Sep 2016 17:13: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 JZl4h-KEYg0B for <intel-wired-lan@lists.osuosl.org>;\n\tThu, 29 Sep 2016 17:13:00 +0000 (UTC)", "from mga01.intel.com (mga01.intel.com [192.55.52.88])\n\tby hemlock.osuosl.org (Postfix) with ESMTPS id 7067C952D7\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 29 Sep 2016 17:12:59 +0000 (UTC)", "from fmsmga004.fm.intel.com ([10.253.24.48])\n\tby fmsmga101.fm.intel.com with ESMTP; 29 Sep 2016 10:12:58 -0700", "from bimmy.jf.intel.com (HELO bimmy.linux1.jf.intel.com)\n\t([134.134.2.167])\n\tby fmsmga004.fm.intel.com with ESMTP; 29 Sep 2016 10:12:59 -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,268,1473145200\"; d=\"scan'208\";a=\"174642306\"", "From": "Bimmy Pujari <bimmy.pujari@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Thu, 29 Sep 2016 10:11:27 -0700", "Message-Id": "<1475169095-20873-8-git-send-email-bimmy.pujari@intel.com>", "X-Mailer": "git-send-email 2.4.11", "In-Reply-To": "<1475169095-20873-1-git-send-email-bimmy.pujari@intel.com>", "References": "<1475169095-20873-1-git-send-email-bimmy.pujari@intel.com>", "Subject": "[Intel-wired-lan] [next PATCH S49 07/15] i40e: store MAC/VLAN\n\tfilters in a hash with the MAC Address as key", "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\nReplace the mac_filter_list with a static size hash table of 8bits. The\nprimary advantage of this is a decrease in latency of operations related\nto searching for specific MAC filters, including .set_rx_mode. Using\na linked list resulted in several locations which were O(n^2). Using\na hash table should give us latency growth closer to O(n*log(n)).\n\nSigned-off-by: Jacob Keller <jacob.e.keller@intel.com>\nChange-ID: I5330bd04053b880e670210933e35830b95948ebb\n---\nHSD-number: 10020681\n\n drivers/net/ethernet/intel/i40e/i40e.h | 24 ++-\n drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 4 +-\n drivers/net/ethernet/intel/i40e/i40e_main.c | 198 ++++++++++++---------\n drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 38 ++--\n 4 files changed, 159 insertions(+), 105 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h\nindex e301edb..c5d7a04 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e.h\n@@ -39,6 +39,7 @@\n #include <linux/iommu.h>\n #include <linux/slab.h>\n #include <linux/list.h>\n+#include <linux/hashtable.h>\n #include <linux/string.h>\n #include <linux/in.h>\n #include <linux/ip.h>\n@@ -445,6 +446,20 @@ struct i40e_pf {\n \tu16 phy_led_val;\n };\n \n+/**\n+ * i40e_mac_to_hkey - Convert a 6-byte MAC Address to a u64 hash key\n+ * @macaddr: the MAC Address as the base key\n+ *\n+ * Simply copies the address and returns it as a u64 for hashing\n+ **/\n+static inline u64 i40e_addr_to_hkey(const u8 *macaddr)\n+{\n+\tu64 key = 0;\n+\n+\tether_addr_copy((u8 *)&key, macaddr);\n+\treturn key;\n+}\n+\n enum i40e_filter_state {\n \tI40E_FILTER_INVALID = 0,\t/* Invalid state */\n \tI40E_FILTER_NEW,\t\t/* New, not sent to FW yet */\n@@ -454,7 +469,7 @@ enum i40e_filter_state {\n /* There is no 'removed' state; the filter struct is freed */\n };\n struct i40e_mac_filter {\n-\tstruct list_head list;\n+\tstruct hlist_node hlist;\n \tu8 macaddr[ETH_ALEN];\n #define I40E_VLAN_ANY -1\n \ts16 vlan;\n@@ -498,9 +513,10 @@ struct i40e_vsi {\n #define I40E_VSI_FLAG_VEB_OWNER\t\tBIT(1)\n \tunsigned long flags;\n \n-\t/* Per VSI lock to protect elements/list (MAC filter) */\n-\tspinlock_t mac_filter_list_lock;\n-\tstruct list_head mac_filter_list;\n+\t/* Per VSI lock to protect elements/hash (MAC filter) */\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 \n \t/* VSI stats */\n \tstruct rtnl_link_stats64 net_stats;\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_debugfs.c b/drivers/net/ethernet/intel/i40e/i40e_debugfs.c\nindex be87b73..f822d64 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_debugfs.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_debugfs.c\n@@ -134,7 +134,7 @@ static void i40e_dbg_dump_vsi_seid(struct i40e_pf *pf, int seid)\n \tstruct rtnl_link_stats64 *nstat;\n \tstruct i40e_mac_filter *f;\n \tstruct i40e_vsi *vsi;\n-\tint i;\n+\tint i, bkt;\n \n \tvsi = i40e_dbg_find_vsi(pf, seid);\n \tif (!vsi) {\n@@ -166,7 +166,7 @@ static void i40e_dbg_dump_vsi_seid(struct i40e_pf *pf, int seid)\n \t\t\t pf->hw.mac.addr,\n \t\t\t pf->hw.mac.san_addr,\n \t\t\t pf->hw.mac.port_addr);\n-\tlist_for_each_entry(f, &vsi->mac_filter_list, list) {\n+\thash_for_each(vsi->mac_filter_hash, bkt, f, hlist) {\n \t\tdev_info(&pf->pdev->dev,\n \t\t\t \" mac_filter_hash: %pM vid=%d, state %s\\n\",\n \t\t\t f->macaddr, f->vlan,\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c\nindex eaaaaf8..9814214 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_main.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c\n@@ -1152,11 +1152,13 @@ static struct i40e_mac_filter *i40e_find_filter(struct i40e_vsi *vsi,\n \t\t\t\t\t\tconst u8 *macaddr, s16 vlan)\n {\n \tstruct i40e_mac_filter *f;\n+\tu64 key;\n \n \tif (!vsi || !macaddr)\n \t\treturn NULL;\n \n-\tlist_for_each_entry(f, &vsi->mac_filter_list, list) {\n+\tkey = i40e_addr_to_hkey(macaddr);\n+\thash_for_each_possible(vsi->mac_filter_hash, f, hlist, key) {\n \t\tif ((ether_addr_equal(macaddr, f->macaddr)) &&\n \t\t (vlan == f->vlan))\n \t\t\treturn f;\n@@ -1175,11 +1177,13 @@ static struct i40e_mac_filter *i40e_find_filter(struct i40e_vsi *vsi,\n struct i40e_mac_filter *i40e_find_mac(struct i40e_vsi *vsi, const u8 *macaddr)\n {\n \tstruct i40e_mac_filter *f;\n+\tu64 key;\n \n \tif (!vsi || !macaddr)\n \t\treturn NULL;\n \n-\tlist_for_each_entry(f, &vsi->mac_filter_list, list) {\n+\tkey = i40e_addr_to_hkey(macaddr);\n+\thash_for_each_possible(vsi->mac_filter_hash, f, hlist, key) {\n \t\tif ((ether_addr_equal(macaddr, f->macaddr)))\n \t\t\treturn f;\n \t}\n@@ -1195,11 +1199,13 @@ struct i40e_mac_filter *i40e_find_mac(struct i40e_vsi *vsi, const u8 *macaddr)\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 \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 */\n-\tlist_for_each_entry(f, &vsi->mac_filter_list, list) {\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@@ -1215,13 +1221,14 @@ bool i40e_is_vsi_in_vlan(struct i40e_vsi *vsi)\n *\n * Returns ptr to the filter object or NULL when no memory available.\n *\n- * NOTE: This function is expected to be called with mac_filter_list_lock\n+ * NOTE: This function is expected to be called with mac_filter_hash_lock\n * being held.\n **/\n struct i40e_mac_filter *i40e_add_filter(struct i40e_vsi *vsi,\n \t\t\t\t\tconst u8 *macaddr, s16 vlan)\n {\n \tstruct i40e_mac_filter *f;\n+\tu64 key;\n \n \tif (!vsi || !macaddr)\n \t\treturn NULL;\n@@ -1249,8 +1256,10 @@ struct i40e_mac_filter *i40e_add_filter(struct i40e_vsi *vsi,\n \t\t\tf->state = I40E_FILTER_FAILED;\n \t\telse\n \t\t\tf->state = I40E_FILTER_NEW;\n-\t\tINIT_LIST_HEAD(&f->list);\n-\t\tlist_add_tail(&f->list, &vsi->mac_filter_list);\n+\t\tINIT_HLIST_NODE(&f->hlist);\n+\n+\t\tkey = i40e_addr_to_hkey(macaddr);\n+\t\thash_add(vsi->mac_filter_hash, &f->hlist, key);\n \n \t\tvsi->flags |= I40E_VSI_FLAG_FILTER_CHANGED;\n \t\tvsi->back->flags |= I40E_FLAG_FILTER_SYNC;\n@@ -1279,7 +1288,7 @@ struct i40e_mac_filter *i40e_add_filter(struct i40e_vsi *vsi,\n * the exact filter you will remove already, such as via i40e_find_filter or\n * i40e_find_mac.\n *\n- * NOTE: This function is expected to be called with mac_filter_list_lock\n+ * NOTE: This function is expected to be called with mac_filter_hash_lock\n * being held.\n * ANOTHER NOTE: This function MUST be called from within the context of\n * the \"safe\" variants of any list iterators, e.g. list_for_each_entry_safe()\n@@ -1295,7 +1304,7 @@ static void __i40e_del_filter(struct i40e_vsi *vsi, struct i40e_mac_filter *f)\n \t\t/* this one never got added by the FW. Just remove it,\n \t\t * no need to sync anything.\n \t\t */\n-\t\tlist_del(&f->list);\n+\t\thash_del(&f->hlist);\n \t\tkfree(f);\n \t} else {\n \t\tf->state = I40E_FILTER_REMOVE;\n@@ -1310,7 +1319,7 @@ static void __i40e_del_filter(struct i40e_vsi *vsi, struct i40e_mac_filter *f)\n * @macaddr: the MAC address\n * @vlan: the vlan\n *\n- * NOTE: This function is expected to be called with mac_filter_list_lock\n+ * NOTE: This function is expected to be called with mac_filter_hash_lock\n * being held.\n * ANOTHER NOTE: This function MUST be called from within the context of\n * the \"safe\" variants of any list iterators, e.g. list_for_each_entry_safe()\n@@ -1342,12 +1351,14 @@ struct i40e_mac_filter *i40e_put_mac_in_vlan(struct i40e_vsi *vsi,\n \t\t\t\t\t const u8 *macaddr)\n {\n \tstruct i40e_mac_filter *f, *add = NULL;\n+\tstruct hlist_node *h;\n+\tint bkt;\n \n \tif (vsi->info.pvid)\n \t\treturn i40e_add_filter(vsi, macaddr,\n \t\t\t\t le16_to_cpu(vsi->info.pvid));\n \n-\tlist_for_each_entry(f, &vsi->mac_filter_list, list) {\n+\thash_for_each_safe(vsi->mac_filter_hash, bkt, h, f, hlist) {\n \t\tif (f->state == I40E_FILTER_REMOVE)\n \t\t\tcontinue;\n \t\tadd = i40e_add_filter(vsi, macaddr, f->vlan);\n@@ -1369,12 +1380,14 @@ struct i40e_mac_filter *i40e_put_mac_in_vlan(struct i40e_vsi *vsi,\n **/\n int i40e_del_mac_all_vlan(struct i40e_vsi *vsi, const u8 *macaddr)\n {\n-\tstruct i40e_mac_filter *f, *ftmp;\n+\tstruct i40e_mac_filter *f;\n+\tstruct hlist_node *h;\n \tbool found = false;\n+\tint bkt;\n \n-\tWARN(!spin_is_locked(&vsi->mac_filter_list_lock),\n-\t \"Missing mac_filter_list_lock\\n\");\n-\tlist_for_each_entry_safe(f, ftmp, &vsi->mac_filter_list, list) {\n+\tWARN(!spin_is_locked(&vsi->mac_filter_hash_lock),\n+\t \"Missing mac_filter_hash_lock\\n\");\n+\thash_for_each_safe(vsi->mac_filter_hash, bkt, h, f, hlist) {\n \t\tif (ether_addr_equal(macaddr, f->macaddr))\n \t\t\tf->state = I40E_FILTER_REMOVE;\n \t\t\t__i40e_del_filter(vsi, f);\n@@ -1425,10 +1438,10 @@ static int i40e_set_mac(struct net_device *netdev, void *p)\n \telse\n \t\tnetdev_info(netdev, \"set new mac address %pM\\n\", addr->sa_data);\n \n-\tspin_lock_bh(&vsi->mac_filter_list_lock);\n+\tspin_lock_bh(&vsi->mac_filter_hash_lock);\n \ti40e_del_mac_all_vlan(vsi, netdev->dev_addr);\n \ti40e_put_mac_in_vlan(vsi, addr->sa_data);\n-\tspin_unlock_bh(&vsi->mac_filter_list_lock);\n+\tspin_unlock_bh(&vsi->mac_filter_hash_lock);\n \tether_addr_copy(netdev->dev_addr, addr->sa_data);\n \tif (vsi->type == I40E_VSI_MAIN) {\n \t\ti40e_status ret;\n@@ -1650,12 +1663,12 @@ static void i40e_set_rx_mode(struct net_device *netdev)\n \tstruct i40e_netdev_priv *np = netdev_priv(netdev);\n \tstruct i40e_vsi *vsi = np->vsi;\n \n-\tspin_lock_bh(&vsi->mac_filter_list_lock);\n+\tspin_lock_bh(&vsi->mac_filter_hash_lock);\n \n \t__dev_uc_sync(netdev, i40e_addr_sync, i40e_addr_unsync);\n \t__dev_mc_sync(netdev, i40e_addr_sync, i40e_addr_unsync);\n \n-\tspin_unlock_bh(&vsi->mac_filter_list_lock);\n+\tspin_unlock_bh(&vsi->mac_filter_hash_lock);\n \n \t/* check for other flag changes */\n \tif (vsi->current_netdev_flags != vsi->netdev->flags) {\n@@ -1678,13 +1691,17 @@ static void i40e_set_rx_mode(struct net_device *netdev)\n * MAC filter entries from list were slated to be removed from device.\n **/\n static void i40e_undo_del_filter_entries(struct i40e_vsi *vsi,\n-\t\t\t\t\t struct list_head *from)\n+\t\t\t\t\t struct hlist_head *from)\n {\n-\tstruct i40e_mac_filter *f, *ftmp;\n+\tstruct i40e_mac_filter *f;\n+\tstruct hlist_node *h;\n+\n+\thlist_for_each_entry_safe(f, h, from, hlist) {\n+\t\tu64 key = i40e_addr_to_hkey(f->macaddr);\n \n-\tlist_for_each_entry_safe(f, ftmp, from, list) {\n \t\t/* Move the element back into MAC filter list*/\n-\t\tlist_move_tail(&f->list, &vsi->mac_filter_list);\n+\t\thlist_del(&f->hlist);\n+\t\thash_add(vsi->mac_filter_hash, &f->hlist, key);\n \t}\n }\n \n@@ -1713,7 +1730,9 @@ i40e_update_filter_state(int count,\n \t\t/* Everything's good, mark all filters active. */\n \t\tfor (i = 0; i < count ; i++) {\n \t\t\tadd_head->state = I40E_FILTER_ACTIVE;\n-\t\t\tadd_head = list_next_entry(add_head, list);\n+\t\t\tadd_head = hlist_entry(add_head->hlist.next,\n+\t\t\t\t\t typeof(struct i40e_mac_filter),\n+\t\t\t\t\t hlist);\n \t\t}\n \t} else if (aq_err == I40E_AQ_RC_ENOSPC) {\n \t\t/* Device ran out of filter space. Check the return value\n@@ -1727,14 +1746,18 @@ i40e_update_filter_state(int count,\n \t\t\t\tadd_head->state = I40E_FILTER_ACTIVE;\n \t\t\t\tretval++;\n \t\t\t}\n-\t\t\tadd_head = list_next_entry(add_head, list);\n+\t\t\tadd_head = hlist_entry(add_head->hlist.next,\n+\t\t\t\t\t typeof(struct i40e_mac_filter),\n+\t\t\t\t\t hlist);\n \t\t}\n \t} else {\n \t\t/* Some other horrible thing happened, fail all filters */\n \t\tretval = 0;\n \t\tfor (i = 0; i < count ; i++) {\n \t\t\tadd_head->state = I40E_FILTER_FAILED;\n-\t\t\tadd_head = list_next_entry(add_head, list);\n+\t\t\tadd_head = hlist_entry(add_head->hlist.next,\n+\t\t\t\t\t typeof(struct i40e_mac_filter),\n+\t\t\t\t\t hlist);\n \t\t}\n \t}\n \treturn retval;\n@@ -1750,14 +1773,15 @@ i40e_update_filter_state(int count,\n **/\n int i40e_sync_vsi_filters(struct i40e_vsi *vsi)\n {\n-\tstruct i40e_mac_filter *f, *ftmp, *add_head = NULL;\n-\tstruct list_head tmp_add_list, tmp_del_list;\n+\tstruct i40e_mac_filter *f, *add_head = NULL;\n+\tstruct hlist_head tmp_add_list, tmp_del_list;\n \tstruct i40e_hw *hw = &vsi->back->hw;\n \tbool promisc_changed = false;\n \tchar vsi_name[16] = \"PF\";\n \tint filter_list_len = 0;\n \tu32 changed_flags = 0;\n \ti40e_status aq_ret = 0;\n+\tstruct hlist_node *h;\n \tint retval = 0;\n \tstruct i40e_pf *pf;\n \tint num_add = 0;\n@@ -1766,6 +1790,7 @@ int i40e_sync_vsi_filters(struct i40e_vsi *vsi)\n \tu16 cmd_flags;\n \tint list_size;\n \tint fcnt;\n+\tint bkt;\n \n \t/* empty array typed pointers, kcalloc later */\n \tstruct i40e_aqc_add_macvlan_element_data *add_list;\n@@ -1780,8 +1805,8 @@ int i40e_sync_vsi_filters(struct i40e_vsi *vsi)\n \t\tvsi->current_netdev_flags = vsi->netdev->flags;\n \t}\n \n-\tINIT_LIST_HEAD(&tmp_add_list);\n-\tINIT_LIST_HEAD(&tmp_del_list);\n+\tINIT_HLIST_HEAD(&tmp_add_list);\n+\tINIT_HLIST_HEAD(&tmp_del_list);\n \n \tif (vsi->type == I40E_VSI_SRIOV)\n \t\tsnprintf(vsi_name, sizeof(vsi_name) - 1, \"VF %d\", vsi->vf_id);\n@@ -1791,24 +1816,25 @@ int i40e_sync_vsi_filters(struct i40e_vsi *vsi)\n \tif (vsi->flags & I40E_VSI_FLAG_FILTER_CHANGED) {\n \t\tvsi->flags &= ~I40E_VSI_FLAG_FILTER_CHANGED;\n \n-\t\tspin_lock_bh(&vsi->mac_filter_list_lock);\n+\t\tspin_lock_bh(&vsi->mac_filter_hash_lock);\n \t\t/* Create a list of filters to delete. */\n-\t\tlist_for_each_entry_safe(f, ftmp, &vsi->mac_filter_list, list) {\n+\t\thash_for_each_safe(vsi->mac_filter_hash, bkt, h, f, hlist) {\n \t\t\tif (f->state == I40E_FILTER_REMOVE) {\n \t\t\t\t/* Move the element into temporary del_list */\n-\t\t\t\tlist_move_tail(&f->list, &tmp_del_list);\n+\t\t\t\thash_del(&f->hlist);\n+\t\t\t\thlist_add_head(&f->hlist, &tmp_del_list);\n \t\t\t\tvsi->active_filters--;\n \t\t\t}\n \t\t\tif (f->state == I40E_FILTER_NEW) {\n-\t\t\t\t/* Move the element into temporary add_list */\n-\t\t\t\tlist_move_tail(&f->list, &tmp_add_list);\n+\t\t\t\thash_del(&f->hlist);\n+\t\t\t\thlist_add_head(&f->hlist, &tmp_add_list);\n \t\t\t}\n \t\t}\n-\t\tspin_unlock_bh(&vsi->mac_filter_list_lock);\n+\t\tspin_unlock_bh(&vsi->mac_filter_hash_lock);\n \t}\n \n \t/* Now process 'del_list' outside the lock */\n-\tif (!list_empty(&tmp_del_list)) {\n+\tif (!hlist_empty(&tmp_del_list)) {\n \t\tfilter_list_len = hw->aq.asq_buf_size /\n \t\t\t sizeof(struct i40e_aqc_remove_macvlan_element_data);\n \t\tlist_size = filter_list_len *\n@@ -1816,14 +1842,14 @@ int i40e_sync_vsi_filters(struct i40e_vsi *vsi)\n \t\tdel_list = kzalloc(list_size, GFP_ATOMIC);\n \t\tif (!del_list) {\n \t\t\t/* Undo VSI's MAC filter entry element updates */\n-\t\t\tspin_lock_bh(&vsi->mac_filter_list_lock);\n+\t\t\tspin_lock_bh(&vsi->mac_filter_hash_lock);\n \t\t\ti40e_undo_del_filter_entries(vsi, &tmp_del_list);\n-\t\t\tspin_unlock_bh(&vsi->mac_filter_list_lock);\n+\t\t\tspin_unlock_bh(&vsi->mac_filter_hash_lock);\n \t\t\tretval = -ENOMEM;\n \t\t\tgoto out;\n \t\t}\n \n-\t\tlist_for_each_entry_safe(f, ftmp, &tmp_del_list, list) {\n+\t\thlist_for_each_entry_safe(f, h, &tmp_del_list, hlist) {\n \t\t\tcmd_flags = 0;\n \n \t\t\t/* add to delete list */\n@@ -1864,7 +1890,7 @@ int i40e_sync_vsi_filters(struct i40e_vsi *vsi)\n \t\t\t/* Release memory for MAC filter entries which were\n \t\t\t * synced up with HW.\n \t\t\t */\n-\t\t\tlist_del(&f->list);\n+\t\t\thlist_del(&f->hlist);\n \t\t\tkfree(f);\n \t\t}\n \n@@ -1891,7 +1917,7 @@ int i40e_sync_vsi_filters(struct i40e_vsi *vsi)\n \t\tdel_list = NULL;\n \t}\n \n-\tif (!list_empty(&tmp_add_list)) {\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 \t\t\t sizeof(struct i40e_aqc_add_macvlan_element_data);\n@@ -1903,7 +1929,7 @@ int i40e_sync_vsi_filters(struct i40e_vsi *vsi)\n \t\t\tgoto out;\n \t\t}\n \t\tnum_add = 0;\n-\t\tlist_for_each_entry(f, &tmp_add_list, list) {\n+\t\thlist_for_each_entry(f, &tmp_add_list, hlist) {\n \t\t\tif (test_bit(__I40E_FILTER_OVERFLOW_PROMISC,\n \t\t\t\t &vsi->state)) {\n \t\t\t\tf->state = I40E_FILTER_FAILED;\n@@ -1974,11 +2000,14 @@ int i40e_sync_vsi_filters(struct i40e_vsi *vsi)\n \t\t/* Now move all of the filters from the temp add list back to\n \t\t * the VSI's list.\n \t\t */\n-\t\tspin_lock_bh(&vsi->mac_filter_list_lock);\n-\t\tlist_for_each_entry_safe(f, ftmp, &tmp_add_list, list) {\n-\t\t\tlist_move_tail(&f->list, &vsi->mac_filter_list);\n+\t\tspin_lock_bh(&vsi->mac_filter_hash_lock);\n+\t\thlist_for_each_entry_safe(f, h, &tmp_add_list, hlist) {\n+\t\t\tu64 key = i40e_addr_to_hkey(f->macaddr);\n+\n+\t\t\thlist_del(&f->hlist);\n+\t\t\thash_add(vsi->mac_filter_hash, &f->hlist, key);\n \t\t}\n-\t\tspin_unlock_bh(&vsi->mac_filter_list_lock);\n+\t\tspin_unlock_bh(&vsi->mac_filter_hash_lock);\n \t\tkfree(add_list);\n \t\tadd_list = NULL;\n \t}\n@@ -1990,12 +2019,12 @@ int i40e_sync_vsi_filters(struct i40e_vsi *vsi)\n \t\t/* See if we have any failed filters. We can't drop out of\n \t\t * promiscuous until these have all been deleted.\n \t\t */\n-\t\tspin_lock_bh(&vsi->mac_filter_list_lock);\n-\t\tlist_for_each_entry(f, &vsi->mac_filter_list, list) {\n+\t\tspin_lock_bh(&vsi->mac_filter_hash_lock);\n+\t\thash_for_each(vsi->mac_filter_hash, bkt, f, hlist) {\n \t\t\tif (f->state == I40E_FILTER_FAILED)\n \t\t\t\tfailed_count++;\n \t\t}\n-\t\tspin_unlock_bh(&vsi->mac_filter_list_lock);\n+\t\tspin_unlock_bh(&vsi->mac_filter_hash_lock);\n \t\tif (!failed_count) {\n \t\t\tdev_info(&pf->pdev->dev,\n \t\t\t\t \"filter logjam cleared on %s, leaving overflow promiscuous mode\\n\",\n@@ -2270,10 +2299,12 @@ static void i40e_vlan_rx_register(struct net_device *netdev, u32 features)\n **/\n int i40e_vsi_add_vlan(struct i40e_vsi *vsi, s16 vid)\n {\n-\tstruct i40e_mac_filter *f, *ftmp, *add_f, *del_f;\n+\tstruct i40e_mac_filter *f, *add_f, *del_f;\n+\tstruct hlist_node *h;\n+\tint bkt;\n \n \t/* Locked once because all functions invoked below iterates list*/\n-\tspin_lock_bh(&vsi->mac_filter_list_lock);\n+\tspin_lock_bh(&vsi->mac_filter_hash_lock);\n \n \tif (vsi->netdev) {\n \t\tadd_f = i40e_add_filter(vsi, vsi->netdev->dev_addr, vid);\n@@ -2281,12 +2312,12 @@ int i40e_vsi_add_vlan(struct i40e_vsi *vsi, s16 vid)\n \t\t\tdev_info(&vsi->back->pdev->dev,\n \t\t\t\t \"Could not add vlan filter %d for %pM\\n\",\n \t\t\t\t vid, vsi->netdev->dev_addr);\n-\t\t\tspin_unlock_bh(&vsi->mac_filter_list_lock);\n+\t\t\tspin_unlock_bh(&vsi->mac_filter_hash_lock);\n \t\t\treturn -ENOMEM;\n \t\t}\n \t}\n \n-\tlist_for_each_entry_safe(f, ftmp, &vsi->mac_filter_list, list) {\n+\thash_for_each_safe(vsi->mac_filter_hash, bkt, h, f, hlist) {\n \t\tif (f->state == I40E_FILTER_REMOVE)\n \t\t\tcontinue;\n \t\tadd_f = i40e_add_filter(vsi, f->macaddr, vid);\n@@ -2294,7 +2325,7 @@ int i40e_vsi_add_vlan(struct i40e_vsi *vsi, s16 vid)\n \t\t\tdev_info(&vsi->back->pdev->dev,\n \t\t\t\t \"Could not add vlan filter %d for %pM\\n\",\n \t\t\t\t vid, f->macaddr);\n-\t\t\tspin_unlock_bh(&vsi->mac_filter_list_lock);\n+\t\t\tspin_unlock_bh(&vsi->mac_filter_hash_lock);\n \t\t\treturn -ENOMEM;\n \t\t}\n \t}\n@@ -2314,7 +2345,7 @@ int i40e_vsi_add_vlan(struct i40e_vsi *vsi, s16 vid)\n \t\t\t\tdev_info(&vsi->back->pdev->dev,\n \t\t\t\t\t \"Could not add filter 0 for %pM\\n\",\n \t\t\t\t\t vsi->netdev->dev_addr);\n-\t\t\t\tspin_unlock_bh(&vsi->mac_filter_list_lock);\n+\t\t\t\tspin_unlock_bh(&vsi->mac_filter_hash_lock);\n \t\t\t\treturn -ENOMEM;\n \t\t\t}\n \t\t}\n@@ -2322,7 +2353,7 @@ int i40e_vsi_add_vlan(struct i40e_vsi *vsi, s16 vid)\n \n \t/* Do not assume that I40E_VLAN_ANY should be reset to VLAN 0 */\n \tif (vid > 0 && !vsi->info.pvid) {\n-\t\tlist_for_each_entry_safe(f, ftmp, &vsi->mac_filter_list, list) {\n+\t\thash_for_each_safe(vsi->mac_filter_hash, bkt, h, f, hlist) {\n \t\t\tif (f->state == I40E_FILTER_REMOVE)\n \t\t\t\tcontinue;\n \t\t\tdel_f = i40e_find_filter(vsi, f->macaddr,\n@@ -2335,13 +2366,13 @@ int i40e_vsi_add_vlan(struct i40e_vsi *vsi, s16 vid)\n \t\t\t\tdev_info(&vsi->back->pdev->dev,\n \t\t\t\t\t \"Could not add filter 0 for %pM\\n\",\n \t\t\t\t\tf->macaddr);\n-\t\t\t\tspin_unlock_bh(&vsi->mac_filter_list_lock);\n+\t\t\t\tspin_unlock_bh(&vsi->mac_filter_hash_lock);\n \t\t\t\treturn -ENOMEM;\n \t\t\t}\n \t\t}\n \t}\n \n-\tspin_unlock_bh(&vsi->mac_filter_list_lock);\n+\tspin_unlock_bh(&vsi->mac_filter_hash_lock);\n \n \t/* schedule our worker thread which will take care of\n \t * applying the new filter changes\n@@ -2360,16 +2391,18 @@ int i40e_vsi_add_vlan(struct i40e_vsi *vsi, s16 vid)\n int i40e_vsi_kill_vlan(struct i40e_vsi *vsi, s16 vid)\n {\n \tstruct net_device *netdev = vsi->netdev;\n-\tstruct i40e_mac_filter *f, *ftmp, *add_f;\n+\tstruct i40e_mac_filter *f, *add_f;\n+\tstruct hlist_node *h;\n \tint filter_count = 0;\n+\tint bkt;\n \n \t/* Locked once because all functions invoked below iterates list */\n-\tspin_lock_bh(&vsi->mac_filter_list_lock);\n+\tspin_lock_bh(&vsi->mac_filter_hash_lock);\n \n \tif (vsi->netdev)\n \t\ti40e_del_filter(vsi, netdev->dev_addr, vid);\n \n-\tlist_for_each_entry_safe(f, ftmp, &vsi->mac_filter_list, list) {\n+\thash_for_each_safe(vsi->mac_filter_hash, bkt, h, f, hlist) {\n \t\tif (f->vlan == vid)\n \t\t\t__i40e_del_filter(vsi, f);\n \t}\n@@ -2379,7 +2412,7 @@ int i40e_vsi_kill_vlan(struct i40e_vsi *vsi, s16 vid)\n \t * be replaced with -1. This signifies that we should from now\n \t * on accept any traffic (with any tag present, or untagged)\n \t */\n-\tlist_for_each_entry(f, &vsi->mac_filter_list, list) {\n+\thash_for_each(vsi->mac_filter_hash, bkt, f, hlist) {\n \t\tif (vsi->netdev) {\n \t\t\tif (f->vlan &&\n \t\t\t ether_addr_equal(netdev->dev_addr, f->macaddr))\n@@ -2397,13 +2430,13 @@ int i40e_vsi_kill_vlan(struct i40e_vsi *vsi, s16 vid)\n \t\t\tdev_info(&vsi->back->pdev->dev,\n \t\t\t\t \"Could not add filter %d for %pM\\n\",\n \t\t\t\t I40E_VLAN_ANY, netdev->dev_addr);\n-\t\t\tspin_unlock_bh(&vsi->mac_filter_list_lock);\n+\t\t\tspin_unlock_bh(&vsi->mac_filter_hash_lock);\n \t\t\treturn -ENOMEM;\n \t\t}\n \t}\n \n \tif (!filter_count) {\n-\t\tlist_for_each_entry_safe(f, ftmp, &vsi->mac_filter_list, list) {\n+\t\thash_for_each_safe(vsi->mac_filter_hash, bkt, h, f, hlist) {\n \t\t\tif (!f->vlan)\n \t\t\t\t__i40e_del_filter(vsi, f);\n \t\t\tadd_f = i40e_add_filter(vsi, f->macaddr, I40E_VLAN_ANY);\n@@ -2411,13 +2444,13 @@ int i40e_vsi_kill_vlan(struct i40e_vsi *vsi, s16 vid)\n \t\t\t\tdev_info(&vsi->back->pdev->dev,\n \t\t\t\t\t \"Could not add filter %d for %pM\\n\",\n \t\t\t\t\t I40E_VLAN_ANY, f->macaddr);\n-\t\t\t\tspin_unlock_bh(&vsi->mac_filter_list_lock);\n+\t\t\t\tspin_unlock_bh(&vsi->mac_filter_hash_lock);\n \t\t\t\treturn -ENOMEM;\n \t\t\t}\n \t\t}\n \t}\n \n-\tspin_unlock_bh(&vsi->mac_filter_list_lock);\n+\tspin_unlock_bh(&vsi->mac_filter_hash_lock);\n \n \t/* schedule our worker thread which will take care of\n \t * applying the new filter changes\n@@ -7286,7 +7319,7 @@ static int i40e_vsi_mem_alloc(struct i40e_pf *pf, enum i40e_vsi_type type)\n \t\t\t\tpf->rss_table_size : 64;\n \tvsi->netdev_registered = false;\n \tvsi->work_limit = I40E_DEFAULT_IRQ_WORK;\n-\tINIT_LIST_HEAD(&vsi->mac_filter_list);\n+\thash_init(vsi->mac_filter_hash);\n \tvsi->irqs_ready = false;\n \n \tret = i40e_set_num_rings_in_vsi(vsi);\n@@ -7301,7 +7334,7 @@ static int i40e_vsi_mem_alloc(struct i40e_pf *pf, enum i40e_vsi_type type)\n \ti40e_vsi_setup_irqhandler(vsi, i40e_msix_clean_rings);\n \n \t/* Initialize VSI lock */\n-\tspin_lock_init(&vsi->mac_filter_list_lock);\n+\tspin_lock_init(&vsi->mac_filter_hash_lock);\n \tpf->vsi[vsi_idx] = vsi;\n \tret = vsi_idx;\n \tgoto unlock_pf;\n@@ -9094,18 +9127,18 @@ static int i40e_config_netdev(struct i40e_vsi *vsi)\n \tif (vsi->type == I40E_VSI_MAIN) {\n \t\tSET_NETDEV_DEV(netdev, &pf->pdev->dev);\n \t\tether_addr_copy(mac_addr, hw->mac.perm_addr);\n-\t\tspin_lock_bh(&vsi->mac_filter_list_lock);\n+\t\tspin_lock_bh(&vsi->mac_filter_hash_lock);\n \t\ti40e_add_filter(vsi, mac_addr, I40E_VLAN_ANY);\n-\t\tspin_unlock_bh(&vsi->mac_filter_list_lock);\n+\t\tspin_unlock_bh(&vsi->mac_filter_hash_lock);\n \t} else {\n \t\t/* relate the VSI_VMDQ name to the VSI_MAIN name */\n \t\tsnprintf(netdev->name, IFNAMSIZ, \"%sv%%d\",\n \t\t\t pf->vsi[pf->lan_vsi]->netdev->name);\n \t\trandom_ether_addr(mac_addr);\n \n-\t\tspin_lock_bh(&vsi->mac_filter_list_lock);\n+\t\tspin_lock_bh(&vsi->mac_filter_hash_lock);\n \t\ti40e_add_filter(vsi, mac_addr, I40E_VLAN_ANY);\n-\t\tspin_unlock_bh(&vsi->mac_filter_list_lock);\n+\t\tspin_unlock_bh(&vsi->mac_filter_hash_lock);\n \t}\n \n \tether_addr_copy(netdev->dev_addr, mac_addr);\n@@ -9189,7 +9222,9 @@ static int i40e_add_vsi(struct i40e_vsi *vsi)\n \tstruct i40e_pf *pf = vsi->back;\n \tstruct i40e_hw *hw = &pf->hw;\n \tstruct i40e_vsi_context ctxt;\n-\tstruct i40e_mac_filter *f, *ftmp;\n+\tstruct i40e_mac_filter *f;\n+\tstruct hlist_node *h;\n+\tint bkt;\n \n \tu8 enabled_tc = 0x1; /* TC0 enabled */\n \tint f_count = 0;\n@@ -9388,13 +9423,13 @@ static int i40e_add_vsi(struct i40e_vsi *vsi)\n \n \tvsi->active_filters = 0;\n \tclear_bit(__I40E_FILTER_OVERFLOW_PROMISC, &vsi->state);\n-\tspin_lock_bh(&vsi->mac_filter_list_lock);\n+\tspin_lock_bh(&vsi->mac_filter_hash_lock);\n \t/* If macvlan filters already exist, force them to get loaded */\n-\tlist_for_each_entry_safe(f, ftmp, &vsi->mac_filter_list, list) {\n+\thash_for_each_safe(vsi->mac_filter_hash, bkt, h, f, hlist) {\n \t\tf->state = I40E_FILTER_NEW;\n \t\tf_count++;\n \t}\n-\tspin_unlock_bh(&vsi->mac_filter_list_lock);\n+\tspin_unlock_bh(&vsi->mac_filter_hash_lock);\n \n \tif (f_count) {\n \t\tvsi->flags |= I40E_VSI_FLAG_FILTER_CHANGED;\n@@ -9424,11 +9459,12 @@ err:\n **/\n int i40e_vsi_release(struct i40e_vsi *vsi)\n {\n-\tstruct i40e_mac_filter *f, *ftmp;\n+\tstruct i40e_mac_filter *f;\n+\tstruct hlist_node *h;\n \tstruct i40e_veb *veb = NULL;\n \tstruct i40e_pf *pf;\n \tu16 uplink_seid;\n-\tint i, n;\n+\tint i, n, bkt;\n \n \tpf = vsi->back;\n \n@@ -9458,7 +9494,7 @@ int i40e_vsi_release(struct i40e_vsi *vsi)\n \t\ti40e_vsi_disable_irq(vsi);\n \t}\n \n-\tspin_lock_bh(&vsi->mac_filter_list_lock);\n+\tspin_lock_bh(&vsi->mac_filter_hash_lock);\n \n \t/* clear the sync flag on all filters */\n \tif (vsi->netdev) {\n@@ -9467,10 +9503,10 @@ int i40e_vsi_release(struct i40e_vsi *vsi)\n \t}\n \n \t/* make sure any remaining filters are marked for deletion */\n-\tlist_for_each_entry_safe(f, ftmp, &vsi->mac_filter_list, list)\n+\thash_for_each_safe(vsi->mac_filter_hash, bkt, h, f, hlist)\n \t\t__i40e_del_filter(vsi, f);\n \n-\tspin_unlock_bh(&vsi->mac_filter_list_lock);\n+\tspin_unlock_bh(&vsi->mac_filter_hash_lock);\n \n \ti40e_sync_vsi_filters(vsi);\n \ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c\nindex dccc9f8..df917b1 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c\n@@ -686,7 +686,7 @@ static int i40e_alloc_vsi_res(struct i40e_vf *vf, enum i40e_vsi_type type)\n \t\tif (vf->port_vlan_id)\n \t\t\ti40e_vsi_add_pvid(vsi, vf->port_vlan_id);\n \n-\t\tspin_lock_bh(&vsi->mac_filter_list_lock);\n+\t\tspin_lock_bh(&vsi->mac_filter_hash_lock);\n \t\tif (is_valid_ether_addr(vf->default_lan_addr.addr)) {\n \t\t\tf = i40e_add_filter(vsi, vf->default_lan_addr.addr,\n \t\t\t\t vf->port_vlan_id ?\n@@ -696,7 +696,7 @@ static int i40e_alloc_vsi_res(struct i40e_vf *vf, enum i40e_vsi_type type)\n \t\t\t\t\t \"Could not add MAC filter %pM for VF %d\\n\",\n \t\t\t\t\tvf->default_lan_addr.addr, vf->vf_id);\n \t\t}\n-\t\tspin_unlock_bh(&vsi->mac_filter_list_lock);\n+\t\tspin_unlock_bh(&vsi->mac_filter_hash_lock);\n \t\ti40e_write_rx_ctl(&pf->hw, I40E_VFQF_HENA1(0, vf->vf_id),\n \t\t\t\t (u32)hena);\n \t\ti40e_write_rx_ctl(&pf->hw, I40E_VFQF_HENA1(1, vf->vf_id),\n@@ -1449,9 +1449,9 @@ static void i40e_vc_reset_vf_msg(struct i40e_vf *vf)\n static inline int i40e_getnum_vf_vsi_vlan_filters(struct i40e_vsi *vsi)\n {\n \tstruct i40e_mac_filter *f;\n-\tint num_vlans = 0;\n+\tint num_vlans = 0, bkt;\n \n-\tlist_for_each_entry(f, &vsi->mac_filter_list, list) {\n+\thash_for_each(vsi->mac_filter_hash, bkt, f, hlist) {\n \t\tif (f->vlan >= 0 && f->vlan <= I40E_MAX_VLANID)\n \t\t\tnum_vlans++;\n \t}\n@@ -1481,6 +1481,7 @@ static int i40e_vc_config_promiscuous_mode_msg(struct i40e_vf *vf,\n \tstruct i40e_vsi *vsi;\n \tbool alluni = false;\n \tint aq_err = 0;\n+\tint bkt;\n \n \tvsi = i40e_find_vsi_from_id(pf, info->vsi_id);\n \tif (!test_bit(I40E_VF_STAT_ACTIVE, &vf->vf_states) ||\n@@ -1507,7 +1508,7 @@ static int i40e_vc_config_promiscuous_mode_msg(struct i40e_vf *vf,\n \t\t\t\t\t\t\t vf->port_vlan_id,\n \t\t\t\t\t\t\t NULL);\n \t} else if (i40e_getnum_vf_vsi_vlan_filters(vsi)) {\n-\t\tlist_for_each_entry(f, &vsi->mac_filter_list, list) {\n+\t\thash_for_each(vsi->mac_filter_hash, bkt, f, hlist) {\n \t\t\tif (f->vlan < 0 || f->vlan > I40E_MAX_VLANID)\n \t\t\t\tcontinue;\n \t\t\taq_ret = i40e_aq_set_vsi_mc_promisc_on_vlan(hw,\n@@ -1557,7 +1558,7 @@ static int i40e_vc_config_promiscuous_mode_msg(struct i40e_vf *vf,\n \t\t\t\t\t\t\t vf->port_vlan_id,\n \t\t\t\t\t\t\t NULL);\n \t} else if (i40e_getnum_vf_vsi_vlan_filters(vsi)) {\n-\t\tlist_for_each_entry(f, &vsi->mac_filter_list, list) {\n+\t\thash_for_each(vsi->mac_filter_hash, bkt, f, hlist) {\n \t\t\taq_ret = 0;\n \t\t\tif (f->vlan >= 0 && f->vlan <= I40E_MAX_VLANID) {\n \t\t\t\taq_ret =\n@@ -1927,7 +1928,7 @@ static int i40e_vc_add_mac_addr_msg(struct i40e_vf *vf, u8 *msg, u16 msglen)\n \t/* Lock once, because all function inside for loop accesses VSI's\n \t * MAC filter list which needs to be protected using same lock.\n \t */\n-\tspin_lock_bh(&vsi->mac_filter_list_lock);\n+\tspin_lock_bh(&vsi->mac_filter_hash_lock);\n \n \t/* add new addresses to the list */\n \tfor (i = 0; i < al->num_elements; i++) {\n@@ -1946,13 +1947,13 @@ static int i40e_vc_add_mac_addr_msg(struct i40e_vf *vf, u8 *msg, u16 msglen)\n \t\t\t\t\"Unable to add MAC filter %pM for VF %d\\n\",\n \t\t\t\t al->list[i].addr, vf->vf_id);\n \t\t\tret = I40E_ERR_PARAM;\n-\t\t\tspin_unlock_bh(&vsi->mac_filter_list_lock);\n+\t\t\tspin_unlock_bh(&vsi->mac_filter_hash_lock);\n \t\t\tgoto error_param;\n \t\t} else {\n \t\t\tvf->num_mac++;\n \t\t}\n \t}\n-\tspin_unlock_bh(&vsi->mac_filter_list_lock);\n+\tspin_unlock_bh(&vsi->mac_filter_hash_lock);\n \n \t/* program the updated filter list */\n \tret = i40e_sync_vsi_filters(vsi);\n@@ -2001,18 +2002,18 @@ static int i40e_vc_del_mac_addr_msg(struct i40e_vf *vf, u8 *msg, u16 msglen)\n \t}\n \tvsi = pf->vsi[vf->lan_vsi_idx];\n \n-\tspin_lock_bh(&vsi->mac_filter_list_lock);\n+\tspin_lock_bh(&vsi->mac_filter_hash_lock);\n \t/* delete addresses from the list */\n \tfor (i = 0; i < al->num_elements; i++)\n \t\tif (i40e_del_mac_all_vlan(vsi, al->list[i].addr)) {\n \t\t\tret = I40E_ERR_INVALID_MAC_ADDR;\n-\t\t\tspin_unlock_bh(&vsi->mac_filter_list_lock);\n+\t\t\tspin_unlock_bh(&vsi->mac_filter_hash_lock);\n \t\t\tgoto error_param;\n \t\t} else {\n \t\t\tvf->num_mac--;\n \t\t}\n \n-\tspin_unlock_bh(&vsi->mac_filter_list_lock);\n+\tspin_unlock_bh(&vsi->mac_filter_hash_lock);\n \n \t/* program the updated filter list */\n \tret = i40e_sync_vsi_filters(vsi);\n@@ -2687,6 +2688,7 @@ int i40e_ndo_set_vf_mac(struct net_device *netdev, int vf_id, u8 *mac)\n \tstruct i40e_mac_filter *f;\n \tstruct i40e_vf *vf;\n \tint ret = 0;\n+\tint bkt;\n \n \t/* validate the request */\n \tif (vf_id >= pf->num_alloc_vfs) {\n@@ -2713,9 +2715,9 @@ int i40e_ndo_set_vf_mac(struct net_device *netdev, int vf_id, u8 *mac)\n \t}\n \n \t/* Lock once because below invoked function add/del_filter requires\n-\t * mac_filter_list_lock to be held\n+\t * mac_filter_hash_lock to be held\n \t */\n-\tspin_lock_bh(&vsi->mac_filter_list_lock);\n+\tspin_lock_bh(&vsi->mac_filter_hash_lock);\n \n \t/* delete the temporary mac address */\n \tif (!is_zero_ether_addr(vf->default_lan_addr.addr))\n@@ -2725,10 +2727,10 @@ int i40e_ndo_set_vf_mac(struct net_device *netdev, int vf_id, u8 *mac)\n \t/* Delete all the filters for this VSI - we're going to kill it\n \t * anyway.\n \t */\n-\tlist_for_each_entry(f, &vsi->mac_filter_list, list)\n+\thash_for_each(vsi->mac_filter_hash, bkt, f, hlist)\n \t\ti40e_del_filter(vsi, f->macaddr, f->vlan);\n \n-\tspin_unlock_bh(&vsi->mac_filter_list_lock);\n+\tspin_unlock_bh(&vsi->mac_filter_hash_lock);\n \n \tdev_info(&pf->pdev->dev, \"Setting MAC %pM on VF %d\\n\", mac, vf_id);\n \t/* program mac filter */\n@@ -2800,9 +2802,9 @@ int i40e_ndo_set_vf_port_vlan(struct net_device *netdev, int vf_id,\n \t\t/* duplicate request, so just return success */\n \t\tgoto error_pvid;\n \n-\tspin_lock_bh(&vsi->mac_filter_list_lock);\n+\tspin_lock_bh(&vsi->mac_filter_hash_lock);\n \tis_vsi_in_vlan = i40e_is_vsi_in_vlan(vsi);\n-\tspin_unlock_bh(&vsi->mac_filter_list_lock);\n+\tspin_unlock_bh(&vsi->mac_filter_hash_lock);\n \n \tif (le16_to_cpu(vsi->info.pvid) == 0 && is_vsi_in_vlan) {\n \t\tdev_err(&pf->pdev->dev,\n", "prefixes": [ "next", "S49", "07/15" ] }