{"id":2229458,"url":"http://patchwork.ozlabs.org/api/1.1/patches/2229458/?format=json","web_url":"http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20260428090912.3461-3-przemyslaw.kitszel@intel.com/","project":{"id":46,"url":"http://patchwork.ozlabs.org/api/1.1/projects/46/?format=json","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":""},"msgid":"<20260428090912.3461-3-przemyslaw.kitszel@intel.com>","date":"2026-04-28T09:09:12","name":"[net-next,2/2] ice: use shared devlink to store ice_adapters instead of custom xarray","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"fe030106464c9a50239f633296511835197c0474","submitter":{"id":85252,"url":"http://patchwork.ozlabs.org/api/1.1/people/85252/?format=json","name":"Przemek Kitszel","email":"przemyslaw.kitszel@intel.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20260428090912.3461-3-przemyslaw.kitszel@intel.com/mbox/","series":[{"id":501805,"url":"http://patchwork.ozlabs.org/api/1.1/series/501805/?format=json","web_url":"http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=501805","date":"2026-04-28T09:09:11","name":"devlink, ice, mlx5: add init/fini ops for shared devlink for ice to use","version":1,"mbox":"http://patchwork.ozlabs.org/series/501805/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2229458/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2229458/checks/","tags":{},"headers":{"Return-Path":"","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=vZHAT/si;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=osuosl.org\n (client-ip=2605:bc80:3010::136; helo=smtp3.osuosl.org;\n envelope-from=intel-wired-lan-bounces@osuosl.org;\n receiver=patchwork.ozlabs.org)"],"Received":["from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136])\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 4g4Znc0Hbvz1yJH\n\tfor ; Tue, 28 Apr 2026 19:26:44 +1000 (AEST)","from localhost (localhost [127.0.0.1])\n\tby smtp3.osuosl.org (Postfix) with ESMTP id 843B460DEF;\n\tTue, 28 Apr 2026 09:26:42 +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 CHdZ5-n-ripp; Tue, 28 Apr 2026 09:26:41 +0000 (UTC)","from lists1.osuosl.org (lists1.osuosl.org [140.211.166.142])\n\tby smtp3.osuosl.org (Postfix) with ESMTP id 9CFB760F30;\n\tTue, 28 Apr 2026 09:26:41 +0000 (UTC)","from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n by lists1.osuosl.org (Postfix) with ESMTP id B38B223D\n for ; Tue, 28 Apr 2026 09:26:39 +0000 (UTC)","from localhost (localhost [127.0.0.1])\n by smtp1.osuosl.org (Postfix) with ESMTP id 99E04838AB\n for ; Tue, 28 Apr 2026 09:26:39 +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 1Xw5jscO_iH9 for ;\n Tue, 28 Apr 2026 09:26:38 +0000 (UTC)","from mgamail.intel.com (mgamail.intel.com [192.198.163.7])\n by smtp1.osuosl.org (Postfix) with ESMTPS id 9D69C838AF\n for ; Tue, 28 Apr 2026 09:26:38 +0000 (UTC)","from orviesa003.jf.intel.com ([10.64.159.143])\n by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 28 Apr 2026 02:26:38 -0700","from irvmail002.ir.intel.com ([10.43.11.120])\n by orviesa003.jf.intel.com with ESMTP; 28 Apr 2026 02:26:34 -0700","from vecna.igk.intel.com (vecna.igk.intel.com [10.123.220.17])\n by irvmail002.ir.intel.com (Postfix) with ESMTP id 1CC4428194;\n Tue, 28 Apr 2026 10:26:32 +0100 (IST)"],"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= ","DKIM-Filter":["OpenDKIM Filter v2.11.0 smtp3.osuosl.org 9CFB760F30","OpenDKIM Filter v2.11.0 smtp1.osuosl.org 9D69C838AF"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=osuosl.org;\n\ts=default; t=1777368401;\n\tbh=+mqNSpP47doUf5eRCqFV/YaqHVt0Csc7gnnQGjaZzmQ=;\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=vZHAT/siiZwIr/c2MLXQTLyTR+vBBCIbW2OWosMaWq0E/yh84ZmXDj/zOynJqKim6\n\t 2BBkVSVp7vcKYO+SoOCd/Vkr+wYgKSXZu2I9oBn6TOHqPI9j43h19QEkp8Ck8/xadS\n\t vV96vT8MBSa9Ypm8ZcC2/6CPq0bYON01MnAxVVeU4+nWQB8EJgKMmjfvqt1iW6wew+\n\t V7tHutg5sQPobkaByLhFQjLqyOLpnH3HN+bgDyzdqBJoF/fUHyMmQUmzbjWUt9GJb0\n\t abbG95VSzXVBZ3nSvL8DcNekGp9P3ZqUFaT75cBhQ0lsyQEONJzIsWAa9O3x/dmX75\n\t PUwGkJw6SQNBA==","Received-SPF":"Pass (mailfrom) identity=mailfrom; client-ip=192.198.163.7;\n helo=mgamail.intel.com; envelope-from=przemyslaw.kitszel@intel.com;\n receiver=","DMARC-Filter":"OpenDMARC Filter v1.4.2 smtp1.osuosl.org 9D69C838AF","X-CSE-ConnectionGUID":["VIcx0cxdT5ifzMuxG80WAQ==","B8+rAFe9SRCrZ80f3/XrXw=="],"X-CSE-MsgGUID":["zLNKfamtSt2hChlBV+51ug==","r/yyPObMSe6dG0p16Q4vpg=="],"X-IronPort-AV":["E=McAfee;i=\"6800,10657,11769\"; a=\"103731770\"","E=Sophos;i=\"6.23,203,1770624000\"; d=\"scan'208\";a=\"103731770\"","E=Sophos;i=\"6.23,203,1770624000\"; d=\"scan'208\";a=\"237861395\""],"X-ExtLoop1":"1","From":"Przemek Kitszel ","To":"netdev@vger.kernel.org, Jakub Kicinski ,\n Jiri Pirko ","Cc":"intel-wired-lan@lists.osuosl.org,\n Tony Nguyen ,\n Jacob Keller ,\n Lukasz Czapnik ,\n Jedrzej Jagielski ,\n Andrew Lunn ,\n \"David S. Miller\" ,\n Eric Dumazet , Paolo Abeni ,\n Saeed Mahameed , Leon Romanovsky ,\n Tariq Toukan , Mark Bloch ,\n Simon Horman ,\n Przemek Kitszel ,\n Aleksandr Loktionov ,\n Sergey Temerkhanov ","Date":"Tue, 28 Apr 2026 11:09:12 +0200","Message-Id":"<20260428090912.3461-3-przemyslaw.kitszel@intel.com>","X-Mailer":"git-send-email 2.39.3","In-Reply-To":"<20260428090912.3461-1-przemyslaw.kitszel@intel.com>","References":"<20260428090912.3461-1-przemyslaw.kitszel@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=1777368399; x=1808904399;\n h=from:to:cc:subject:date:message-id:in-reply-to:\n references:mime-version:content-transfer-encoding;\n bh=NYUhNoy1ne+FsvmNjLoXVWXCjfK5z2wSkDTMyfF8clo=;\n b=kfG+Xq9iS4PTRCqtqqX+ytW6GjEK4xn8Q3r48sZhwHx5xLPYM3L1GwvP\n /6aqcv4t6lzlmLtoTlhJ447yg3mvFirgUNVZGAMDlgI4vLltnFpUrtISt\n jMedHEUvKyJ/Of5ts2NfUY1xlprF/J7MqI/k6JWWiN9ZfUsQ7vbuReKr6\n 2sJFqbUAZ3UdFN0l+IU6P2odlR0yfZGiNMbRc1Kz3AnWg0AXzz8kJNYMK\n uwIiQAO8a0YaQNtzH/J+fh844C1gTBzMiAWNeY6Yt5IsFMmqL+fMf4zlZ\n hOuaLt7OrwWZs8wFXKmXMM2AKus06AaJLt/32jJP38Qppx5nqodCp72hX\n A==;","X-Mailman-Original-Authentication-Results":["smtp1.osuosl.org;\n dmarc=pass (p=none dis=none)\n header.from=intel.com","smtp1.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=kfG+Xq9i"],"Subject":"[Intel-wired-lan] [PATCH net-next 2/2] ice: use shared devlink to\n store ice_adapters instead of custom xarray","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 ","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Errors-To":"intel-wired-lan-bounces@osuosl.org","Sender":"\"Intel-wired-lan\" "},"content":"Refactor our storage and deduplication logic of ice_adapters by moving\nit to be handled by shared devlink instance, recently added by\nJiri Pirko [1].\n\nWe wanted the devlink instance for whole device anyway - later in the\nseries I will add devlink resources under it.\n\nMake the shared devlink a parent (wrt. nesting) of the actual PF devices.\n\n[1] commit 411ad0605875 (\"Merge branch 'devlink-introduce-shared-devlink-instance-for-pfs-on-same-chip'\")\n[1] https://lore.kernel.org/all/20260312100407.551173-1-jiri@resnulli.us\nReviewed-by: Jedrzej Jagielski \nReviewed-by: Aleksandr Loktionov \nSigned-off-by: Przemek Kitszel \n---\nCC: Sergey Temerkhanov \n---\n drivers/net/ethernet/intel/ice/ice_adapter.h | 13 +--\n .../net/ethernet/intel/ice/devlink/devlink.c | 3 +\n drivers/net/ethernet/intel/ice/ice_adapter.c | 95 ++++++-------------\n drivers/net/ethernet/intel/ice/ice_main.c | 4 +-\n 4 files changed, 42 insertions(+), 73 deletions(-)","diff":"diff --git a/drivers/net/ethernet/intel/ice/ice_adapter.h b/drivers/net/ethernet/intel/ice/ice_adapter.h\nindex e95266c7f20b..d4ec7e78abb4 100644\n--- a/drivers/net/ethernet/intel/ice/ice_adapter.h\n+++ b/drivers/net/ethernet/intel/ice/ice_adapter.h\n@@ -6,7 +6,8 @@\n \n #include \n #include \n-#include \n+\n+#include \n \n struct pci_dev;\n struct ice_pf;\n@@ -27,27 +28,26 @@ struct ice_port_list {\n \n /**\n * struct ice_adapter - PCI adapter resources shared across PFs\n- * @refcount: Reference count. struct ice_pf objects hold the references.\n+ * @devlink: ice adapter's devlink (whole dev devlink)\n * @ptp_gltsyn_time_lock: Spinlock protecting access to the GLTSYN_TIME\n * register of the PTP clock.\n * @txq_ctx_lock: Spinlock protecting access to the GLCOMM_QTX_CNTX_CTL register\n * @ctrl_pf: Control PF of the adapter\n * @ports: Ports list\n- * @index: 64-bit index cached for collision detection on 32bit systems\n */\n struct ice_adapter {\n-\trefcount_t refcount;\n+\tstruct devlink *devlink;\n+\n \t/* For access to the GLTSYN_TIME register */\n \tspinlock_t ptp_gltsyn_time_lock;\n \t/* For access to GLCOMM_QTX_CNTX_CTL register */\n \tspinlock_t txq_ctx_lock;\n \n \tstruct ice_pf *ctrl_pf;\n \tstruct ice_port_list ports;\n-\tu64 index;\n };\n \n struct ice_adapter *ice_adapter_get(struct pci_dev *pdev);\n-void ice_adapter_put(struct pci_dev *pdev);\n+void ice_adapter_put(struct ice_adapter *adapter);\n \n #endif /* _ICE_ADAPTER_H */\ndiff --git a/drivers/net/ethernet/intel/ice/devlink/devlink.c b/drivers/net/ethernet/intel/ice/devlink/devlink.c\nindex 641d6e289d5c..f6382d038048 100644\n--- a/drivers/net/ethernet/intel/ice/devlink/devlink.c\n+++ b/drivers/net/ethernet/intel/ice/devlink/devlink.c\n@@ -1750,7 +1750,10 @@ struct ice_sf_priv *ice_allocate_sf(struct device *dev, struct ice_pf *pf)\n void ice_devlink_register(struct ice_pf *pf)\n {\n \tstruct devlink *devlink = priv_to_devlink(pf);\n+\tstruct ice_adapter *adapter = pf->adapter;\n \n+\tif (adapter)\n+\t\tdevl_nested_devlink_set(adapter->devlink, devlink);\n \tdevl_register(devlink);\n }\n \ndiff --git a/drivers/net/ethernet/intel/ice/ice_adapter.c b/drivers/net/ethernet/intel/ice/ice_adapter.c\nindex cbb57060bd56..8ec1b600905f 100644\n--- a/drivers/net/ethernet/intel/ice/ice_adapter.c\n+++ b/drivers/net/ethernet/intel/ice/ice_adapter.c\n@@ -1,18 +1,13 @@\n // SPDX-License-Identifier: GPL-2.0-only\n // SPDX-FileCopyrightText: Copyright Red Hat\n \n-#include \n-#include \n #include \n #include \n #include \n-#include \n+\n #include \"ice_adapter.h\"\n #include \"ice.h\"\n \n-static DEFINE_XARRAY(ice_adapters);\n-static DEFINE_MUTEX(ice_adapters_mutex);\n-\n #define ICE_ADAPTER_FIXED_INDEX\tBIT_ULL(63)\n \n #define ICE_ADAPTER_INDEX_E825C\t\\\n@@ -40,44 +35,36 @@ static u64 ice_adapter_index(struct pci_dev *pdev)\n \t}\n }\n \n-static unsigned long ice_adapter_xa_index(struct pci_dev *pdev)\n-{\n-\tu64 index = ice_adapter_index(pdev);\n-\n-#if BITS_PER_LONG == 64\n-\treturn index;\n-#else\n-\treturn (u32)index ^ (u32)(index >> 32);\n-#endif\n-}\n-\n-static struct ice_adapter *ice_adapter_new(struct pci_dev *pdev)\n+static int ice_adapter_init(void *priv, void *init_param)\n {\n-\tstruct ice_adapter *adapter;\n+\tstruct ice_adapter *adapter = priv;\n+\tstruct devlink *devlink;\n \n-\tadapter = kzalloc_obj(*adapter);\n-\tif (!adapter)\n-\t\treturn NULL;\n+\tdevlink = shd_priv_to_devlink(adapter);\n+\tadapter->devlink = devlink;\n \n-\tadapter->index = ice_adapter_index(pdev);\n \tspin_lock_init(&adapter->ptp_gltsyn_time_lock);\n \tspin_lock_init(&adapter->txq_ctx_lock);\n-\trefcount_set(&adapter->refcount, 1);\n \n \tmutex_init(&adapter->ports.lock);\n \tINIT_LIST_HEAD(&adapter->ports.ports);\n \n-\treturn adapter;\n+\treturn 0;\n }\n \n-static void ice_adapter_free(struct ice_adapter *adapter)\n+static void ice_adapter_fini(void *priv)\n {\n+\tstruct ice_adapter *adapter = priv;\n+\n \tWARN_ON(!list_empty(&adapter->ports.ports));\n \tmutex_destroy(&adapter->ports.lock);\n-\n-\tkfree(adapter);\n }\n \n+static const struct devlink_ops ice_adapter_devlink_ops = {\n+\t.shd_init = ice_adapter_init,\n+\t.shd_fini = ice_adapter_fini,\n+};\n+\n /**\n * ice_adapter_get - Get a shared ice_adapter structure.\n * @pdev: Pointer to the pci_dev whose driver is getting the ice_adapter.\n@@ -94,28 +81,19 @@ static void ice_adapter_free(struct ice_adapter *adapter)\n struct ice_adapter *ice_adapter_get(struct pci_dev *pdev)\n {\n \tstruct ice_adapter *adapter;\n-\tunsigned long index;\n-\tint err;\n-\n-\tindex = ice_adapter_xa_index(pdev);\n-\tscoped_guard(mutex, &ice_adapters_mutex) {\n-\t\tadapter = xa_load(&ice_adapters, index);\n-\t\tif (adapter) {\n-\t\t\trefcount_inc(&adapter->refcount);\n-\t\t\tWARN_ON_ONCE(adapter->index != ice_adapter_index(pdev));\n-\t\t\treturn adapter;\n-\t\t}\n-\t\terr = xa_reserve(&ice_adapters, index, GFP_KERNEL);\n-\t\tif (err)\n-\t\t\treturn ERR_PTR(err);\n-\n-\t\tadapter = ice_adapter_new(pdev);\n-\t\tif (!adapter) {\n-\t\t\txa_release(&ice_adapters, index);\n-\t\t\treturn ERR_PTR(-ENOMEM);\n-\t\t}\n-\t\txa_store(&ice_adapters, index, adapter, GFP_KERNEL);\n-\t}\n+\tstruct devlink *devlink;\n+\tchar devlink_id[32];\n+\tu64 index;\n+\n+\tindex = ice_adapter_index(pdev);\n+\tsnprintf(devlink_id, sizeof(devlink_id), \"%llx\", index);\n+\tdevlink = devlink_shd_get(devlink_id, &ice_adapter_devlink_ops,\n+\t\t\t\t sizeof(*adapter), NULL, pdev->dev.driver);\n+\tif (!devlink)\n+\t\treturn ERR_PTR(-ENOMEM);\n+\n+\tadapter = devlink_shd_get_priv(devlink);\n+\n \treturn adapter;\n }\n \n@@ -128,20 +106,7 @@ struct ice_adapter *ice_adapter_get(struct pci_dev *pdev)\n *\n * Context: Process, may sleep.\n */\n-void ice_adapter_put(struct pci_dev *pdev)\n+void ice_adapter_put(struct ice_adapter *adapter)\n {\n-\tstruct ice_adapter *adapter;\n-\tunsigned long index;\n-\n-\tindex = ice_adapter_xa_index(pdev);\n-\tscoped_guard(mutex, &ice_adapters_mutex) {\n-\t\tadapter = xa_load(&ice_adapters, index);\n-\t\tif (WARN_ON(!adapter))\n-\t\t\treturn;\n-\t\tif (!refcount_dec_and_test(&adapter->refcount))\n-\t\t\treturn;\n-\n-\t\tWARN_ON(xa_erase(&ice_adapters, index) != adapter);\n-\t}\n-\tice_adapter_free(adapter);\n+\tdevlink_shd_put(adapter->devlink);\n }\ndiff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c\nindex 6ebaa41127a4..6e257ad13bd1 100644\n--- a/drivers/net/ethernet/intel/ice/ice_main.c\n+++ b/drivers/net/ethernet/intel/ice/ice_main.c\n@@ -5349,7 +5349,7 @@ ice_probe(struct pci_dev *pdev, const struct pci_device_id __always_unused *ent)\n unroll_dev_init:\n \tneed_dev_deinit = true;\n unroll_adapter:\n-\tice_adapter_put(pdev);\n+\tice_adapter_put(adapter);\n unroll_hw_init:\n \tice_deinit_hw(hw);\n \tif (need_dev_deinit)\n@@ -5462,7 +5462,7 @@ static void ice_remove(struct pci_dev *pdev)\n \tice_setup_mc_magic_wake(pf);\n \tice_set_wake(pf);\n \n-\tice_adapter_put(pdev);\n+\tice_adapter_put(pf->adapter);\n \tice_deinit_hw(&pf->hw);\n \n \tice_deinit_dev(pf);\n","prefixes":["net-next","2/2"]}