Refactor our storage and deduplication logic of ice_adapters by moving it to be handled by shared devlink instance, recently added by Jiri Pirko [1]. We wanted the devlink instance for whole device anyway - later in the series I will add devlink resources under it. Make the shared devlink a parent (wrt. nesting) of the actual PF devices. [1] commit 411ad0605875 ("Merge branch 'devlink-introduce-shared-devlink-instance-for-pfs-on-same-chip'") [1] https://lore.kernel.org/all/20260312100407.551173-1-jiri@resnulli.us Reviewed-by: Jedrzej Jagielski Reviewed-by: Aleksandr Loktionov Signed-off-by: Przemek Kitszel --- CC: Sergey Temerkhanov --- drivers/net/ethernet/intel/ice/ice_adapter.h | 12 +-- .../net/ethernet/intel/ice/devlink/devlink.c | 3 + drivers/net/ethernet/intel/ice/ice_adapter.c | 97 ++++++------------- drivers/net/ethernet/intel/ice/ice_main.c | 4 +- 4 files changed, 42 insertions(+), 74 deletions(-) diff --git a/drivers/net/ethernet/intel/ice/ice_adapter.h b/drivers/net/ethernet/intel/ice/ice_adapter.h index e95266c7f20b..5539ec5f8515 100644 --- a/drivers/net/ethernet/intel/ice/ice_adapter.h +++ b/drivers/net/ethernet/intel/ice/ice_adapter.h @@ -6,7 +6,8 @@ #include #include -#include + +#include struct pci_dev; struct ice_pf; @@ -27,27 +28,26 @@ struct ice_port_list { /** * struct ice_adapter - PCI adapter resources shared across PFs - * @refcount: Reference count. struct ice_pf objects hold the references. + * @devlink: ice adapter's devlink (whole dev devlink) * @ptp_gltsyn_time_lock: Spinlock protecting access to the GLTSYN_TIME * register of the PTP clock. * @txq_ctx_lock: Spinlock protecting access to the GLCOMM_QTX_CNTX_CTL register * @ctrl_pf: Control PF of the adapter * @ports: Ports list - * @index: 64-bit index cached for collision detection on 32bit systems */ struct ice_adapter { - refcount_t refcount; + struct devlink *devlink; + /* For access to the GLTSYN_TIME register */ spinlock_t ptp_gltsyn_time_lock; /* For access to GLCOMM_QTX_CNTX_CTL register */ spinlock_t txq_ctx_lock; struct ice_pf *ctrl_pf; struct ice_port_list ports; - u64 index; }; struct ice_adapter *ice_adapter_get(struct pci_dev *pdev); -void ice_adapter_put(struct pci_dev *pdev); +void ice_adapter_put(struct ice_adapter *adapter); #endif /* _ICE_ADAPTER_H */ diff --git a/drivers/net/ethernet/intel/ice/devlink/devlink.c b/drivers/net/ethernet/intel/ice/devlink/devlink.c index 641d6e289d5c..f6382d038048 100644 --- a/drivers/net/ethernet/intel/ice/devlink/devlink.c +++ b/drivers/net/ethernet/intel/ice/devlink/devlink.c @@ -1750,7 +1750,10 @@ struct ice_sf_priv *ice_allocate_sf(struct device *dev, struct ice_pf *pf) void ice_devlink_register(struct ice_pf *pf) { struct devlink *devlink = priv_to_devlink(pf); + struct ice_adapter *adapter = pf->adapter; + if (adapter) + devl_nested_devlink_set(adapter->devlink, devlink); devl_register(devlink); } diff --git a/drivers/net/ethernet/intel/ice/ice_adapter.c b/drivers/net/ethernet/intel/ice/ice_adapter.c index cbb57060bd56..d07d349a1692 100644 --- a/drivers/net/ethernet/intel/ice/ice_adapter.c +++ b/drivers/net/ethernet/intel/ice/ice_adapter.c @@ -1,18 +1,13 @@ // SPDX-License-Identifier: GPL-2.0-only // SPDX-FileCopyrightText: Copyright Red Hat -#include -#include #include #include #include -#include + #include "ice_adapter.h" #include "ice.h" -static DEFINE_XARRAY(ice_adapters); -static DEFINE_MUTEX(ice_adapters_mutex); - #define ICE_ADAPTER_FIXED_INDEX BIT_ULL(63) #define ICE_ADAPTER_INDEX_E825C \ @@ -40,44 +35,36 @@ static u64 ice_adapter_index(struct pci_dev *pdev) } } -static unsigned long ice_adapter_xa_index(struct pci_dev *pdev) -{ - u64 index = ice_adapter_index(pdev); - -#if BITS_PER_LONG == 64 - return index; -#else - return (u32)index ^ (u32)(index >> 32); -#endif -} - -static struct ice_adapter *ice_adapter_new(struct pci_dev *pdev) +static int ice_adapter_init(void *priv, void *init_param) { - struct ice_adapter *adapter; + struct ice_adapter *adapter = priv; + struct devlink *devlink; - adapter = kzalloc_obj(*adapter); - if (!adapter) - return NULL; + devlink = shd_priv_to_devlink(adapter); + adapter->devlink = devlink; - adapter->index = ice_adapter_index(pdev); spin_lock_init(&adapter->ptp_gltsyn_time_lock); spin_lock_init(&adapter->txq_ctx_lock); - refcount_set(&adapter->refcount, 1); mutex_init(&adapter->ports.lock); INIT_LIST_HEAD(&adapter->ports.ports); - return adapter; + return 0; } -static void ice_adapter_free(struct ice_adapter *adapter) +static void ice_adapter_fini(void *priv) { + struct ice_adapter *adapter = priv; + WARN_ON(!list_empty(&adapter->ports.ports)); mutex_destroy(&adapter->ports.lock); - - kfree(adapter); } +static const struct devlink_ops ice_adapter_devlink_ops = { + .shd_init = ice_adapter_init, + .shd_fini = ice_adapter_fini, +}; + /** * ice_adapter_get - Get a shared ice_adapter structure. * @pdev: Pointer to the pci_dev whose driver is getting the ice_adapter. @@ -94,54 +81,32 @@ static void ice_adapter_free(struct ice_adapter *adapter) struct ice_adapter *ice_adapter_get(struct pci_dev *pdev) { struct ice_adapter *adapter; - unsigned long index; - int err; - - index = ice_adapter_xa_index(pdev); - scoped_guard(mutex, &ice_adapters_mutex) { - adapter = xa_load(&ice_adapters, index); - if (adapter) { - refcount_inc(&adapter->refcount); - WARN_ON_ONCE(adapter->index != ice_adapter_index(pdev)); - return adapter; - } - err = xa_reserve(&ice_adapters, index, GFP_KERNEL); - if (err) - return ERR_PTR(err); - - adapter = ice_adapter_new(pdev); - if (!adapter) { - xa_release(&ice_adapters, index); - return ERR_PTR(-ENOMEM); - } - xa_store(&ice_adapters, index, adapter, GFP_KERNEL); - } + struct devlink *devlink; + char devlink_id[32]; + u64 index; + + index = ice_adapter_index(pdev); + snprintf(devlink_id, sizeof(devlink_id), "%llx", index); + devlink = devlink_shd_get(devlink_id, &ice_adapter_devlink_ops, + sizeof(*adapter), NULL, pdev->dev.driver); + if (!devlink) + return ERR_PTR(-ENOMEM); + + adapter = devlink_shd_get_priv(devlink); + return adapter; } /** * ice_adapter_put - Release a reference to the shared ice_adapter structure. - * @pdev: Pointer to the pci_dev whose driver is releasing the ice_adapter. + * @adapter: the ice_adapter to release reference to * * Releases the reference to ice_adapter previously obtained with * ice_adapter_get. * * Context: Process, may sleep. */ -void ice_adapter_put(struct pci_dev *pdev) +void ice_adapter_put(struct ice_adapter *adapter) { - struct ice_adapter *adapter; - unsigned long index; - - index = ice_adapter_xa_index(pdev); - scoped_guard(mutex, &ice_adapters_mutex) { - adapter = xa_load(&ice_adapters, index); - if (WARN_ON(!adapter)) - return; - if (!refcount_dec_and_test(&adapter->refcount)) - return; - - WARN_ON(xa_erase(&ice_adapters, index) != adapter); - } - ice_adapter_free(adapter); + devlink_shd_put(adapter->devlink); } diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c index 716ac8800559..42d9c4220f43 100644 --- a/drivers/net/ethernet/intel/ice/ice_main.c +++ b/drivers/net/ethernet/intel/ice/ice_main.c @@ -5380,7 +5380,7 @@ ice_probe(struct pci_dev *pdev, const struct pci_device_id __always_unused *ent) unroll_dev_init: need_dev_deinit = true; unroll_adapter: - ice_adapter_put(pdev); + ice_adapter_put(adapter); unroll_hw_init: ice_deinit_hw(hw); if (need_dev_deinit) @@ -5493,7 +5493,7 @@ static void ice_remove(struct pci_dev *pdev) ice_setup_mc_magic_wake(pf); ice_set_wake(pf); - ice_adapter_put(pdev); + ice_adapter_put(pf->adapter); ice_deinit_hw(&pf->hw); ice_deinit_dev(pf); -- 2.39.3