Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/2171498/?format=api
{ "id": 2171498, "url": "http://patchwork.ozlabs.org/api/patches/2171498/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20251204155133.2437621-4-aleksander.lobakin@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": "<20251204155133.2437621-4-aleksander.lobakin@intel.com>", "list_archive_url": null, "date": "2025-12-04T15:51:31", "name": "[iwl-next,v2,3/5] ice: migrate to netdev ops lock", "commit_ref": null, "pull_url": null, "state": "under-review", "archived": false, "hash": "dd7367757abfc193f27df25dfac1932e52fcf2b2", "submitter": { "id": 85827, "url": "http://patchwork.ozlabs.org/api/people/85827/?format=api", "name": "Alexander Lobakin", "email": "aleksander.lobakin@intel.com" }, "delegate": { "id": 109701, "url": "http://patchwork.ozlabs.org/api/users/109701/?format=api", "username": "anguy11", "first_name": "Anthony", "last_name": "Nguyen", "email": "anthony.l.nguyen@intel.com" }, "mbox": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20251204155133.2437621-4-aleksander.lobakin@intel.com/mbox/", "series": [ { "id": 484409, "url": "http://patchwork.ozlabs.org/api/series/484409/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=484409", "date": "2025-12-04T15:51:29", "name": "ice: add support for devmem/io_uring Rx and Tx", "version": 2, "mbox": "http://patchwork.ozlabs.org/series/484409/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/2171498/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2171498/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@legolas.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Authentication-Results": [ "legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=osuosl.org header.i=@osuosl.org header.a=rsa-sha256\n header.s=default header.b=USh2Zo/X;\n\tdkim-atps=neutral", "legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=osuosl.org\n (client-ip=140.211.166.138; helo=smtp1.osuosl.org;\n envelope-from=intel-wired-lan-bounces@osuosl.org;\n receiver=patchwork.ozlabs.org)" ], "Received": [ "from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519 server-signature ECDSA (secp384r1) server-digest SHA384)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4dMfC82Nqxz1xq8\n\tfor <incoming@patchwork.ozlabs.org>; Fri, 05 Dec 2025 02:52:04 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby smtp1.osuosl.org (Postfix) with ESMTP id 785B3846DD;\n\tThu, 4 Dec 2025 15:52:02 +0000 (UTC)", "from smtp1.osuosl.org ([127.0.0.1])\n by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP\n id wZPJ5eDppH0M; Thu, 4 Dec 2025 15:52:00 +0000 (UTC)", "from lists1.osuosl.org (lists1.osuosl.org [140.211.166.142])\n\tby smtp1.osuosl.org (Postfix) with ESMTP id 345EA846F3;\n\tThu, 4 Dec 2025 15:52:00 +0000 (UTC)", "from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136])\n by lists1.osuosl.org (Postfix) with ESMTP id 0840CD3\n for <intel-wired-lan@lists.osuosl.org>; Thu, 4 Dec 2025 15:51:59 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n by smtp3.osuosl.org (Postfix) with ESMTP id E282161549\n for <intel-wired-lan@lists.osuosl.org>; Thu, 4 Dec 2025 15:51:58 +0000 (UTC)", "from smtp3.osuosl.org ([127.0.0.1])\n by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP\n id srWgAxQ567Ec for <intel-wired-lan@lists.osuosl.org>;\n Thu, 4 Dec 2025 15:51:58 +0000 (UTC)", "from mgamail.intel.com (mgamail.intel.com [192.198.163.7])\n by smtp3.osuosl.org (Postfix) with ESMTPS id D49E360ADB\n for <intel-wired-lan@lists.osuosl.org>; Thu, 4 Dec 2025 15:51:57 +0000 (UTC)", "from fmviesa007.fm.intel.com ([10.60.135.147])\n by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 04 Dec 2025 07:51:57 -0800", "from newjersey.igk.intel.com ([10.102.20.203])\n by fmviesa007.fm.intel.com with ESMTP; 04 Dec 2025 07:51:54 -0800" ], "X-Virus-Scanned": [ "amavis at osuosl.org", "amavis at osuosl.org" ], "X-Comment": "SPF check N/A for local connections - client-ip=140.211.166.142;\n helo=lists1.osuosl.org; envelope-from=intel-wired-lan-bounces@osuosl.org;\n receiver=<UNKNOWN> ", "DKIM-Filter": [ "OpenDKIM Filter v2.11.0 smtp1.osuosl.org 345EA846F3", "OpenDKIM Filter v2.11.0 smtp3.osuosl.org D49E360ADB" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=osuosl.org;\n\ts=default; t=1764863520;\n\tbh=6W6O34sWvGWJaYBvkaDtOI7JaHfASdU6/+3RPVp+VEo=;\n\th=From:To:Cc:Date:In-Reply-To:References:Subject:List-Id:\n\t List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe:\n\t From;\n\tb=USh2Zo/X6qwRLu+1a8r3Nz32NIp3nxrhKgOryPljeIQee++dKdb1Ihqz9YDAxcFwK\n\t HRfGn+PPYiXHCqGX/3OjGiERn7pDU2VfcpKvH+x+FcoW9TqWWK7sbgkjdV3bMsfIZX\n\t v6I7g7LfZhv+S8IuNNIf0doakm4YW+QPdji7VF51gNIDE0E0XJOPl9JkeuVVzGG4Wk\n\t WhotVgOVXK2WPvDDyLTtS6Xso7P1g927enx/peFAmlA9Zz/sFrpIH4W8Q10Y8HgZ/R\n\t NNp/8m9Uvq1zHJ+wTf7cAazUNd+GCtsWd5+n5+4lnJ/ZRj1/vqT+cyqdy3docd5x5H\n\t VQ1cvpND7tqnw==", "Received-SPF": "Pass (mailfrom) identity=mailfrom; client-ip=192.198.163.7;\n helo=mgamail.intel.com; envelope-from=aleksander.lobakin@intel.com;\n receiver=<UNKNOWN>", "DMARC-Filter": "OpenDMARC Filter v1.4.2 smtp3.osuosl.org D49E360ADB", "X-CSE-ConnectionGUID": [ "ffx2UouQRiuVdF6wn2UMQw==", "06TLkbVKR+irM2vwyPqX+A==" ], "X-CSE-MsgGUID": [ "3+Tidn7sRlezhc5ewdvAGQ==", "mkjFlBX3SqGehnc6HoJf9A==" ], "X-IronPort-AV": [ "E=McAfee;i=\"6800,10657,11632\"; a=\"92365133\"", "E=Sophos;i=\"6.20,249,1758610800\"; d=\"scan'208\";a=\"92365133\"", "E=Sophos;i=\"6.20,249,1758610800\"; d=\"scan'208\";a=\"194677279\"" ], "X-ExtLoop1": "1", "From": "Alexander Lobakin <aleksander.lobakin@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Cc": "Alexander Lobakin <aleksander.lobakin@intel.com>,\n Tony Nguyen <anthony.l.nguyen@intel.com>,\n Przemek Kitszel <przemyslaw.kitszel@intel.com>,\n Andrew Lunn <andrew+netdev@lunn.ch>,\n \"David S. Miller\" <davem@davemloft.net>,\n Eric Dumazet <edumazet@google.com>, Jakub Kicinski <kuba@kernel.org>,\n Paolo Abeni <pabeni@redhat.com>, Simon Horman <horms@kernel.org>,\n Jacob Keller <jacob.e.keller@intel.com>,\n Aleksandr Loktionov <aleksandr.loktionov@intel.com>,\n nxne.cnse.osdt.itp.upstreaming@intel.com, netdev@vger.kernel.org,\n linux-kernel@vger.kernel.org", "Date": "Thu, 4 Dec 2025 16:51:31 +0100", "Message-ID": "<20251204155133.2437621-4-aleksander.lobakin@intel.com>", "X-Mailer": "git-send-email 2.52.0", "In-Reply-To": "<20251204155133.2437621-1-aleksander.lobakin@intel.com>", "References": "<20251204155133.2437621-1-aleksander.lobakin@intel.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "X-Mailman-Original-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1764863518; x=1796399518;\n h=from:to:cc:subject:date:message-id:in-reply-to:\n references:mime-version:content-transfer-encoding;\n bh=ClpYYsu4MSDyztrodfBmXwLYjp3vg3qnmJhxRtjMmac=;\n b=fHPwLKmUxVJkqs70A532Qc5l5mIx29v4ZO43tsdktr5kFgToLPYid9YH\n ZvrEzaw+zBSq8TTNPphRHJMmQl2fJmZE9QqYThvuHWzn4MzXVp6UD7tf4\n PAEwOAv7p6J3N1mt8iEPmZ81Ev9aJXPEekQxexQ1ZG9vlxtOUZXF1yMvx\n MNMuJbapUdCoHo3XwkMgOIN8pxzFVLJ6/LXtJY/MSYtpLZ0XNiptaBJdL\n vg0w7D4WXONXEVKRhOfdo2ZDF0lHxj2UuaxjKjeU9pzmXHdGrWM4JJ+P+\n lQa2JyoPLoTESH28RcYQn7mb6qGFmbt6wwtaNwHSJ5OCKuV/1P4ZeR9wX\n g==;", "X-Mailman-Original-Authentication-Results": [ "smtp3.osuosl.org;\n dmarc=pass (p=none dis=none)\n header.from=intel.com", "smtp3.osuosl.org;\n dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com\n header.a=rsa-sha256 header.s=Intel header.b=fHPwLKmU" ], "Subject": "[Intel-wired-lan] [PATCH iwl-next v2 3/5] ice: migrate to netdev\n ops lock", "X-BeenThere": "intel-wired-lan@osuosl.org", "X-Mailman-Version": "2.1.30", "Precedence": "list", "List-Id": "Intel Wired Ethernet Linux Kernel Driver Development\n <intel-wired-lan.osuosl.org>", "List-Unsubscribe": "<https://lists.osuosl.org/mailman/options/intel-wired-lan>,\n <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 <mailto:intel-wired-lan-request@osuosl.org?subject=subscribe>", "Errors-To": "intel-wired-lan-bounces@osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@osuosl.org>" }, "content": "Queue management ops unconditionally enable netdev locking. The same\nlock is taken by default by several NAPI configuration functions,\nsuch as napi_enable() and netif_napi_set_irq().\nRequest ops locking in advance and make sure we use the _locked\ncounterparts of those functions to avoid deadlocks, taking the lock\nmanually where needed (suspend/resume, queue rebuild and resets).\n\nReviewed-by: Jacob Keller <jacob.e.keller@intel.com>\nReviewed-by: Aleksandr Loktionov <aleksandr.loktionov@intel.com>\nSigned-off-by: Alexander Lobakin <aleksander.lobakin@intel.com>\n---\n drivers/net/ethernet/intel/ice/ice_lib.h | 6 ++-\n drivers/net/ethernet/intel/ice/ice_lib.c | 56 +++++++++++++++++----\n drivers/net/ethernet/intel/ice/ice_main.c | 49 ++++++++++--------\n drivers/net/ethernet/intel/ice/ice_sf_eth.c | 1 +\n drivers/net/ethernet/intel/ice/ice_xsk.c | 4 +-\n 5 files changed, 82 insertions(+), 34 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ice/ice_lib.h b/drivers/net/ethernet/intel/ice/ice_lib.h\nindex 49454d98dcfe..347b63e497e7 100644\n--- a/drivers/net/ethernet/intel/ice/ice_lib.h\n+++ b/drivers/net/ethernet/intel/ice/ice_lib.h\n@@ -53,9 +53,11 @@ struct ice_vsi *\n ice_vsi_setup(struct ice_pf *pf, struct ice_vsi_cfg_params *params);\n \n void ice_vsi_set_napi_queues(struct ice_vsi *vsi);\n-void ice_napi_add(struct ice_vsi *vsi);\n-\n+void ice_vsi_set_napi_queues_locked(struct ice_vsi *vsi);\n void ice_vsi_clear_napi_queues(struct ice_vsi *vsi);\n+void ice_vsi_clear_napi_queues_locked(struct ice_vsi *vsi);\n+\n+void ice_napi_add(struct ice_vsi *vsi);\n \n int ice_vsi_release(struct ice_vsi *vsi);\n \ndiff --git a/drivers/net/ethernet/intel/ice/ice_lib.c b/drivers/net/ethernet/intel/ice/ice_lib.c\nindex 17d92ba65128..ac5d95a28f72 100644\n--- a/drivers/net/ethernet/intel/ice/ice_lib.c\n+++ b/drivers/net/ethernet/intel/ice/ice_lib.c\n@@ -2703,7 +2703,7 @@ void ice_vsi_close(struct ice_vsi *vsi)\n \tif (!test_and_set_bit(ICE_VSI_DOWN, vsi->state))\n \t\tice_down(vsi);\n \n-\tice_vsi_clear_napi_queues(vsi);\n+\tice_vsi_clear_napi_queues_locked(vsi);\n \tice_vsi_free_irq(vsi);\n \tice_vsi_free_tx_rings(vsi);\n \tice_vsi_free_rx_rings(vsi);\n@@ -2772,12 +2772,13 @@ void ice_dis_vsi(struct ice_vsi *vsi, bool locked)\n }\n \n /**\n- * ice_vsi_set_napi_queues - associate netdev queues with napi\n+ * ice_vsi_set_napi_queues_locked - associate netdev queues with napi\n * @vsi: VSI pointer\n *\n * Associate queue[s] with napi for all vectors.\n+ * Must be called only with the netdev_lock taken.\n */\n-void ice_vsi_set_napi_queues(struct ice_vsi *vsi)\n+void ice_vsi_set_napi_queues_locked(struct ice_vsi *vsi)\n {\n \tstruct net_device *netdev = vsi->netdev;\n \tint q_idx, v_idx;\n@@ -2785,7 +2786,6 @@ void ice_vsi_set_napi_queues(struct ice_vsi *vsi)\n \tif (!netdev)\n \t\treturn;\n \n-\tASSERT_RTNL();\n \tice_for_each_rxq(vsi, q_idx)\n \t\tnetif_queue_set_napi(netdev, q_idx, NETDEV_QUEUE_TYPE_RX,\n \t\t\t\t &vsi->rx_rings[q_idx]->q_vector->napi);\n@@ -2797,17 +2797,37 @@ void ice_vsi_set_napi_queues(struct ice_vsi *vsi)\n \tice_for_each_q_vector(vsi, v_idx) {\n \t\tstruct ice_q_vector *q_vector = vsi->q_vectors[v_idx];\n \n-\t\tnetif_napi_set_irq(&q_vector->napi, q_vector->irq.virq);\n+\t\tnetif_napi_set_irq_locked(&q_vector->napi, q_vector->irq.virq);\n \t}\n }\n \n /**\n- * ice_vsi_clear_napi_queues - dissociate netdev queues from napi\n+ * ice_vsi_set_napi_queues - associate VSI queues with NAPIs\n * @vsi: VSI pointer\n *\n+ * Version of ice_vsi_set_napi_queues_locked() that takes the netdev_lock,\n+ * to use it outside of the net_device_ops context.\n+ */\n+void ice_vsi_set_napi_queues(struct ice_vsi *vsi)\n+{\n+\tstruct net_device *netdev = vsi->netdev;\n+\n+\tif (!netdev)\n+\t\treturn;\n+\n+\tnetdev_lock(netdev);\n+\tice_vsi_set_napi_queues_locked(vsi);\n+\tnetdev_unlock(netdev);\n+}\n+\n+/**\n+ * ice_vsi_clear_napi_queues_locked - dissociate netdev queues from napi\n+ * @vsi: VSI to process\n+ *\n * Clear the association between all VSI queues queue[s] and napi.\n+ * Must be called only with the netdev_lock taken.\n */\n-void ice_vsi_clear_napi_queues(struct ice_vsi *vsi)\n+void ice_vsi_clear_napi_queues_locked(struct ice_vsi *vsi)\n {\n \tstruct net_device *netdev = vsi->netdev;\n \tint q_idx, v_idx;\n@@ -2815,12 +2835,11 @@ void ice_vsi_clear_napi_queues(struct ice_vsi *vsi)\n \tif (!netdev)\n \t\treturn;\n \n-\tASSERT_RTNL();\n \t/* Clear the NAPI's interrupt number */\n \tice_for_each_q_vector(vsi, v_idx) {\n \t\tstruct ice_q_vector *q_vector = vsi->q_vectors[v_idx];\n \n-\t\tnetif_napi_set_irq(&q_vector->napi, -1);\n+\t\tnetif_napi_set_irq_locked(&q_vector->napi, -1);\n \t}\n \n \tice_for_each_txq(vsi, q_idx)\n@@ -2830,6 +2849,25 @@ void ice_vsi_clear_napi_queues(struct ice_vsi *vsi)\n \t\tnetif_queue_set_napi(netdev, q_idx, NETDEV_QUEUE_TYPE_RX, NULL);\n }\n \n+/**\n+ * ice_vsi_clear_napi_queues - dissociate VSI queues from NAPIs\n+ * @vsi: VSI to process\n+ *\n+ * Version of ice_vsi_clear_napi_queues_locked() that takes the netdev lock,\n+ * to use it outside of the net_device_ops context.\n+ */\n+void ice_vsi_clear_napi_queues(struct ice_vsi *vsi)\n+{\n+\tstruct net_device *netdev = vsi->netdev;\n+\n+\tif (!netdev)\n+\t\treturn;\n+\n+\tnetdev_lock(netdev);\n+\tice_vsi_clear_napi_queues_locked(vsi);\n+\tnetdev_unlock(netdev);\n+}\n+\n /**\n * ice_napi_add - register NAPI handler for the VSI\n * @vsi: VSI for which NAPI handler is to be registered\ndiff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c\nindex 96730bf288fd..881b41d37821 100644\n--- a/drivers/net/ethernet/intel/ice/ice_main.c\n+++ b/drivers/net/ethernet/intel/ice/ice_main.c\n@@ -3523,6 +3523,7 @@ static void ice_set_ops(struct ice_vsi *vsi)\n \t}\n \n \tnetdev->netdev_ops = &ice_netdev_ops;\n+\tnetdev->request_ops_lock = true;\n \tnetdev->udp_tunnel_nic_info = &pf->hw.udp_tunnel_nic;\n \tnetdev->xdp_metadata_ops = &ice_xdp_md_ops;\n \tice_set_ethtool_ops(netdev);\n@@ -5533,16 +5534,17 @@ static int ice_reinit_interrupt_scheme(struct ice_pf *pf)\n \n \t/* Remap vectors and rings, after successful re-init interrupts */\n \tice_for_each_vsi(pf, v) {\n-\t\tif (!pf->vsi[v])\n+\t\tstruct ice_vsi *vsi = pf->vsi[v];\n+\n+\t\tif (!vsi)\n \t\t\tcontinue;\n \n-\t\tret = ice_vsi_alloc_q_vectors(pf->vsi[v]);\n+\t\tret = ice_vsi_alloc_q_vectors(vsi);\n \t\tif (ret)\n \t\t\tgoto err_reinit;\n-\t\tice_vsi_map_rings_to_vectors(pf->vsi[v]);\n-\t\trtnl_lock();\n-\t\tice_vsi_set_napi_queues(pf->vsi[v]);\n-\t\trtnl_unlock();\n+\n+\t\tice_vsi_map_rings_to_vectors(vsi);\n+\t\tice_vsi_set_napi_queues(vsi);\n \t}\n \n \tret = ice_req_irq_msix_misc(pf);\n@@ -5555,13 +5557,15 @@ static int ice_reinit_interrupt_scheme(struct ice_pf *pf)\n \treturn 0;\n \n err_reinit:\n-\twhile (v--)\n-\t\tif (pf->vsi[v]) {\n-\t\t\trtnl_lock();\n-\t\t\tice_vsi_clear_napi_queues(pf->vsi[v]);\n-\t\t\trtnl_unlock();\n-\t\t\tice_vsi_free_q_vectors(pf->vsi[v]);\n-\t\t}\n+\twhile (v--) {\n+\t\tstruct ice_vsi *vsi = pf->vsi[v];\n+\n+\t\tif (!vsi)\n+\t\t\tcontinue;\n+\n+\t\tice_vsi_clear_napi_queues(vsi);\n+\t\tice_vsi_free_q_vectors(vsi);\n+\t}\n \n \treturn ret;\n }\n@@ -5623,14 +5627,17 @@ static int ice_suspend(struct device *dev)\n \t * to CPU0.\n \t */\n \tice_free_irq_msix_misc(pf);\n+\n \tice_for_each_vsi(pf, v) {\n-\t\tif (!pf->vsi[v])\n+\t\tstruct ice_vsi *vsi = pf->vsi[v];\n+\n+\t\tif (!vsi)\n \t\t\tcontinue;\n-\t\trtnl_lock();\n-\t\tice_vsi_clear_napi_queues(pf->vsi[v]);\n-\t\trtnl_unlock();\n-\t\tice_vsi_free_q_vectors(pf->vsi[v]);\n+\n+\t\tice_vsi_clear_napi_queues(vsi);\n+\t\tice_vsi_free_q_vectors(vsi);\n \t}\n+\n \tice_clear_interrupt_scheme(pf);\n \n \tpci_save_state(pdev);\n@@ -6744,7 +6751,7 @@ static void ice_napi_enable_all(struct ice_vsi *vsi)\n \t\tice_init_moderation(q_vector);\n \n \t\tif (q_vector->rx.rx_ring || q_vector->tx.tx_ring)\n-\t\t\tnapi_enable(&q_vector->napi);\n+\t\t\tnapi_enable_locked(&q_vector->napi);\n \t}\n }\n \n@@ -7243,7 +7250,7 @@ static void ice_napi_disable_all(struct ice_vsi *vsi)\n \t\tstruct ice_q_vector *q_vector = vsi->q_vectors[q_idx];\n \n \t\tif (q_vector->rx.rx_ring || q_vector->tx.tx_ring)\n-\t\t\tnapi_disable(&q_vector->napi);\n+\t\t\tnapi_disable_locked(&q_vector->napi);\n \n \t\tcancel_work_sync(&q_vector->tx.dim.work);\n \t\tcancel_work_sync(&q_vector->rx.dim.work);\n@@ -7543,7 +7550,7 @@ int ice_vsi_open(struct ice_vsi *vsi)\n \t\tif (err)\n \t\t\tgoto err_set_qs;\n \n-\t\tice_vsi_set_napi_queues(vsi);\n+\t\tice_vsi_set_napi_queues_locked(vsi);\n \t}\n \n \terr = ice_up_complete(vsi);\ndiff --git a/drivers/net/ethernet/intel/ice/ice_sf_eth.c b/drivers/net/ethernet/intel/ice/ice_sf_eth.c\nindex 1a2c94375ca7..2c3db1b03055 100644\n--- a/drivers/net/ethernet/intel/ice/ice_sf_eth.c\n+++ b/drivers/net/ethernet/intel/ice/ice_sf_eth.c\n@@ -58,6 +58,7 @@ static int ice_sf_cfg_netdev(struct ice_dynamic_port *dyn_port,\n \teth_hw_addr_set(netdev, dyn_port->hw_addr);\n \tether_addr_copy(netdev->perm_addr, dyn_port->hw_addr);\n \tnetdev->netdev_ops = &ice_sf_netdev_ops;\n+\tnetdev->request_ops_lock = true;\n \tSET_NETDEV_DEVLINK_PORT(netdev, devlink_port);\n \n \terr = register_netdev(netdev);\ndiff --git a/drivers/net/ethernet/intel/ice/ice_xsk.c b/drivers/net/ethernet/intel/ice/ice_xsk.c\nindex 953e68ed0f9a..6d08a11a86a8 100644\n--- a/drivers/net/ethernet/intel/ice/ice_xsk.c\n+++ b/drivers/net/ethernet/intel/ice/ice_xsk.c\n@@ -33,9 +33,9 @@ ice_qvec_toggle_napi(struct ice_vsi *vsi, struct ice_q_vector *q_vector,\n \t\treturn;\n \n \tif (enable)\n-\t\tnapi_enable(&q_vector->napi);\n+\t\tnapi_enable_locked(&q_vector->napi);\n \telse\n-\t\tnapi_disable(&q_vector->napi);\n+\t\tnapi_disable_locked(&q_vector->napi);\n }\n \n /**\n", "prefixes": [ "iwl-next", "v2", "3/5" ] }