Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/678526/?format=api
{ "id": 678526, "url": "http://patchwork.ozlabs.org/api/patches/678526/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1475685046-16900-9-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-9-git-send-email-bimmy.pujari@intel.com>", "list_archive_url": null, "date": "2016-10-05T16:30:38", "name": "[next,S49-V2,08/15] i40e: properly cleanup on allocation failure in i40e_sync_vsi_filters", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "df1fe42abc8c74124d20809d0d580ef621ebe261", "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-9-git-send-email-bimmy.pujari@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/678526/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/678526/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 3sq1XZ0cCrz9s9Y\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 6 Oct 2016 03:32:29 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 5B08BC2377;\n\tWed, 5 Oct 2016 16:32:28 +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 vrL4HyCZvO61; Wed, 5 Oct 2016 16:32:26 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 20009C23B4;\n\tWed, 5 Oct 2016 16:32:17 +0000 (UTC)", "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\tby ash.osuosl.org (Postfix) with ESMTP id AF00C1CE508\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 5 Oct 2016 16:32:14 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id AB7D08AE52\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 5 Oct 2016 16:32:14 +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 G66dGD2ztKAh 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 9EFA78B114\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=\"16526381\"", "From": "Bimmy Pujari <bimmy.pujari@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Wed, 5 Oct 2016 09:30:38 -0700", "Message-Id": "<1475685046-16900-9-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 08/15] i40e: properly cleanup\n\ton allocation failure in i40e_sync_vsi_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\nCurrently, we fail to correctly restore filters on the temporary add\nlist when we fail to allocate memory either for deletion or addition.\nReplace calls to \"goto out;\" with calls to a new location that correctly\nhandles memory allocation failures.\n\nNote that it is safe for us to call i40e_undo_filter_entries on the\ntmp_del_list even after we've deleted filters because at this point it\nwill be empty, so we don't need to separate the logic for add and\ndelete failure.\n\nSigned-off-by: Jacob Keller <jacob.e.keller@intel.com>\nChange-Id: Iee107fd219c6e03e2fd9645c2debf8e8384a8521\n---\n drivers/net/ethernet/intel/i40e/i40e_main.c | 39 ++++++++++++++++-------------\n 1 file changed, 22 insertions(+), 17 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c\nindex cce1e18..2071727 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_main.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c\n@@ -1683,15 +1683,16 @@ static void i40e_set_rx_mode(struct net_device *netdev)\n }\n \n /**\n- * i40e_undo_del_filter_entries - Undo the changes made to MAC filter entries\n- * @vsi: pointer to vsi struct\n+ * i40e_undo_filter_entries - Undo the changes made to MAC filter entries\n+ * @vsi: Pointer to vsi struct\n * @from: Pointer to list which contains MAC filter entries - changes to\n * those entries needs to be undone.\n *\n- * MAC filter entries from list were slated to be removed from device.\n+ * MAC filter entries from list were slated to be sent to firmware, either for\n+ * addition or deletion.\n **/\n-static void i40e_undo_del_filter_entries(struct i40e_vsi *vsi,\n-\t\t\t\t\t struct hlist_head *from)\n+static void i40e_undo_filter_entries(struct i40e_vsi *vsi,\n+\t\t\t\t struct hlist_head *from)\n {\n \tstruct i40e_mac_filter *f;\n \tstruct hlist_node *h;\n@@ -1840,14 +1841,8 @@ int i40e_sync_vsi_filters(struct i40e_vsi *vsi)\n \t\tlist_size = filter_list_len *\n \t\t\t sizeof(struct i40e_aqc_remove_macvlan_element_data);\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_hash_lock);\n-\t\t\ti40e_undo_del_filter_entries(vsi, &tmp_del_list);\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+\t\tif (!del_list)\n+\t\t\tgoto err_no_memory;\n \n \t\thlist_for_each_entry_safe(f, h, &tmp_del_list, hlist) {\n \t\t\tcmd_flags = 0;\n@@ -1924,10 +1919,9 @@ int i40e_sync_vsi_filters(struct i40e_vsi *vsi)\n \t\tlist_size = filter_list_len *\n \t\t\t sizeof(struct i40e_aqc_add_macvlan_element_data);\n \t\tadd_list = kzalloc(list_size, GFP_ATOMIC);\n-\t\tif (!add_list) {\n-\t\t\tretval = -ENOMEM;\n-\t\t\tgoto out;\n-\t\t}\n+\t\tif (!add_list)\n+\t\t\tgoto err_no_memory;\n+\n \t\tnum_add = 0;\n \t\thlist_for_each_entry(f, &tmp_add_list, hlist) {\n \t\t\tif (test_bit(__I40E_FILTER_OVERFLOW_PROMISC,\n@@ -2140,6 +2134,17 @@ out:\n \n \tclear_bit(__I40E_CONFIG_BUSY, &vsi->state);\n \treturn retval;\n+\n+err_no_memory:\n+\t/* Restore elements on the temporary add and delete lists */\n+\tspin_lock_bh(&vsi->mac_filter_hash_lock);\n+\ti40e_undo_filter_entries(vsi, &tmp_del_list);\n+\ti40e_undo_filter_entries(vsi, &tmp_add_list);\n+\tspin_unlock_bh(&vsi->mac_filter_hash_lock);\n+\n+\tvsi->flags |= I40E_VSI_FLAG_FILTER_CHANGED;\n+\tclear_bit(__I40E_CONFIG_BUSY, &vsi->state);\n+\treturn -ENOMEM;\n }\n \n /**\n", "prefixes": [ "next", "S49-V2", "08/15" ] }