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 CC: Grzegorz Nitka v2: * propagate the error from devlink_shd_get() with ERR_CAST() * minor kdoc updates * check devl_nested_devlink_set() return value, ice_devlink_register() returns int now (Sashiko) * prefix the shared devlink id with "ice:", to avoid collisions with ids used by other drivers (Sashiko) Sashiko suggestions I don't want to apply: S: all PFs without DSN get index 0, and so share one instance me: pre-existing, and DSN 0 is only on pre-production samples --- .../net/ethernet/intel/ice/devlink/devlink.h | 2 +- drivers/net/ethernet/intel/ice/ice_adapter.h | 12 +- .../net/ethernet/intel/ice/devlink/devlink.c | 11 +- drivers/net/ethernet/intel/ice/ice_adapter.c | 106 ++++++------------ drivers/net/ethernet/intel/ice/ice_main.c | 11 +- 5 files changed, 57 insertions(+), 85 deletions(-) diff --git a/drivers/net/ethernet/intel/ice/devlink/devlink.h b/drivers/net/ethernet/intel/ice/devlink/devlink.h index 1af3b0763fbb..62af38d11fd9 100644 --- a/drivers/net/ethernet/intel/ice/devlink/devlink.h +++ b/drivers/net/ethernet/intel/ice/devlink/devlink.h @@ -7,7 +7,7 @@ struct ice_pf *ice_allocate_pf(struct device *dev); struct ice_sf_priv *ice_allocate_sf(struct device *dev, struct ice_pf *pf); -void ice_devlink_register(struct ice_pf *pf); +int ice_devlink_register(struct ice_pf *pf); void ice_devlink_unregister(struct ice_pf *pf); int ice_devlink_register_params(struct ice_pf *pf); void ice_devlink_unregister_params(struct ice_pf *pf); diff --git a/drivers/net/ethernet/intel/ice/ice_adapter.h b/drivers/net/ethernet/intel/ice/ice_adapter.h index c61bd645e460..cdad45e8e81b 100644 --- a/drivers/net/ethernet/intel/ice/ice_adapter.h +++ b/drivers/net/ethernet/intel/ice/ice_adapter.h @@ -8,7 +8,8 @@ #include #include #include -#include + +#include #include "ice_type.h" @@ -35,31 +36,30 @@ 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 * @cpi_phy_lock: Per-PHY mutex serializing CPI REQ/ACK transactions. * Index 0 = PHY0, index 1 = PHY1. Used on E825C devices. * @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; /* Serialize CPI REQ/ACK transactions per PHY (E825C only) */ struct mutex cpi_phy_lock[ICE_E825_MAX_PHYS]; 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 8c2b63eef82b..fa64b9744779 100644 --- a/drivers/net/ethernet/intel/ice/devlink/devlink.c +++ b/drivers/net/ethernet/intel/ice/devlink/devlink.c @@ -1747,11 +1747,20 @@ struct ice_sf_priv *ice_allocate_sf(struct device *dev, struct ice_pf *pf) * * Return: zero on success or an error code on failure. */ -void ice_devlink_register(struct ice_pf *pf) +int ice_devlink_register(struct ice_pf *pf) { struct devlink *devlink = priv_to_devlink(pf); + struct ice_adapter *adapter = pf->adapter; + int err; + if (adapter) { + err = devl_nested_devlink_set(adapter->devlink, devlink); + if (err) + return err; + } devl_register(devlink); + + return 0; } /** diff --git a/drivers/net/ethernet/intel/ice/ice_adapter.c b/drivers/net/ethernet/intel/ice/ice_adapter.c index 536923b6ae97..0cdb13e7bd89 100644 --- a/drivers/net/ethernet/intel/ice/ice_adapter.c +++ b/drivers/net/ethernet/intel/ice/ice_adapter.c @@ -1,19 +1,14 @@ // SPDX-License-Identifier: GPL-2.0-only // SPDX-FileCopyrightText: Copyright Red Hat -#include -#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 \ @@ -41,56 +36,41 @@ static u64 ice_adapter_index(struct pci_dev *pdev) } } -static unsigned long ice_adapter_xa_index(struct pci_dev *pdev) +static int ice_adapter_init(void *priv, void *init_param) { - u64 index = ice_adapter_index(pdev); - -#if BITS_PER_LONG == 64 - return index; -#else - return (u32)index ^ (u32)(index >> 32); -#endif -} + struct ice_adapter *adapter = priv; + struct devlink *devlink; -static struct ice_adapter *ice_adapter_new(struct pci_dev *pdev) -{ - struct ice_adapter *adapter; - int err; + devlink = shd_priv_to_devlink(adapter); + adapter->devlink = devlink; - adapter = kzalloc_obj(*adapter); - if (!adapter) - return NULL; - - err = init_srcu_struct(&adapter->ports.srcu); - if (err) { - kfree(adapter); - return NULL; - } - - adapter->index = ice_adapter_index(pdev); spin_lock_init(&adapter->ptp_gltsyn_time_lock); spin_lock_init(&adapter->txq_ctx_lock); for (int i = 0; i < ARRAY_SIZE(adapter->cpi_phy_lock); i++) mutex_init(&adapter->cpi_phy_lock[i]); - refcount_set(&adapter->refcount, 1); spin_lock_init(&adapter->ports.lock); INIT_LIST_HEAD(&adapter->ports.list); - return adapter; + return init_srcu_struct(&adapter->ports.srcu); } -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.list)); for (int i = 0; i < ARRAY_SIZE(adapter->cpi_phy_lock); i++) mutex_destroy(&adapter->cpi_phy_lock[i]); cleanup_srcu_struct(&adapter->ports.srcu); - - 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. @@ -102,59 +82,37 @@ static void ice_adapter_free(struct ice_adapter *adapter) * * Context: Process, may sleep. * Return: Pointer to ice_adapter on success. - * ERR_PTR() on error. -ENOMEM is the only possible error. + * ERR_PTR() on error. */ 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), "ice:%llx", index); + devlink = devlink_shd_get(devlink_id, &ice_adapter_devlink_ops, + sizeof(*adapter), NULL, pdev->dev.driver); + if (IS_ERR(devlink)) + return ERR_CAST(devlink); + + 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 454fba07d4ec..6373cd5ac288 100644 --- a/drivers/net/ethernet/intel/ice/ice_main.c +++ b/drivers/net/ethernet/intel/ice/ice_main.c @@ -4946,7 +4946,12 @@ static int ice_init_devlink(struct ice_pf *pf) return err; ice_devlink_init_regions(pf); - ice_devlink_register(pf); + err = ice_devlink_register(pf); + if (err) { + ice_devlink_destroy_regions(pf); + ice_devlink_unregister_params(pf); + return err; + } ice_health_init(pf); return 0; @@ -5291,7 +5296,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) @@ -5404,7 +5409,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.51.1