Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/693937/?format=api
{ "id": 693937, "url": "http://patchwork.ozlabs.org/api/patches/693937/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1478896779-13697-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": "<1478896779-13697-6-git-send-email-bimmy.pujari@intel.com>", "list_archive_url": null, "date": "2016-11-11T20:39:29", "name": "[next,S54,05/15] i40e: factor out addition/deletion of VLAN per each MAC address", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "e099a6e598c2dfaf47ef858f5b53e0cbf44e0138", "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/1478896779-13697-6-git-send-email-bimmy.pujari@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/693937/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/693937/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 hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\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 3tFsJb6Bf5z9t2g\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat, 12 Nov 2016 07:41:19 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 30EF687B5F;\n\tFri, 11 Nov 2016 20:41:18 +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 568U5K0L+q5h; Fri, 11 Nov 2016 20:41:16 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id D1ACD9611B;\n\tFri, 11 Nov 2016 20:41:16 +0000 (UTC)", "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\tby ash.osuosl.org (Postfix) with ESMTP id 9D3F01CEC94\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 11 Nov 2016 20:41:14 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 992A1C2A4B\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 11 Nov 2016 20:41:14 +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 FE9w7riAmdWf for <intel-wired-lan@lists.osuosl.org>;\n\tFri, 11 Nov 2016 20:41:14 +0000 (UTC)", "from mga06.intel.com (mga06.intel.com [134.134.136.31])\n\tby fraxinus.osuosl.org (Postfix) with ESMTPS id C3652C29C6\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 11 Nov 2016 20:41:13 +0000 (UTC)", "from fmsmga005.fm.intel.com ([10.253.24.32])\n\tby orsmga104.jf.intel.com with ESMTP; 11 Nov 2016 12:41:13 -0800", "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; 11 Nov 2016 12:41:13 -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.31,474,1473145200\"; d=\"scan'208\";a=\"30297943\"", "From": "Bimmy Pujari <bimmy.pujari@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Fri, 11 Nov 2016 12:39:29 -0800", "Message-Id": "<1478896779-13697-6-git-send-email-bimmy.pujari@intel.com>", "X-Mailer": "git-send-email 2.4.11", "In-Reply-To": "<1478896779-13697-1-git-send-email-bimmy.pujari@intel.com>", "References": "<1478896779-13697-1-git-send-email-bimmy.pujari@intel.com>", "Subject": "[Intel-wired-lan] [next PATCH S54 05/15] i40e: factor out\n\taddition/deletion of VLAN per each MAC address", "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\nA future refactor of how the PF assigns a PVID to a VF will want to be\nable to add and remove a block of filters by VLAN without worrying about\naccidentally triggering the accounting for I40E_VLAN_ANY. Additionally\nthe PVID assignment would like to be able to batch several changes under\none use of the mac_filter_hash_lock.\n\nFactor out the addition and deletion of a VLAN on all MACs into their\nown function which i40e_vsi_(add|kill)_vlan can use. These new functions\nexpect the caller to take the hash lock, as well as perform any\nnecessary accounting for updating I40E_VLAN_ANY filters if we are now\noperating under VLAN mode.\n\nSigned-off-by: Jacob Keller <jacob.e.keller@intel.com>\nChange-ID: If79e5b60b770433275350a74b3f1880333a185d5\n---\n drivers/net/ethernet/intel/i40e/i40e_main.c | 68 +++++++++++++++++++++++------\n 1 file changed, 55 insertions(+), 13 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c\nindex a034521..8caf23c 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_main.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c\n@@ -2480,19 +2480,24 @@ static void i40e_vlan_rx_register(struct net_device *netdev, u32 features)\n }\n \n /**\n- * i40e_vsi_add_vlan - Add vsi membership for given vlan\n+ * i40e_add_vlan_all_mac - Add a MAC/VLAN filter for each existing MAC address\n * @vsi: the vsi being configured\n * @vid: vlan id to be added (0 = untagged only , -1 = any)\n+ *\n+ * This is a helper function for adding a new MAC/VLAN filter with the\n+ * specified VLAN for each existing MAC address already in the hash table.\n+ * This function does *not* perform any accounting to update filters based on\n+ * vlan mode.\n+ *\n+ * NOTE: this function expects to be called while under the\n+ * mac_filter_hash_lock\n **/\n-int i40e_vsi_add_vlan(struct i40e_vsi *vsi, s16 vid)\n+static int i40e_add_vlan_all_mac(struct i40e_vsi *vsi, s16 vid)\n {\n-\tstruct i40e_mac_filter *f, *add_f, *del_f;\n+\tstruct i40e_mac_filter *f, *add_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_hash_lock);\n-\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@@ -2501,11 +2506,33 @@ 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_hash_lock);\n \t\t\treturn -ENOMEM;\n \t\t}\n \t}\n \n+\treturn 0;\n+}\n+\n+/**\n+ * i40e_vsi_add_vlan - Add vsi membership for given vlan\n+ * @vsi: the vsi being configured\n+ * @vid: vlan id to be added (0 = untagged only , -1 = any)\n+ **/\n+int i40e_vsi_add_vlan(struct i40e_vsi *vsi, s16 vid)\n+{\n+\tstruct i40e_mac_filter *f, *add_f, *del_f;\n+\tstruct hlist_node *h;\n+\tint bkt, err;\n+\n+\t/* Locked once because all functions invoked below iterates list*/\n+\tspin_lock_bh(&vsi->mac_filter_hash_lock);\n+\n+\terr = i40e_add_vlan_all_mac(vsi, vid);\n+\tif (err) {\n+\t\tspin_unlock_bh(&vsi->mac_filter_hash_lock);\n+\t\treturn err;\n+\t}\n+\n \t/* When we add a new VLAN filter, we need to make sure that all existing\n \t * filters which are marked as vid=-1 (I40E_VLAN_ANY) are converted to\n \t * vid=0. The simplest way is just search for all filters marked as\n@@ -2544,24 +2571,39 @@ int i40e_vsi_add_vlan(struct i40e_vsi *vsi, s16 vid)\n }\n \n /**\n- * i40e_vsi_kill_vlan - Remove vsi membership for given vlan\n+ * i40e_rm_vlan_all_mac - Remove MAC/VLAN pair for all MAC with the given VLAN\n * @vsi: the vsi being configured\n * @vid: vlan id to be removed (0 = untagged only , -1 = any)\n- **/\n-void i40e_vsi_kill_vlan(struct i40e_vsi *vsi, s16 vid)\n+ *\n+ * This function should be used to remove all VLAN filters which match the\n+ * given VID. It does not schedule the service event and does not take the\n+ * mac_filter_hash_lock so it may be combined with other operations under\n+ * a single invocation of the mac_filter_hash_lock.\n+ *\n+ * NOTE: this function expects to be called while under the\n+ * mac_filter_hash_lock\n+ */\n+static void i40e_rm_vlan_all_mac(struct i40e_vsi *vsi, s16 vid)\n {\n \tstruct i40e_mac_filter *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_hash_lock);\n-\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+}\n \n+/**\n+ * i40e_vsi_kill_vlan - Remove vsi membership for given vlan\n+ * @vsi: the vsi being configured\n+ * @vid: vlan id to be removed (0 = untagged only , -1 = any)\n+ **/\n+void i40e_vsi_kill_vlan(struct i40e_vsi *vsi, s16 vid)\n+{\n+\tspin_lock_bh(&vsi->mac_filter_hash_lock);\n+\ti40e_rm_vlan_all_mac(vsi, vid);\n \tspin_unlock_bh(&vsi->mac_filter_hash_lock);\n \n \t/* schedule our worker thread which will take care of\n", "prefixes": [ "next", "S54", "05/15" ] }