Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/540780/?format=api
{ "id": 540780, "url": "http://patchwork.ozlabs.org/api/patches/540780/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1446771662-36705-2-git-send-email-jesse.brandeburg@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": "<1446771662-36705-2-git-send-email-jesse.brandeburg@intel.com>", "list_archive_url": null, "date": "2015-11-06T01:01:02", "name": "[next,2/2] i40e: remove unused argument", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "fad01a5beb200557e6546d6d77d3c0cc084a337b", "submitter": { "id": 189, "url": "http://patchwork.ozlabs.org/api/people/189/?format=api", "name": "Jesse Brandeburg", "email": "jesse.brandeburg@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/1446771662-36705-2-git-send-email-jesse.brandeburg@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/540780/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/540780/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\tby ozlabs.org (Postfix) with ESMTP id 2B17B140D6A\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 6 Nov 2015 12:02:55 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 1240926AB0;\n\tFri, 6 Nov 2015 01:02:55 +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 3ezX+LtlJMJO; Fri, 6 Nov 2015 01:02:53 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id 4BD0327522;\n\tFri, 6 Nov 2015 01:02:53 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id E13221CEEED\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 6 Nov 2015 01:02:51 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id DC59026410\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 6 Nov 2015 01:02:51 +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 sW8WTkiq4LE0 for <intel-wired-lan@lists.osuosl.org>;\n\tFri, 6 Nov 2015 01:02:51 +0000 (UTC)", "from mga14.intel.com (mga14.intel.com [192.55.52.115])\n\tby silver.osuosl.org (Postfix) with ESMTP id 3B28726AB0\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 6 Nov 2015 01:02:51 +0000 (UTC)", "from orsmga001.jf.intel.com ([10.7.209.18])\n\tby fmsmga103.fm.intel.com with ESMTP; 05 Nov 2015 17:02:33 -0800", "from jbrandeb-hsm2.jf.intel.com ([134.134.3.178])\n\tby orsmga001.jf.intel.com with ESMTP; 05 Nov 2015 17:02:33 -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,249,1444719600\"; d=\"scan'208\";a=\"812914475\"", "From": "Jesse Brandeburg <jesse.brandeburg@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Thu, 5 Nov 2015 17:01:02 -0800", "Message-Id": "<1446771662-36705-2-git-send-email-jesse.brandeburg@intel.com>", "X-Mailer": "git-send-email 2.1.0", "In-Reply-To": "<1446771662-36705-1-git-send-email-jesse.brandeburg@intel.com>", "References": "<1446771662-36705-1-git-send-email-jesse.brandeburg@intel.com>", "Subject": "[Intel-wired-lan] [next PATCH 2/2] i40e: remove unused argument", "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": "With the final edition of the patches to remove sleeps from\nthe driver's entry points, the grab_rtnl argument is no\nlonger needed, so partially revert the commit that added it.\n\nSigned-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>\nChange-ID: Ib9778476242586cc9e58b670f5f48d415cb59003\n\n---\nTesting Hints (required if no HSD): add and remove vlan, over and under\nbonding and teaming driver, add and delete mac address, run debug kernel\nwith lock validator. The test that originally failed was with vlan\nadd/remove while running a vlan as part of a bridge with dhclient over\nthe top of it.\n---\n drivers/net/ethernet/intel/i40e/i40e.h | 2 +-\n drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 4 ++--\n drivers/net/ethernet/intel/i40e/i40e_main.c | 16 +++++++++++-----\n drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 8 ++++----\n 4 files changed, 18 insertions(+), 12 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h\nindex d854a46..0b9537b 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e.h\n@@ -697,7 +697,7 @@ struct i40e_mac_filter *i40e_add_filter(struct i40e_vsi *vsi,\n \t\t\t\t\tbool is_vf, bool is_netdev);\n void i40e_del_filter(struct i40e_vsi *vsi, u8 *macaddr, s16 vlan,\n \t\t bool is_vf, bool is_netdev);\n-int i40e_sync_vsi_filters(struct i40e_vsi *vsi, bool grab_rtnl);\n+int i40e_sync_vsi_filters(struct i40e_vsi *vsi);\n struct i40e_vsi *i40e_vsi_setup(struct i40e_pf *pf, u8 type,\n \t\t\t\tu16 uplink, u32 param1);\n int i40e_vsi_release(struct i40e_vsi *vsi);\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_debugfs.c b/drivers/net/ethernet/intel/i40e/i40e_debugfs.c\nindex d1a91c8..10744a6 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_debugfs.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_debugfs.c\n@@ -1138,7 +1138,7 @@ static ssize_t i40e_dbg_command_write(struct file *filp,\n \t\tspin_lock_bh(&vsi->mac_filter_list_lock);\n \t\tf = i40e_add_filter(vsi, ma, vlan, false, false);\n \t\tspin_unlock_bh(&vsi->mac_filter_list_lock);\n-\t\tret = i40e_sync_vsi_filters(vsi, true);\n+\t\tret = i40e_sync_vsi_filters(vsi);\n \t\tif (f && !ret)\n \t\t\tdev_info(&pf->pdev->dev,\n \t\t\t\t \"add macaddr: %pM vlan=%d added to VSI %d\\n\",\n@@ -1177,7 +1177,7 @@ static ssize_t i40e_dbg_command_write(struct file *filp,\n \t\tspin_lock_bh(&vsi->mac_filter_list_lock);\n \t\ti40e_del_filter(vsi, ma, vlan, false, false);\n \t\tspin_unlock_bh(&vsi->mac_filter_list_lock);\n-\t\tret = i40e_sync_vsi_filters(vsi, true);\n+\t\tret = i40e_sync_vsi_filters(vsi);\n \t\tif (!ret)\n \t\t\tdev_info(&pf->pdev->dev,\n \t\t\t\t \"del macaddr: %pM vlan=%d removed from VSI %d\\n\",\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c\nindex 3119ee4..9e6268b 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_main.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c\n@@ -1859,13 +1859,12 @@ static void i40e_cleanup_add_list(struct list_head *add_list)\n /**\n * i40e_sync_vsi_filters - Update the VSI filter list to the HW\n * @vsi: ptr to the VSI\n- * @grab_rtnl: whether RTNL needs to be grabbed\n *\n * Push any outstanding VSI filter changes through the AdminQ.\n *\n * Returns 0 or error value\n **/\n-int i40e_sync_vsi_filters(struct i40e_vsi *vsi, bool grab_rtnl)\n+int i40e_sync_vsi_filters(struct i40e_vsi *vsi)\n {\n \tstruct list_head tmp_del_list, tmp_add_list;\n \tstruct i40e_mac_filter *f, *ftmp, *fclone;\n@@ -2169,8 +2168,15 @@ static void i40e_sync_filters_subtask(struct i40e_pf *pf)\n \n \tfor (v = 0; v < pf->num_alloc_vsi; v++) {\n \t\tif (pf->vsi[v] &&\n-\t\t (pf->vsi[v]->flags & I40E_VSI_FLAG_FILTER_CHANGED))\n-\t\t\ti40e_sync_vsi_filters(pf->vsi[v], true);\n+\t\t (pf->vsi[v]->flags & I40E_VSI_FLAG_FILTER_CHANGED)) {\n+\t\t\tint ret = i40e_sync_vsi_filters(pf->vsi[v]);\n+\n+\t\t\tif (ret) {\n+\t\t\t\t/* come back and try again later */\n+\t\t\t\tpf->flags |= I40E_FLAG_FILTER_SYNC;\n+\t\t\t\tbreak;\n+\t\t\t}\n+\t\t}\n \t}\n }\n \n@@ -9219,7 +9225,7 @@ int i40e_vsi_release(struct i40e_vsi *vsi)\n \t\t\t\tf->is_vf, f->is_netdev);\n \tspin_unlock_bh(&vsi->mac_filter_list_lock);\n \n-\ti40e_sync_vsi_filters(vsi, false);\n+\ti40e_sync_vsi_filters(vsi);\n \n \ti40e_vsi_delete(vsi);\n \ti40e_vsi_free_q_vectors(vsi);\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c\nindex 26f247d..819803c8 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c\n@@ -565,7 +565,7 @@ static int i40e_alloc_vsi_res(struct i40e_vf *vf, enum i40e_vsi_type type)\n \t}\n \n \t/* program mac filter */\n-\tret = i40e_sync_vsi_filters(vsi, false);\n+\tret = i40e_sync_vsi_filters(vsi);\n \tif (ret)\n \t\tdev_err(&pf->pdev->dev, \"Unable to program ucast filters\\n\");\n \n@@ -1633,7 +1633,7 @@ static int i40e_vc_add_mac_addr_msg(struct i40e_vf *vf, u8 *msg, u16 msglen)\n \tspin_unlock_bh(&vsi->mac_filter_list_lock);\n \n \t/* program the updated filter list */\n-\tif (i40e_sync_vsi_filters(vsi, false))\n+\tif (i40e_sync_vsi_filters(vsi))\n \t\tdev_err(&pf->pdev->dev, \"Unable to program VF %d MAC filters\\n\",\n \t\t\tvf->vf_id);\n \n@@ -1687,7 +1687,7 @@ static int i40e_vc_del_mac_addr_msg(struct i40e_vf *vf, u8 *msg, u16 msglen)\n \tspin_unlock_bh(&vsi->mac_filter_list_lock);\n \n \t/* program the updated filter list */\n-\tif (i40e_sync_vsi_filters(vsi, false))\n+\tif (i40e_sync_vsi_filters(vsi))\n \t\tdev_err(&pf->pdev->dev, \"Unable to program VF %d MAC filters\\n\",\n \t\t\tvf->vf_id);\n \n@@ -2102,7 +2102,7 @@ int i40e_ndo_set_vf_mac(struct net_device *netdev, int vf_id, u8 *mac)\n \n \tdev_info(&pf->pdev->dev, \"Setting MAC %pM on VF %d\\n\", mac, vf_id);\n \t/* program mac filter */\n-\tif (i40e_sync_vsi_filters(vsi, false)) {\n+\tif (i40e_sync_vsi_filters(vsi)) {\n \t\tdev_err(&pf->pdev->dev, \"Unable to program ucast filters\\n\");\n \t\tret = -EIO;\n \t\tgoto error_param;\n", "prefixes": [ "next", "2/2" ] }