Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1086458/?format=api
{ "id": 1086458, "url": "http://patchwork.ozlabs.org/api/patches/1086458/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20190416172439.27908-14-anirudh.venkataramanan@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": "<20190416172439.27908-14-anirudh.venkataramanan@intel.com>", "list_archive_url": null, "date": "2019-04-16T17:24:37", "name": "[S19,13/15] ice: Fix couple of issues in ice_vsi_release", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "ff2af80c093e716227290bc762a4e3d4b8fd2fbc", "submitter": { "id": 73601, "url": "http://patchwork.ozlabs.org/api/people/73601/?format=api", "name": "Anirudh Venkataramanan", "email": "anirudh.venkataramanan@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/20190416172439.27908-14-anirudh.venkataramanan@intel.com/mbox/", "series": [ { "id": 103107, "url": "http://patchwork.ozlabs.org/api/series/103107/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=103107", "date": "2019-04-16T17:24:38", "name": "Fixes and feature updates for ice", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/103107/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1086458/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1086458/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<intel-wired-lan-bounces@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" ], "Authentication-Results": [ "ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=osuosl.org\n\t(client-ip=140.211.166.137; helo=fraxinus.osuosl.org;\n\tenvelope-from=intel-wired-lan-bounces@osuosl.org;\n\treceiver=<UNKNOWN>)", "ozlabs.org;\n\tdmarc=fail (p=none dis=none) header.from=intel.com" ], "Received": [ "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 44kC1W0RZGz9s3l\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 17 Apr 2019 03:25:19 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 8507585EF0;\n\tTue, 16 Apr 2019 17:25:17 +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 AySzXy23aR2i; Tue, 16 Apr 2019 17:25:16 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 0069A85F18;\n\tTue, 16 Apr 2019 17:25:15 +0000 (UTC)", "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\tby ash.osuosl.org (Postfix) with ESMTP id E129B1BF9A0\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 16 Apr 2019 17:25:13 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id DE13787A1D\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 16 Apr 2019 17:25:13 +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 uwjcISUT1i-g for <intel-wired-lan@lists.osuosl.org>;\n\tTue, 16 Apr 2019 17:25:13 +0000 (UTC)", "from mga09.intel.com (mga09.intel.com [134.134.136.24])\n\tby hemlock.osuosl.org (Postfix) with ESMTPS id 2D8A18739E\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 16 Apr 2019 17:25:13 +0000 (UTC)", "from orsmga001.jf.intel.com ([10.7.209.18])\n\tby orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t16 Apr 2019 10:25:11 -0700", "from shasta.jf.intel.com ([10.166.244.191])\n\tby orsmga001.jf.intel.com with ESMTP; 16 Apr 2019 10:25:11 -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-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.60,358,1549958400\"; d=\"scan'208\";a=\"224064177\"", "From": "Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Tue, 16 Apr 2019 10:24:37 -0700", "Message-Id": "<20190416172439.27908-14-anirudh.venkataramanan@intel.com>", "X-Mailer": "git-send-email 2.20.1", "In-Reply-To": "<20190416172439.27908-1-anirudh.venkataramanan@intel.com>", "References": "<20190416172439.27908-1-anirudh.venkataramanan@intel.com>", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [PATCH S19 13/15] ice: Fix couple of issues in\n\tice_vsi_release", "X-BeenThere": "intel-wired-lan@osuosl.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "Intel Wired Ethernet Linux Kernel Driver Development\n\t<intel-wired-lan.osuosl.org>", "List-Unsubscribe": "<https://lists.osuosl.org/mailman/options/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@osuosl.org?subject=unsubscribe>", "List-Archive": "<http://lists.osuosl.org/pipermail/intel-wired-lan/>", "List-Post": "<mailto:intel-wired-lan@osuosl.org>", "List-Help": "<mailto:intel-wired-lan-request@osuosl.org?subject=help>", "List-Subscribe": "<https://lists.osuosl.org/mailman/listinfo/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@osuosl.org?subject=subscribe>", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "intel-wired-lan-bounces@osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@osuosl.org>" }, "content": "From: Brett Creeley <brett.creeley@intel.com>\n\nCurrently the driver is calling ice_napi_del() and then\nunregister_netdev(). The call to unregister_netdev() will result in a\ncall to ice_stop() and then ice_vsi_close(). This is where we call\nnapi_disable() for all the MSI-X vectors. This flow is reversed so make\nthe changes to ensure napi_disable() happens prior to napi_del().\n\nBefore calling napi_del() and free_netdev() make sure\nunregister_netdev() was called. This is done by making sure the\n__ICE_DOWN bit is set in the vsi->state for the interested VSI.\n\nSigned-off-by: Brett Creeley <brett.creeley@intel.com>\nSigned-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>\n---\n drivers/net/ethernet/intel/ice/ice.h | 1 -\n drivers/net/ethernet/intel/ice/ice_lib.c | 24 ++++++++++++-----------\n drivers/net/ethernet/intel/ice/ice_main.c | 2 +-\n 3 files changed, 14 insertions(+), 13 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ice/ice.h b/drivers/net/ethernet/intel/ice/ice.h\nindex 23e30a69f5fa..b5990ba0ee4c 100644\n--- a/drivers/net/ethernet/intel/ice/ice.h\n+++ b/drivers/net/ethernet/intel/ice/ice.h\n@@ -451,7 +451,6 @@ int ice_set_rss(struct ice_vsi *vsi, u8 *seed, u8 *lut, u16 lut_size);\n int ice_get_rss(struct ice_vsi *vsi, u8 *seed, u8 *lut, u16 lut_size);\n void ice_fill_rss_lut(u8 *lut, u16 rss_table_size, u16 rss_size);\n void ice_print_link_msg(struct ice_vsi *vsi, bool isup);\n-void ice_napi_del(struct ice_vsi *vsi);\n #ifdef CONFIG_DCB\n int ice_pf_ena_all_vsi(struct ice_pf *pf, bool locked);\n void ice_pf_dis_all_vsi(struct ice_pf *pf, bool locked);\ndiff --git a/drivers/net/ethernet/intel/ice/ice_lib.c b/drivers/net/ethernet/intel/ice/ice_lib.c\nindex fbf1eba0cc2a..f14fa51cc704 100644\n--- a/drivers/net/ethernet/intel/ice/ice_lib.c\n+++ b/drivers/net/ethernet/intel/ice/ice_lib.c\n@@ -2754,19 +2754,14 @@ int ice_vsi_release(struct ice_vsi *vsi)\n \n \tif (vsi->type == ICE_VSI_VF)\n \t\tvf = &pf->vf[vsi->vf_id];\n-\t/* do not unregister and free netdevs while driver is in the reset\n-\t * recovery pending state. Since reset/rebuild happens through PF\n-\t * service task workqueue, its not a good idea to unregister netdev\n-\t * that is associated to the PF that is running the work queue items\n-\t * currently. This is done to avoid check_flush_dependency() warning\n-\t * on this wq\n+\t/* do not unregister while driver is in the reset recovery pending\n+\t * state. Since reset/rebuild happens through PF service task workqueue,\n+\t * it's not a good idea to unregister netdev that is associated to the\n+\t * PF that is running the work queue items currently. This is done to\n+\t * avoid check_flush_dependency() warning on this wq\n \t */\n-\tif (vsi->netdev && !ice_is_reset_in_progress(pf->state)) {\n-\t\tice_napi_del(vsi);\n+\tif (vsi->netdev && !ice_is_reset_in_progress(pf->state))\n \t\tunregister_netdev(vsi->netdev);\n-\t\tfree_netdev(vsi->netdev);\n-\t\tvsi->netdev = NULL;\n-\t}\n \n \tif (test_bit(ICE_FLAG_RSS_ENA, pf->flags))\n \t\tice_rss_clean(vsi);\n@@ -2799,6 +2794,13 @@ int ice_vsi_release(struct ice_vsi *vsi)\n \tice_rm_vsi_lan_cfg(vsi->port_info, vsi->idx);\n \tice_vsi_delete(vsi);\n \tice_vsi_free_q_vectors(vsi);\n+\n+\t/* make sure unregister_netdev() was called by checking __ICE_DOWN */\n+\tif (vsi->netdev && test_bit(__ICE_DOWN, vsi->state)) {\n+\t\tfree_netdev(vsi->netdev);\n+\t\tvsi->netdev = NULL;\n+\t}\n+\n \tice_vsi_clear_rings(vsi);\n \n \tice_vsi_put_qs(vsi);\ndiff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c\nindex 65def2773313..0a4abc21890c 100644\n--- a/drivers/net/ethernet/intel/ice/ice_main.c\n+++ b/drivers/net/ethernet/intel/ice/ice_main.c\n@@ -1667,7 +1667,7 @@ static int ice_req_irq_msix_misc(struct ice_pf *pf)\n * ice_napi_del - Remove NAPI handler for the VSI\n * @vsi: VSI for which NAPI handler is to be removed\n */\n-void ice_napi_del(struct ice_vsi *vsi)\n+static void ice_napi_del(struct ice_vsi *vsi)\n {\n \tint v_idx;\n \n", "prefixes": [ "S19", "13/15" ] }