Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/546649/?format=api
{ "id": 546649, "url": "http://patchwork.ozlabs.org/api/patches/546649/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1447961665-12344-4-git-send-email-deepthi.kavalur@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": "<1447961665-12344-4-git-send-email-deepthi.kavalur@intel.com>", "list_archive_url": null, "date": "2015-11-19T19:34:16", "name": "[V3:,next,S22,03/12] i40e: properly delete VF MAC filters", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "b89a0fe1a71806c2639631435af161860f243c20", "submitter": { "id": 67654, "url": "http://patchwork.ozlabs.org/api/people/67654/?format=api", "name": "Deepthi Kavalur", "email": "deepthi.kavalur@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/1447961665-12344-4-git-send-email-deepthi.kavalur@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/546649/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/546649/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 whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ozlabs.org (Postfix) with ESMTP id 213531414BF\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 20 Nov 2015 06:34:37 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 629D98BF4B;\n\tThu, 19 Nov 2015 19:34:36 +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 aGq06mGExWod; Thu, 19 Nov 2015 19:34:34 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id C69778C2C3;\n\tThu, 19 Nov 2015 19:34:32 +0000 (UTC)", "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\tby ash.osuosl.org (Postfix) with ESMTP id 49A011C1641\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 19 Nov 2015 19:34:29 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 476F794554\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 19 Nov 2015 19:34:29 +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 Vc4G9KOpQkYk for <intel-wired-lan@lists.osuosl.org>;\n\tThu, 19 Nov 2015 19:34:26 +0000 (UTC)", "from mga09.intel.com (mga09.intel.com [134.134.136.24])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id C5E4994C3C\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 19 Nov 2015 19:34:26 +0000 (UTC)", "from fmsmga001.fm.intel.com ([10.253.24.23])\n\tby orsmga102.jf.intel.com with ESMTP; 19 Nov 2015 11:34:28 -0800", "from dkavalur-mobl.amr.corp.intel.com (HELO\n\tlocalhost.localdomain.localdomain) ([134.134.176.88])\n\tby fmsmga001.fm.intel.com with ESMTP; 19 Nov 2015 11:34:25 -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-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.20,318,1444719600\"; d=\"scan'208\";a=\"842678102\"", "From": "Deepthi Kavalur <deepthi.kavalur@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Thu, 19 Nov 2015 11:34:16 -0800", "Message-Id": "<1447961665-12344-4-git-send-email-deepthi.kavalur@intel.com>", "X-Mailer": "git-send-email 2.1.0", "In-Reply-To": "<1447961665-12344-1-git-send-email-deepthi.kavalur@intel.com>", "References": "<1447961665-12344-1-git-send-email-deepthi.kavalur@intel.com>", "Subject": "[Intel-wired-lan] [V3: next PATCH S22 03/12] i40e: properly delete\n\tVF MAC filters", "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: Mitch Williams <mitch.a.williams@intel.com>\n\nThe virtual channel interface was using incorrect semantics to remove\nMAC addresses, which would leave incorrect filters active when using\nVLANs. To correct this, add a new function that unconditionally removes\nMAC addresses from all VLANs, and call this function when the VF\nrequests a MAC filter removal.\n\nSigned-off-by: Mitch Williams <mitch.a.williams@intel.com>\nChange-ID: I69826908ae4f6c847f5bf9b32f11faa760189c74\n---\n drivers/net/ethernet/intel/i40e/i40e.h | 2 ++\n drivers/net/ethernet/intel/i40e/i40e_main.c | 36 ++++++++++++++++++++++\n drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 8 +++--\n 3 files changed, 44 insertions(+), 2 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h\nindex 04a3e87..33fa3d9 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e.h\n@@ -775,6 +775,8 @@ int i40e_vsi_add_vlan(struct i40e_vsi *vsi, s16 vid);\n int i40e_vsi_kill_vlan(struct i40e_vsi *vsi, s16 vid);\n struct i40e_mac_filter *i40e_put_mac_in_vlan(struct i40e_vsi *vsi, u8 *macaddr,\n \t\t\t\t\t bool is_vf, bool is_netdev);\n+int i40e_del_mac_all_vlan(struct i40e_vsi *vsi, u8 *macaddr,\n+\t\t\t bool is_vf, bool is_netdev);\n bool i40e_is_vsi_in_vlan(struct i40e_vsi *vsi);\n struct i40e_mac_filter *i40e_find_mac(struct i40e_vsi *vsi, u8 *macaddr,\n \t\t\t\t bool is_vf, bool is_netdev);\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c\nindex 925654d..7147404 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_main.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c\n@@ -1259,6 +1259,42 @@ struct i40e_mac_filter *i40e_put_mac_in_vlan(struct i40e_vsi *vsi, u8 *macaddr,\n }\n \n /**\n+ * i40e_del_mac_all_vlan - Remove a MAC filter from all VLANS\n+ * @vsi: the VSI to be searched\n+ * @macaddr: the mac address to be removed\n+ * @is_vf: true if it is a VF\n+ * @is_netdev: true if it is a netdev\n+ *\n+ * Removes a given MAC address from a VSI, regardless of VLAN\n+ *\n+ * Returns 0 for success, or error\n+ **/\n+int i40e_del_mac_all_vlan(struct i40e_vsi *vsi, u8 *macaddr,\n+\t\t\t bool is_vf, bool is_netdev)\n+{\n+\tstruct i40e_mac_filter *f = NULL;\n+\tint changed = 0;\n+\n+\tWARN(!spin_is_locked(&vsi->mac_filter_list_lock),\n+\t \"Missing mac_filter_list_lock\\n\");\n+\tlist_for_each_entry(f, &vsi->mac_filter_list, list) {\n+\t\tif ((ether_addr_equal(macaddr, f->macaddr)) &&\n+\t\t (is_vf == f->is_vf) &&\n+\t\t (is_netdev == f->is_netdev)) {\n+\t\t\tf->counter--;\n+\t\t\tf->changed = true;\n+\t\t\tchanged = 1;\n+\t\t}\n+\t}\n+\tif (changed) {\n+\t\tvsi->flags |= I40E_VSI_FLAG_FILTER_CHANGED;\n+\t\tvsi->back->flags |= I40E_FLAG_FILTER_SYNC;\n+\t\treturn 0;\n+\t}\n+\treturn -ENOENT;\n+}\n+\n+/**\n * i40e_rm_default_mac_filter - Remove the default MAC filter set by NVM\n * @vsi: the PF Main VSI - inappropriate for any other VSI\n * @macaddr: the MAC address\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c\nindex 0606ee1..c04e3b7 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c\n@@ -1683,8 +1683,12 @@ static int i40e_vc_del_mac_addr_msg(struct i40e_vf *vf, u8 *msg, u16 msglen)\n \tspin_lock_bh(&vsi->mac_filter_list_lock);\n \t/* delete addresses from the list */\n \tfor (i = 0; i < al->num_elements; i++)\n-\t\ti40e_del_filter(vsi, al->list[i].addr,\n-\t\t\t\tI40E_VLAN_ANY, true, false);\n+\t\tif (i40e_del_mac_all_vlan(vsi, al->list[i].addr, true, false)) {\n+\t\t\tret = I40E_ERR_INVALID_MAC_ADDR;\n+\t\t\tspin_unlock_bh(&vsi->mac_filter_list_lock);\n+\t\t\tgoto error_param;\n+\t\t}\n+\n \tspin_unlock_bh(&vsi->mac_filter_list_lock);\n \n \t/* program the updated filter list */\n", "prefixes": [ "V3:", "next", "S22", "03/12" ] }