Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/702112/?format=api
{ "id": 702112, "url": "http://patchwork.ozlabs.org/api/patches/702112/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1480710782-9195-6-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": "<1480710782-9195-6-git-send-email-bimmy.pujari@intel.com>", "list_archive_url": null, "date": "2016-12-02T20:32:59", "name": "[next,S56,5/8] i40e: allow i40e_update_filter_state to skip broadcast filters", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "2006a0341554a64b92186d37b148bda35eb9bcff", "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/1480710782-9195-6-git-send-email-bimmy.pujari@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/702112/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/702112/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 3tVm9Q36yLz9t1T\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat, 3 Dec 2016 07:34:50 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id F34238531B;\n\tFri, 2 Dec 2016 20:34:48 +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 DT2DbI7EAuup; Fri, 2 Dec 2016 20:34:46 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 6846185233;\n\tFri, 2 Dec 2016 20:34:45 +0000 (UTC)", "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\tby ash.osuosl.org (Postfix) with ESMTP id 8C3AD1BFB36\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 2 Dec 2016 20:34:41 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 890E2850AC\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 2 Dec 2016 20:34:41 +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 0JZLykAqOrIh for <intel-wired-lan@lists.osuosl.org>;\n\tFri, 2 Dec 2016 20:34:41 +0000 (UTC)", "from mga01.intel.com (mga01.intel.com [192.55.52.88])\n\tby fraxinus.osuosl.org (Postfix) with ESMTPS id DEFCB85070\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 2 Dec 2016 20:34:40 +0000 (UTC)", "from orsmga001.jf.intel.com ([10.7.209.18])\n\tby fmsmga101.fm.intel.com with ESMTP; 02 Dec 2016 12:34:39 -0800", "from bimmy.jf.intel.com (HELO bimmy.linux1.jf.intel.com)\n\t([134.134.2.167])\n\tby orsmga001.jf.intel.com with ESMTP; 02 Dec 2016 12:34:39 -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.33,288,1477983600\"; d=\"scan'208\";\n\ta=\"1067223591\"", "From": "Bimmy Pujari <bimmy.pujari@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Fri, 2 Dec 2016 12:32:59 -0800", "Message-Id": "<1480710782-9195-6-git-send-email-bimmy.pujari@intel.com>", "X-Mailer": "git-send-email 2.4.11", "In-Reply-To": "<1480710782-9195-1-git-send-email-bimmy.pujari@intel.com>", "References": "<1480710782-9195-1-git-send-email-bimmy.pujari@intel.com>", "Subject": "[Intel-wired-lan] [next PATCH S56 5/8] i40e: allow\n\ti40e_update_filter_state to skip broadcast 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: Jacob Keller <jacob.e.keller@intel.com>\n\nFix a bug where we modified the mac_filter_hash while outside a lock,\nwhen handling addition of broadcast filters.\n\nNormally, we add filters to firmware by batching the additions into\nlists and issuing 1 update for every few filters. Broadcast filters are\nhandled differently, by instead setting the broadcast promiscuous mode\nflags. In order to make sure the 1<->1 mapping of filters in our\naddition array lined up with filters in the hlist tmp_add_list, we had\nto remove the filter and move it back to the main hash. However, we\ndidn't do this under lock, which could cause consistency problems for\nthe list.\n\nFix this by updating i40e_update_filter_state logic so that it knows to\navoid broadcast filters. This ensures that we don't have to remove the\nfilter separately, and can put it back using the normal flow.\n\nSigned-off-by: Jacob Keller <jacob.e.keller@intel.com>\nChange-ID: Id288fade80b3e3a9a54b68cc249188cb95147518\n---\n drivers/net/ethernet/intel/i40e/i40e_main.c | 37 ++++++++++++++++++++++-------\n 1 file changed, 29 insertions(+), 8 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c\nindex 951976b..827676e 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_main.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c\n@@ -1849,6 +1849,31 @@ static void i40e_undo_filter_entries(struct i40e_vsi *vsi,\n }\n \n /**\n+ * i40e_next_entry - Get the next non-broadcast filter from a list\n+ * @f: pointer to filter in list\n+ *\n+ * Returns the next non-broadcast filter in the list. Required so that we\n+ * ignore broadcast filters within the list, since these are not handled via\n+ * the normal firmware update path.\n+ */\n+static struct i40e_mac_filter *i40e_next_filter(struct i40e_mac_filter *f)\n+{\n+\twhile (f) {\n+\t\tf = hlist_entry(f->hlist.next,\n+\t\t\t\ttypeof(struct i40e_mac_filter),\n+\t\t\t\thlist);\n+\n+\t\t/* keep going if we found a broadcast filter */\n+\t\tif (f && is_broadcast_ether_addr(f->macaddr))\n+\t\t\tcontinue;\n+\n+\t\tbreak;\n+\t}\n+\n+\treturn f;\n+}\n+\n+/**\n * i40e_update_filter_state - Update filter state based on return data\n * from firmware\n * @count: Number of filters added\n@@ -1880,9 +1905,9 @@ i40e_update_filter_state(int count,\n \t\t\tretval++;\n \t\t}\n \n-\t\tadd_head = hlist_entry(add_head->hlist.next,\n-\t\t\t\t typeof(struct i40e_mac_filter),\n-\t\t\t\t hlist);\n+\t\tadd_head = i40e_next_filter(add_head);\n+\t\tif (!add_head)\n+\t\t\tbreak;\n \t}\n \n \treturn retval;\n@@ -2101,7 +2126,7 @@ int i40e_sync_vsi_filters(struct i40e_vsi *vsi)\n \t\t\tcmd_flags = 0;\n \n \t\t\t/* handle broadcast filters by updating the broadcast\n-\t\t\t * promiscuous flag instead of deleting a MAC filter.\n+\t\t\t * promiscuous flag and release filter list.\n \t\t\t */\n \t\t\tif (is_broadcast_ether_addr(f->macaddr)) {\n \t\t\t\ti40e_aqc_broadcast_filter(vsi, vsi_name, f);\n@@ -2170,11 +2195,7 @@ int i40e_sync_vsi_filters(struct i40e_vsi *vsi)\n \t\t\t * promiscuous flag instead of adding a MAC filter.\n \t\t\t */\n \t\t\tif (is_broadcast_ether_addr(f->macaddr)) {\n-\t\t\t\tu64 key = i40e_addr_to_hkey(f->macaddr);\n \t\t\t\ti40e_aqc_broadcast_filter(vsi, vsi_name, f);\n-\n-\t\t\t\thlist_del(&f->hlist);\n-\t\t\t\thash_add(vsi->mac_filter_hash, &f->hlist, key);\n \t\t\t\tcontinue;\n \t\t\t}\n \n", "prefixes": [ "next", "S56", "5/8" ] }