net: devlink: prepare mlxsw and netdevsim for locked reload
Subsystems (5)
Jiri Pirko
maintainerv2 cover net: devlink: prepare mlxsw and netdevsim for locked reload
From: Jiri Pirko <[email protected]>
This is preparation patchset to be able to eventually make a switch and make reload cmd to take devlink->lock as the other commands do.
This patchset is preparing 2 major users of devlink API - mlxsw and netdevsim. The sets of functions are similar, therefore taking care of both here.
I would like to ask you to take this RFC for a test spin, will send v1 after you give me a go.
Jiri Pirko (8):
net: devlink: add unlocked variants of devling_trap*() functions
net: devlink: add unlocked variants of devlink_resource*() functions
net: devlink: add unlocked variants of devlink_sb*() functions
net: devlink: add unlocked variants of devlink_dpipe*() functions
mlxsw: convert driver to use unlocked devlink API during init/fini
net: devlink: add unlocked variants of devlink_region_create/destroy()
functions
netdevsim: convert driver to use unlocked devlink API during init/fini
net: devlink: remove unused locked functions
Moshe Shemesh (1):
net: devlink: avoid false DEADLOCK warning reported by lockdep
drivers/net/ethernet/mellanox/mlxsw/core.c | 53 +- .../net/ethernet/mellanox/mlxsw/spectrum.c | 103 ++- .../ethernet/mellanox/mlxsw/spectrum1_kvdl.c | 82 +-- .../mellanox/mlxsw/spectrum_buffers.c | 14 +- .../ethernet/mellanox/mlxsw/spectrum_cnt.c | 62 +- .../ethernet/mellanox/mlxsw/spectrum_dpipe.c | 88 +-- .../mellanox/mlxsw/spectrum_policer.c | 32 +- .../ethernet/mellanox/mlxsw/spectrum_router.c | 22 +- .../ethernet/mellanox/mlxsw/spectrum_span.c | 6 +- .../ethernet/mellanox/mlxsw/spectrum_trap.c | 27 +- drivers/net/netdevsim/bus.c | 19 - drivers/net/netdevsim/dev.c | 134 ++-- drivers/net/netdevsim/fib.c | 62 +- drivers/net/netdevsim/netdevsim.h | 3 - include/net/devlink.h | 76 ++- net/core/devlink.c | 637 ++++++++++++------ 16 files changed, 816 insertions(+), 604 deletions(-)
Signature · 1 line
2.35.3
Jiri Pirko
maintainerRFC PATCH v2 1/9 net: devlink: avoid false DEADLOCK warning reported by lockdep
From: Moshe Shemesh <[email protected]>
Add a lock_class_key per devlink instance to avoid DEADLOCK warning by lockdep, while locking more than one devlink instance in driver code, for example in opening VFs flow.
Kernel log:
[ 101.433802] ============================================
[ 101.433803] WARNING: possible recursive locking detected
[ 101.433810] 5.19.0-rc1+ #35 Not tainted
[ 101.433812] --------------------------------------------
[ 101.433813] bash/892 is trying to acquire lock:
[ 101.433815] ffff888127bfc2f8 (&devlink->lock){+.+.}-{3:3}, at: probe_one+0x3c/0x690 [mlx5_core]
[ 101.433909]
but task is already holding lock:
[ 101.433910] ffff888118f4c2f8 (&devlink->lock){+.+.}-{3:3}, at: mlx5_core_sriov_configure+0x62/0x280 [mlx5_core]
[ 101.433989]
other info that might help us debug this:
[ 101.433990] Possible unsafe locking scenario:[ 101.433991] CPU0
[ 101.433991] ----
[ 101.433992] lock(&devlink->lock);
[ 101.433993] lock(&devlink->lock);
[ 101.433995]
*** DEADLOCK ***[ 101.433996] May be due to missing lock nesting notation
[ 101.433996] 6 locks held by bash/892:
[ 101.433998] #0: ffff88810eb50448 (sb_writers#3){.+.+}-{0:0}, at: ksys_write+0xf3/0x1d0
[ 101.434009] #1: ffff888114777c88 (&of->mutex){+.+.}-{3:3}, at: kernfs_fop_write_iter+0x20d/0x520
[ 101.434017] #2: ffff888102b58660 (kn->active#231){.+.+}-{0:0}, at: kernfs_fop_write_iter+0x230/0x520
[ 101.434023] #3: ffff888102d70198 (&dev->mutex){....}-{3:3}, at: sriov_numvfs_store+0x132/0x310
[ 101.434031] #4: ffff888118f4c2f8 (&devlink->lock){+.+.}-{3:3}, at: mlx5_core_sriov_configure+0x62/0x280 [mlx5_core]
[ 101.434108] #5: ffff88812adce198 (&dev->mutex){....}-{3:3}, at: __device_attach+0x76/0x430
[ 101.434116]
stack backtrace:
[ 101.434118] CPU: 5 PID: 892 Comm: bash Not tainted 5.19.0-rc1+ #35
[ 101.434120] Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS rel-1.13.0-0-gf21b5a4aeb02-prebuilt.qemu.org 04/01/2014
[ 101.434130] Call Trace:
[ 101.434133] <TASK>
[ 101.434135] dump_stack_lvl+0x57/0x7d
[ 101.434145] __lock_acquire.cold+0x1df/0x3e7
[ 101.434151] ? register_lock_class+0x1880/0x1880
[ 101.434157] lock_acquire+0x1c1/0x550
[ 101.434160] ? probe_one+0x3c/0x690 [mlx5_core]
[ 101.434229] ? lockdep_hardirqs_on_prepare+0x400/0x400
[ 101.434232] ? __xa_alloc+0x1ed/0x2d0
[ 101.434236] ? ksys_write+0xf3/0x1d0
[ 101.434239] __mutex_lock+0x12c/0x14b0
[ 101.434243] ? probe_one+0x3c/0x690 [mlx5_core]
[ 101.434312] ? probe_one+0x3c/0x690 [mlx5_core]
[ 101.434380] ? devlink_alloc_ns+0x11b/0x910
[ 101.434385] ? mutex_lock_io_nested+0x1320/0x1320
[ 101.434388] ? lockdep_init_map_type+0x21a/0x7d0
[ 101.434391] ? lockdep_init_map_type+0x21a/0x7d0
[ 101.434393] ? __init_swait_queue_head+0x70/0xd0
[ 101.434397] probe_one+0x3c/0x690 [mlx5_core]
[ 101.434467] pci_device_probe+0x1b4/0x480
[ 101.434471] really_probe+0x1e0/0xaa0
[ 101.434474] __driver_probe_device+0x219/0x480
[ 101.434478] driver_probe_device+0x49/0x130
[ 101.434481] __device_attach_driver+0x1b8/0x280
[ 101.434484] ? driver_allows_async_probing+0x140/0x140
[ 101.434487] bus_for_each_drv+0x123/0x1a0
[ 101.434489] ? bus_for_each_dev+0x1a0/0x1a0
[ 101.434491] ? lockdep_hardirqs_on_prepare+0x286/0x400
[ 101.434494] ? trace_hardirqs_on+0x2d/0x100
[ 101.434498] __device_attach+0x1a3/0x430
[ 101.434501] ? device_driver_attach+0x1e0/0x1e0
[ 101.434503] ? pci_bridge_d3_possible+0x1e0/0x1e0
[ 101.434506] ? pci_create_resource_files+0xeb/0x190
[ 101.434511] pci_bus_add_device+0x6c/0xa0
[ 101.434514] pci_iov_add_virtfn+0x9e4/0xe00
[ 101.434517] ? trace_hardirqs_on+0x2d/0x100
[ 101.434521] sriov_enable+0x64a/0xca0
[ 101.434524] ? pcibios_sriov_disable+0x10/0x10
[ 101.434528] mlx5_core_sriov_configure+0xab/0x280 [mlx5_core]
[ 101.434602] sriov_numvfs_store+0x20a/0x310
[ 101.434605] ? sriov_totalvfs_show+0xc0/0xc0
[ 101.434608] ? sysfs_file_ops+0x170/0x170
[ 101.434611] ? sysfs_file_ops+0x117/0x170
[ 101.434614] ? sysfs_file_ops+0x170/0x170
[ 101.434616] kernfs_fop_write_iter+0x348/0x520
[ 101.434619] new_sync_write+0x2e5/0x520
[ 101.434621] ? new_sync_read+0x520/0x520
[ 101.434624] ? lock_acquire+0x1c1/0x550
[ 101.434626] ? lockdep_hardirqs_on_prepare+0x400/0x400
[ 101.434630] vfs_write+0x5cb/0x8d0
[ 101.434633] ksys_write+0xf3/0x1d0
[ 101.434635] ? __x64_sys_read+0xb0/0xb0
[ 101.434638] ? lockdep_hardirqs_on_prepare+0x286/0x400
[ 101.434640] ? syscall_enter_from_user_mode+0x1d/0x50
[ 101.434643] do_syscall_64+0x3d/0x90
[ 101.434647] entry_SYSCALL_64_after_hwframe+0x46/0xb0
[ 101.434650] RIP: 0033:0x7f5ff536b2f7
[ 101.434658] Code: 0d 00 f7 d8 64 89 02 48 c7 c0 ff ff ff ff eb b7 0f
1f 00 f3 0f 1e fa 64 8b 04 25 18 00 00 00 85 c0 75 10 b8 01 00 00 00 0f
05 <48> 3d 00 f0 ff ff 77 51 c3 48 83 ec 28 48 89 54 24 18 48 89 74 24
[ 101.434661] RSP: 002b:00007ffd9ea85d58 EFLAGS: 00000246 ORIG_RAX: 0000000000000001
[ 101.434664] RAX: ffffffffffffffda RBX: 0000000000000002 RCX: 00007f5ff536b2f7
[ 101.434666] RDX: 0000000000000002 RSI: 000055c4c279e230 RDI: 0000000000000001
[ 101.434668] RBP: 000055c4c279e230 R08: 000000000000000a R09: 0000000000000001
[ 101.434669] R10: 000055c4c283cbf0 R11: 0000000000000246 R12: 0000000000000002
[ 101.434670] R13: 00007f5ff543d500 R14: 0000000000000002 R15: 00007f5ff543d700
[ 101.434673] </TASK>--- net/core/devlink.c | 4 ++++ 1 file changed, 4 insertions(+)
net/core/devlink.c +4 -0
@@ -66,6 +66,7 @@ struct devlink {* port, sb, dpipe, resource, params, region, traps and more. */ struct mutex lock; +struct lock_class_key lock_key; u8 reload_failed:1;refcount_t refcount;struct completion comp;
@@ -9472,7 +9473,9 @@ struct devlink *devlink_alloc_ns(const struct devlink_ops *ops,INIT_LIST_HEAD (&devlink->trap_list);INIT_LIST_HEAD (&devlink->trap_group_list);INIT_LIST_HEAD (&devlink->trap_policer_list); +lockdep_register_key (&devlink->lock_key);mutex_init (&devlink->lock); +lockdep_set_class (&devlink->lock, &devlink->lock_key);mutex_init (&devlink->reporters_lock);mutex_init (&devlink->linecards_lock);refcount_set (&devlink->refcount,1 );
@@ -9619,6 +9622,7 @@ void devlink_free(struct devlink *devlink)mutex_destroy (&devlink->linecards_lock);mutex_destroy (&devlink->reporters_lock);mutex_destroy (&devlink->lock); +lockdep_unregister_key (&devlink->lock_key);WARN_ON (!list_empty (&devlink->trap_policer_list));WARN_ON (!list_empty (&devlink->trap_group_list));WARN_ON (!list_empty (&devlink->trap_list));
Signature · 1 line
2.35.3
Jiri Pirko
maintainerRFC PATCH v2 2/9 net: devlink: add unlocked variants of devling_trap*() functions
In reply to Jiri PirkoFrom: Jiri Pirko <[email protected]>
Add unlocked variants of devl_trap*() functions to be used in drivers called-in with devlink->lock held.
---RFC->RFCv2:
- s/ret/err/
- quashed the similar traps policer patch
--- include/net/devlink.h | 20 +++++ net/core/devlink.c | 180 ++++++++++++++++++++++++++++++++++-------- 2 files changed, 168 insertions(+), 32 deletions(-)
include/net/devlink.h +20 -0
@@ -1745,9 +1745,15 @@ void devlink_flash_update_timeout_notify(struct devlink *devlink,const char *component, unsigned long timeout); +int devl_traps_register (struct devlink *devlink, +const struct devlink_trap *traps, +size_t traps_count,void *priv);int devlink_traps_register (struct devlink *devlink,const struct devlink_trap *traps,size_t traps_count,void *priv); +void devl_traps_unregister (struct devlink *devlink, +const struct devlink_trap *traps, +size_t traps_count);void devlink_traps_unregister (struct devlink *devlink,const struct devlink_trap *traps,size_t traps_count);
@@ -1755,17 +1761,31 @@ void devlink_trap_report(struct devlink *devlink, struct sk_buff *skb, void *trap_ctx, struct devlink_port *in_devlink_port, const struct flow_action_cookie *fa_cookie);void *devlink_trap_ctx_priv (void *trap_ctx); +int devl_trap_groups_register (struct devlink *devlink, +const struct devlink_trap_group *groups, +size_t groups_count);int devlink_trap_groups_register (struct devlink *devlink,const struct devlink_trap_group *groups,size_t groups_count); +void devl_trap_groups_unregister (struct devlink *devlink, +const struct devlink_trap_group *groups, +size_t groups_count);void devlink_trap_groups_unregister (struct devlink *devlink,const struct devlink_trap_group *groups,size_t groups_count);int +devl_trap_policers_register (struct devlink *devlink, +const struct devlink_trap_policer *policers, +size_t policers_count); +int devlink_trap_policers_register (struct devlink *devlink,const struct devlink_trap_policer *policers,size_t policers_count);void +devl_trap_policers_unregister (struct devlink *devlink, +const struct devlink_trap_policer *policers, +size_t policers_count); +void devlink_trap_policers_unregister (struct devlink *devlink,const struct devlink_trap_policer *policers,size_t policers_count);
net/core/devlink.c +148 -32
316 lines not on this page · raw message
Signature · 1 line
2.35.3
Jiri Pirko
maintainerRFC PATCH v2 3/9 net: devlink: add unlocked variants of devlink_resource*() functions
In reply to Jiri PirkoFrom: Jiri Pirko <[email protected]>
Add unlocked variants of devlink_resource*() functions to be used in drivers called-in with devlink->lock held.
--- include/net/devlink.h | 17 ++++ net/core/devlink.c | 217 ++++++++++++++++++++++++++++++------------ 2 files changed, 173 insertions(+), 61 deletions(-)
include/net/devlink.h +17 -0
@@ -1608,23 +1608,40 @@ extern struct devlink_dpipe_header devlink_dpipe_header_ethernet;extern struct devlink_dpipe_header devlink_dpipe_header_ipv4;extern struct devlink_dpipe_header devlink_dpipe_header_ipv6; +int devl_resource_register (struct devlink *devlink, +const char *resource_name, +u64 resource_size, +u64 resource_id, +u64 parent_resource_id, +const struct devlink_resource_size_params *size_params);int devlink_resource_register (struct devlink *devlink,const char *resource_name,u64 resource_size,u64 resource_id,u64 parent_resource_id,const struct devlink_resource_size_params *size_params); +void devl_resources_unregister (struct devlink *devlink);void devlink_resources_unregister (struct devlink *devlink); +int devl_resource_size_get (struct devlink *devlink, +u64 resource_id, +u64 *p_resource_size);int devlink_resource_size_get (struct devlink *devlink,u64 resource_id,u64 *p_resource_size);int devlink_dpipe_table_resource_set (struct devlink *devlink,const char *table_name,u64 resource_id,u64 resource_units); +void devl_resource_occ_get_register (struct devlink *devlink, +u64 resource_id, +devlink_resource_occ_get_t *occ_get, +void *occ_get_priv);void devlink_resource_occ_get_register (struct devlink *devlink,u64 resource_id,devlink_resource_occ_get_t *occ_get,void *occ_get_priv); +void devl_resource_occ_get_unregister (struct devlink *devlink, +u64 resource_id); +void devlink_resource_occ_get_unregister (struct devlink *devlink,u64 resource_id); int devlink_params_register(struct devlink *devlink,
net/core/devlink.c +156 -61
318 lines not on this page · raw message
Signature · 1 line
2.35.3
Jiri Pirko
maintainerRFC PATCH v2 4/9 net: devlink: add unlocked variants of devlink_sb*() functions
In reply to Jiri PirkoFrom: Jiri Pirko <[email protected]>
Add unlocked variants of devlink_sb*() functions to be used in drivers called-in with devlink->lock held.
--- include/net/devlink.h | 5 ++++ net/core/devlink.c | 54 ++++++++++++++++++++++++++++--------------- 2 files changed, 41 insertions(+), 18 deletions(-)
include/net/devlink.h +5 -0
@@ -1579,10 +1579,15 @@ void devlink_linecard_provision_clear(struct devlink_linecard *linecard);void devlink_linecard_provision_fail (struct devlink_linecard *linecard);void devlink_linecard_activate (struct devlink_linecard *linecard);void devlink_linecard_deactivate (struct devlink_linecard *linecard); +int devl_sb_register (struct devlink *devlink,unsigned int sb_index, +u32 size,u16 ingress_pools_count, +u16 egress_pools_count,u16 ingress_tc_count, +u16 egress_tc_count);int devlink_sb_register (struct devlink *devlink,unsigned int sb_index,u32 size,u16 ingress_pools_count,u16 egress_pools_count,u16 ingress_tc_count,u16 egress_tc_count); +void devl_sb_unregister (struct devlink *devlink,unsigned int sb_index);void devlink_sb_unregister (struct devlink *devlink,unsigned int sb_index); int devlink_dpipe_table_register(struct devlink *devlink, const char *table_name,
net/core/devlink.c +36 -18
84 lines not on this page · raw message
Signature · 1 line
2.35.3
Jiri Pirko
maintainerRFC PATCH v2 5/9 net: devlink: add unlocked variants of devlink_dpipe*() functions
In reply to Jiri PirkoFrom: Jiri Pirko <[email protected]>
Add unlocked variants of devlink_dpipe*() functions to be used in drivers called-in with devlink->lock held.
--- include/net/devlink.h | 12 +++ net/core/devlink.c | 181 +++++++++++++++++++++++++++++++----------- 2 files changed, 147 insertions(+), 46 deletions(-)
include/net/devlink.h +12 -0
@@ -1589,14 +1589,23 @@ int devlink_sb_register(struct devlink *devlink, unsigned int sb_index, u16 egress_tc_count);void devl_sb_unregister (struct devlink *devlink,unsigned int sb_index);void devlink_sb_unregister (struct devlink *devlink,unsigned int sb_index); +int devl_dpipe_table_register (struct devlink *devlink, +const char *table_name, +struct devlink_dpipe_table_ops *table_ops, +void *priv,bool counter_control_extern);int devlink_dpipe_table_register (struct devlink *devlink,const char *table_name,struct devlink_dpipe_table_ops *table_ops,void *priv,bool counter_control_extern); +void devl_dpipe_table_unregister (struct devlink *devlink, +const char *table_name);void devlink_dpipe_table_unregister (struct devlink *devlink,const char *table_name); +void devl_dpipe_headers_register (struct devlink *devlink, +struct devlink_dpipe_headers *dpipe_headers);void devlink_dpipe_headers_register (struct devlink *devlink,struct devlink_dpipe_headers *dpipe_headers); +void devl_dpipe_headers_unregister (struct devlink *devlink);void devlink_dpipe_headers_unregister (struct devlink *devlink);bool devlink_dpipe_table_counter_enabled (struct devlink *devlink,const char *table_name);
@@ -1633,6 +1642,9 @@ int devl_resource_size_get(struct devlink *devlink,int devlink_resource_size_get (struct devlink *devlink,u64 resource_id,u64 *p_resource_size); +int devl_dpipe_table_resource_set (struct devlink *devlink, +const char *table_name,u64 resource_id, +u64 resource_units);int devlink_dpipe_table_resource_set (struct devlink *devlink,const char *table_name,u64 resource_id,u64 resource_units);
net/core/devlink.c +135 -46
270 lines not on this page · raw message
Signature · 1 line
2.35.3
Jiri Pirko
maintainerRFC PATCH v2 6/9 mlxsw: convert driver to use unlocked devlink API during init/fini
In reply to Jiri PirkoFrom: Jiri Pirko <[email protected]>
Prepare for devlink reload being called with devlink->lock held and convert the mlxsw driver to use unlocked devlink API during init and fini flows. Take devl_lock() in reload_down() and reload_up() ops in the meantime before reload cmd is converted to take the lock itself.
---RFC->RFCv2:
- narrowed devl_lock() in reload_down/up() only around mlxsw_core_bus_device_register/unregister()
- do devlink_register/unregister without holding devl_lock
--- drivers/net/ethernet/mellanox/mlxsw/core.c | 53 +++++---- .../net/ethernet/mellanox/mlxsw/spectrum.c | 103 ++++++++---------- .../ethernet/mellanox/mlxsw/spectrum1_kvdl.c | 82 +++++++------- .../mellanox/mlxsw/spectrum_buffers.c | 14 +-- .../ethernet/mellanox/mlxsw/spectrum_cnt.c | 62 +++++------ .../ethernet/mellanox/mlxsw/spectrum_dpipe.c | 88 +++++++-------- .../mellanox/mlxsw/spectrum_policer.c | 32 +++--- .../ethernet/mellanox/mlxsw/spectrum_router.c | 22 ++-- .../ethernet/mellanox/mlxsw/spectrum_span.c | 6 +- .../ethernet/mellanox/mlxsw/spectrum_trap.c | 27 +++-- 10 files changed, 248 insertions(+), 241 deletions(-)
drivers/net/ethernet/mellanox/mlxsw/core.c +34 -19
@@ -127,11 +127,11 @@ static int mlxsw_core_resources_ports_register(struct mlxsw_core *mlxsw_core) max_ports,1 , DEVLINK_RESOURCE_UNIT_ENTRY); -return devlink_resource_register (devlink, -DEVLINK_RESOURCE_GENERIC_NAME_PORTS , - max_ports,MLXSW_CORE_RESOURCE_PORTS , -DEVLINK_RESOURCE_ID_PARENT_TOP , - &ports_num_params); +return devl_resource_register (devlink, +DEVLINK_RESOURCE_GENERIC_NAME_PORTS , + max_ports,MLXSW_CORE_RESOURCE_PORTS , +DEVLINK_RESOURCE_ID_PARENT_TOP , + &ports_num_params); }static int mlxsw_ports_init (struct mlxsw_core *mlxsw_core,bool reload)
@@ -157,8 +157,8 @@ static int mlxsw_ports_init(struct mlxsw_core *mlxsw_core, bool reload) goto err_resources_ports_register; }atomic_set (&mlxsw_core->active_ports_count,0 ); -devlink_resource_occ_get_register (devlink,MLXSW_CORE_RESOURCE_PORTS , - mlxsw_ports_occ_get, mlxsw_core); +devl_resource_occ_get_register (devlink,MLXSW_CORE_RESOURCE_PORTS , + mlxsw_ports_occ_get, mlxsw_core);return 0 ;
@@ -171,9 +171,9 @@ static void mlxsw_ports_fini(struct mlxsw_core *mlxsw_core, bool reload) {struct devlink *devlink =priv_to_devlink (mlxsw_core); -devlink_resource_occ_get_unregister (devlink,MLXSW_CORE_RESOURCE_PORTS ); +devl_resource_occ_get_unregister (devlink,MLXSW_CORE_RESOURCE_PORTS );if (!reload) -devlink_resources_unregister (priv_to_devlink (mlxsw_core)); +devl_resources_unregister (priv_to_devlink (mlxsw_core));kfree (mlxsw_core->ports); }
@@ -1488,7 +1488,9 @@ mlxsw_devlink_core_bus_device_reload_down(struct devlink *devlink,if (!(mlxsw_core->bus->features &MLXSW_BUS_F_RESET ))return -EOPNOTSUPP ; +devl_lock (devlink);mlxsw_core_bus_device_unregister (mlxsw_core, true); +devl_unlock (devlink);return 0 ; }
@@ -1498,13 +1500,17 @@ mlxsw_devlink_core_bus_device_reload_up(struct devlink *devlink, enum devlink_re struct netlink_ext_ack *extack) {struct mlxsw_core *mlxsw_core =devlink_priv (devlink); +int err; *actions_performed =BIT (DEVLINK_RELOAD_ACTION_DRIVER_REINIT ) |BIT (DEVLINK_RELOAD_ACTION_FW_ACTIVATE ); -return mlxsw_core_bus_device_register (mlxsw_core->bus_info, - mlxsw_core->bus, - mlxsw_core->bus_priv, true, - devlink, extack); +devl_lock (devlink); + err =mlxsw_core_bus_device_register (mlxsw_core->bus_info, + mlxsw_core->bus, + mlxsw_core->bus_priv, true, + devlink, extack); +devl_unlock (devlink); +return err; } static int mlxsw_devlink_flash_update(struct devlink *devlink,
@@ -2102,6 +2108,7 @@ __mlxsw_core_bus_device_register(const struct mlxsw_bus_info *mlxsw_bus_info, err = -ENOMEM ; goto err_devlink_alloc; } +devl_lock (devlink); } mlxsw_core =devlink_priv (devlink);
@@ -2187,6 +2194,7 @@ __mlxsw_core_bus_device_register(const struct mlxsw_bus_info *mlxsw_bus_info,if (!reload) {devlink_set_features (devlink,DEVLINK_F_RELOAD ); +devl_unlock (devlink);devlink_register (devlink); }return 0 ;
@@ -2214,12 +2222,14 @@ __mlxsw_core_bus_device_register(const struct mlxsw_bus_info *mlxsw_bus_info,mlxsw_ports_fini (mlxsw_core, reload); err_ports_init:if (!reload) -devlink_resources_unregister (devlink); +devl_resources_unregister (devlink); err_register_resources: mlxsw_bus->fini (bus_priv); err_bus_init: -if (!reload) +if (!reload) { +devl_unlock (devlink);devlink_free (devlink); + } err_devlink_alloc:return err; }
@@ -2255,8 +2265,10 @@ void mlxsw_core_bus_device_unregister(struct mlxsw_core *mlxsw_core, {struct devlink *devlink =priv_to_devlink (mlxsw_core); -if (!reload) +if (!reload) {devlink_unregister (devlink); +devl_lock (devlink); + }if (devlink_is_reload_failed (devlink)) {if (!reload)
@@ -2281,17 +2293,20 @@ void mlxsw_core_bus_device_unregister(struct mlxsw_core *mlxsw_core,kfree (mlxsw_core->lag.mapping);mlxsw_ports_fini (mlxsw_core, reload);if (!reload) -devlink_resources_unregister (devlink); +devl_resources_unregister (devlink); mlxsw_core->bus->fini (mlxsw_core->bus_priv); -if (!reload) +if (!reload) {devlink_free (devlink); +devl_unlock (devlink); + }return ; reload_fail_deinit:mlxsw_core_params_unregister (mlxsw_core); -devlink_resources_unregister (devlink); +devl_resources_unregister (devlink);devlink_free (devlink); +devl_unlock (devlink); }EXPORT_SYMBOL (mlxsw_core_bus_device_unregister);
drivers/net/ethernet/mellanox/mlxsw/spectrum.c +48 -55
214 lines not on this page · raw message
drivers/net/ethernet/mellanox/mlxsw/spectrum1_kvdl.c +41 -41
117 lines not on this page · raw message
drivers/net/ethernet/mellanox/mlxsw/spectrum_buffers.c +7 -7
@@ -1290,12 +1290,12 @@ int mlxsw_sp_buffers_init(struct mlxsw_sp *mlxsw_sp)if (err) goto err_sb_mms_init;mlxsw_sp_pool_count (mlxsw_sp, &ing_pool_count, &eg_pool_count); - err =devlink_sb_register (priv_to_devlink (mlxsw_sp->core),0 , - mlxsw_sp->sb->sb_size, - ing_pool_count, - eg_pool_count, -MLXSW_SP_SB_ING_TC_COUNT , -MLXSW_SP_SB_EG_TC_COUNT ); + err =devl_sb_register (priv_to_devlink (mlxsw_sp->core),0 , + mlxsw_sp->sb->sb_size, + ing_pool_count, + eg_pool_count, +MLXSW_SP_SB_ING_TC_COUNT , +MLXSW_SP_SB_EG_TC_COUNT );if (err) goto err_devlink_sb_register;
@@ -1314,7 +1314,7 @@ int mlxsw_sp_buffers_init(struct mlxsw_sp *mlxsw_sp)void mlxsw_sp_buffers_fini (struct mlxsw_sp *mlxsw_sp) { -devlink_sb_unregister (priv_to_devlink (mlxsw_sp->core),0 ); +devl_sb_unregister (priv_to_devlink (mlxsw_sp->core),0 );mlxsw_sp_sb_ports_fini (mlxsw_sp);kfree (mlxsw_sp->sb); }
drivers/net/ethernet/mellanox/mlxsw/spectrum_cnt.c +31 -31
115 lines not on this page · raw message
drivers/net/ethernet/mellanox/mlxsw/spectrum_dpipe.c +44 -44
179 lines not on this page · raw message
drivers/net/ethernet/mellanox/mlxsw/spectrum_policer.c +16 -16
@@ -94,10 +94,10 @@ mlxsw_sp_policer_single_rate_family_init(struct mlxsw_sp_policer_family *family)atomic_set (&family->policers_count,0 ); devlink =priv_to_devlink (core); -devlink_resource_occ_get_register (devlink, -MLXSW_SP_RESOURCE_SINGLE_RATE_POLICERS , - mlxsw_sp_policer_single_rate_occ_get, - family); +devl_resource_occ_get_register (devlink, +MLXSW_SP_RESOURCE_SINGLE_RATE_POLICERS , + mlxsw_sp_policer_single_rate_occ_get, + family);return 0 ; }
@@ -107,8 +107,8 @@ mlxsw_sp_policer_single_rate_family_fini(struct mlxsw_sp_policer_family *family) {struct devlink *devlink =priv_to_devlink (family->mlxsw_sp->core); -devlink_resource_occ_get_unregister (devlink, -MLXSW_SP_RESOURCE_SINGLE_RATE_POLICERS ); +devl_resource_occ_get_unregister (devlink, +MLXSW_SP_RESOURCE_SINGLE_RATE_POLICERS );WARN_ON (atomic_read (&family->policers_count) !=0 ); }
@@ -419,22 +419,22 @@ int mlxsw_sp_policer_resources_register(struct mlxsw_core *mlxsw_core)devlink_resource_size_params_init (&size_params, global_policers, global_policers,1 ,DEVLINK_RESOURCE_UNIT_ENTRY ); - err =devlink_resource_register (devlink,"global_policers" , - global_policers, -MLXSW_SP_RESOURCE_GLOBAL_POLICERS , -DEVLINK_RESOURCE_ID_PARENT_TOP , - &size_params); + err =devl_resource_register (devlink,"global_policers" , + global_policers, +MLXSW_SP_RESOURCE_GLOBAL_POLICERS , +DEVLINK_RESOURCE_ID_PARENT_TOP , + &size_params);if (err)return err;devlink_resource_size_params_init (&size_params, single_rate_policers, single_rate_policers,1 ,DEVLINK_RESOURCE_UNIT_ENTRY ); - err =devlink_resource_register (devlink,"single_rate_policers" , - single_rate_policers, -MLXSW_SP_RESOURCE_SINGLE_RATE_POLICERS , -MLXSW_SP_RESOURCE_GLOBAL_POLICERS , - &size_params); + err =devl_resource_register (devlink,"single_rate_policers" , + single_rate_policers, +MLXSW_SP_RESOURCE_SINGLE_RATE_POLICERS , +MLXSW_SP_RESOURCE_GLOBAL_POLICERS , + &size_params);if (err)return err;
drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c +11 -11
@@ -9962,14 +9962,14 @@ static int mlxsw_sp_rifs_init(struct mlxsw_sp *mlxsw_sp)idr_init (&mlxsw_sp->router->rif_mac_profiles_idr);atomic_set (&mlxsw_sp->router->rif_mac_profiles_count,0 );atomic_set (&mlxsw_sp->router->rifs_count,0 ); -devlink_resource_occ_get_register (devlink, -MLXSW_SP_RESOURCE_RIF_MAC_PROFILES , - mlxsw_sp_rif_mac_profiles_occ_get, - mlxsw_sp); -devlink_resource_occ_get_register (devlink, -MLXSW_SP_RESOURCE_RIFS , - mlxsw_sp_rifs_occ_get, - mlxsw_sp); +devl_resource_occ_get_register (devlink, +MLXSW_SP_RESOURCE_RIF_MAC_PROFILES , + mlxsw_sp_rif_mac_profiles_occ_get, + mlxsw_sp); +devl_resource_occ_get_register (devlink, +MLXSW_SP_RESOURCE_RIFS , + mlxsw_sp_rifs_occ_get, + mlxsw_sp);return 0 ; }
@@ -9983,9 +9983,9 @@ static void mlxsw_sp_rifs_fini(struct mlxsw_sp *mlxsw_sp)for (i =0 ; i <MLXSW_CORE_RES_GET (mlxsw_sp->core,MAX_RIFS ); i++)WARN_ON_ONCE (mlxsw_sp->router->rifs[i]); -devlink_resource_occ_get_unregister (devlink,MLXSW_SP_RESOURCE_RIFS ); -devlink_resource_occ_get_unregister (devlink, -MLXSW_SP_RESOURCE_RIF_MAC_PROFILES ); +devl_resource_occ_get_unregister (devlink,MLXSW_SP_RESOURCE_RIFS ); +devl_resource_occ_get_unregister (devlink, +MLXSW_SP_RESOURCE_RIF_MAC_PROFILES );WARN_ON (!idr_is_empty (&mlxsw_sp->router->rif_mac_profiles_idr));idr_destroy (&mlxsw_sp->router->rif_mac_profiles_idr);kfree (mlxsw_sp->router->rifs);
drivers/net/ethernet/mellanox/mlxsw/spectrum_span.c +3 -3
@@ -106,8 +106,8 @@ int mlxsw_sp_span_init(struct mlxsw_sp *mlxsw_sp)if (err) goto err_init; -devlink_resource_occ_get_register (devlink,MLXSW_SP_RESOURCE_SPAN , - mlxsw_sp_span_occ_get, mlxsw_sp); +devl_resource_occ_get_register (devlink,MLXSW_SP_RESOURCE_SPAN , + mlxsw_sp_span_occ_get, mlxsw_sp);INIT_WORK (&span->work, mlxsw_sp_span_respin_work);return 0 ;
@@ -123,7 +123,7 @@ void mlxsw_sp_span_fini(struct mlxsw_sp *mlxsw_sp)struct devlink *devlink =priv_to_devlink (mlxsw_sp->core);cancel_work_sync (&mlxsw_sp->span->work); -devlink_resource_occ_get_unregister (devlink,MLXSW_SP_RESOURCE_SPAN ); +devl_resource_occ_get_unregister (devlink,MLXSW_SP_RESOURCE_SPAN );WARN_ON_ONCE (!list_empty (&mlxsw_sp->span->trigger_entries_list));WARN_ON_ONCE (!list_empty (&mlxsw_sp->span->analyzed_ports_list));
drivers/net/ethernet/mellanox/mlxsw/spectrum_trap.c +13 -14
@@ -1298,8 +1298,8 @@ static int mlxsw_sp_trap_policers_init(struct mlxsw_sp *mlxsw_sp)for (i =0 ; i < trap->policers_count; i++) { policer_item = &trap->policer_items_arr[i]; - err =devlink_trap_policers_register (devlink, - &policer_item->policer,1 ); + err =devl_trap_policers_register (devlink, + &policer_item->policer,1 );if (err) goto err_trap_policer_register; }
@@ -1309,8 +1309,8 @@ static int mlxsw_sp_trap_policers_init(struct mlxsw_sp *mlxsw_sp) err_trap_policer_register:for (i--; i >=0 ; i--) { policer_item = &trap->policer_items_arr[i]; -devlink_trap_policers_unregister (devlink, - &policer_item->policer,1 ); +devl_trap_policers_unregister (devlink, + &policer_item->policer,1 ); }mlxsw_sp_trap_policer_items_arr_fini (mlxsw_sp);return err;
@@ -1325,8 +1325,8 @@ static void mlxsw_sp_trap_policers_fini(struct mlxsw_sp *mlxsw_sp)for (i = trap->policers_count -1 ; i >=0 ; i--) { policer_item = &trap->policer_items_arr[i]; -devlink_trap_policers_unregister (devlink, - &policer_item->policer,1 ); +devl_trap_policers_unregister (devlink, + &policer_item->policer,1 ); }mlxsw_sp_trap_policer_items_arr_fini (mlxsw_sp); }
@@ -1381,8 +1381,7 @@ static int mlxsw_sp_trap_groups_init(struct mlxsw_sp *mlxsw_sp)for (i =0 ; i < trap->groups_count; i++) { group_item = &trap->group_items_arr[i]; - err =devlink_trap_groups_register (devlink, &group_item->group, -1 ); + err =devl_trap_groups_register (devlink, &group_item->group,1 );if (err) goto err_trap_group_register; }
@@ -1392,7 +1391,7 @@ static int mlxsw_sp_trap_groups_init(struct mlxsw_sp *mlxsw_sp) err_trap_group_register:for (i--; i >=0 ; i--) { group_item = &trap->group_items_arr[i]; -devlink_trap_groups_unregister (devlink, &group_item->group,1 ); +devl_trap_groups_unregister (devlink, &group_item->group,1 ); }mlxsw_sp_trap_group_items_arr_fini (mlxsw_sp);return err;
@@ -1408,7 +1407,7 @@ static void mlxsw_sp_trap_groups_fini(struct mlxsw_sp *mlxsw_sp)const struct mlxsw_sp_trap_group_item *group_item; group_item = &trap->group_items_arr[i]; -devlink_trap_groups_unregister (devlink, &group_item->group,1 ); +devl_trap_groups_unregister (devlink, &group_item->group,1 ); }mlxsw_sp_trap_group_items_arr_fini (mlxsw_sp); }
@@ -1469,8 +1468,8 @@ static int mlxsw_sp_traps_init(struct mlxsw_sp *mlxsw_sp)for (i =0 ; i < trap->traps_count; i++) { trap_item = &trap->trap_items_arr[i]; - err =devlink_traps_register (devlink, &trap_item->trap,1 , - mlxsw_sp); + err =devl_traps_register (devlink, &trap_item->trap,1 , + mlxsw_sp);if (err) goto err_trap_register; }
@@ -1480,7 +1479,7 @@ static int mlxsw_sp_traps_init(struct mlxsw_sp *mlxsw_sp) err_trap_register:for (i--; i >=0 ; i--) { trap_item = &trap->trap_items_arr[i]; -devlink_traps_unregister (devlink, &trap_item->trap,1 ); +devl_traps_unregister (devlink, &trap_item->trap,1 ); }mlxsw_sp_trap_items_arr_fini (mlxsw_sp);return err;
@@ -1496,7 +1495,7 @@ static void mlxsw_sp_traps_fini(struct mlxsw_sp *mlxsw_sp)const struct mlxsw_sp_trap_item *trap_item; trap_item = &trap->trap_items_arr[i]; -devlink_traps_unregister (devlink, &trap_item->trap,1 ); +devl_traps_unregister (devlink, &trap_item->trap,1 ); }mlxsw_sp_trap_items_arr_fini (mlxsw_sp); }
Signature · 1 line
2.35.3
Jiri Pirko
maintainerRFC PATCH v2 7/9 net: devlink: add unlocked variants of devlink_region_create/destroy() functions
In reply to Jiri PirkoFrom: Jiri Pirko <[email protected]>
Add unlocked variants of devlink_region_create/destroy() functions to be used in drivers called-in with devlink->lock held.
--- include/net/devlink.h | 5 +++ net/core/devlink.c | 89 +++++++++++++++++++++++++++++-------------- 2 files changed, 66 insertions(+), 28 deletions(-)
include/net/devlink.h +5 -0
@@ -1676,6 +1676,10 @@ int devlink_param_driverinit_value_get(struct devlink *devlink, u32 param_id,int devlink_param_driverinit_value_set (struct devlink *devlink,u32 param_id,union devlink_param_value init_val);void devlink_param_value_changed (struct devlink *devlink,u32 param_id); +struct devlink_region *devl_region_create (struct devlink *devlink, +const struct devlink_region_ops *ops, +u32 region_max_snapshots, +u64 region_size);struct devlink_region * devlink_region_create(struct devlink *devlink, const struct devlink_region_ops *ops,
@@ -1684,6 +1688,7 @@ struct devlink_region * devlink_port_region_create(struct devlink_port *port, const struct devlink_port_region_ops *ops, u32 region_max_snapshots, u64 region_size); +void devl_region_destroy (struct devlink_region *region);void devlink_region_destroy (struct devlink_region *region);void devlink_port_region_destroy (struct devlink_region *region);
net/core/devlink.c +61 -28
140 lines not on this page · raw message
Signature · 1 line
2.35.3
Jiri Pirko
maintainerRFC PATCH v2 8/9 netdevsim: convert driver to use unlocked devlink API during init/fini
In reply to Jiri PirkoFrom: Jiri Pirko <[email protected]>
Prepare for devlink reload being called with devlink->lock held and convert the netdevsim driver to use unlocked devlink API during init and fini flows. Take devl_lock() in reload_down() and reload_up() ops in the meantime before reload cmd is converted to take the lock itself.
---RFC->RFCv2:
- do devlink_register/unregister without holding devl_lock
--- drivers/net/netdevsim/bus.c | 19 ----- drivers/net/netdevsim/dev.c | 134 ++++++++++++++---------------- drivers/net/netdevsim/fib.c | 62 +++++++------- drivers/net/netdevsim/netdevsim.h | 3 - include/net/devlink.h | 1 + net/core/devlink.c | 6 ++ 6 files changed, 102 insertions(+), 123 deletions(-)
drivers/net/netdevsim/bus.c +0 -19
@@ -72,16 +72,7 @@ new_port_store(struct device *dev, struct device_attribute *attr,if (ret)return ret; -if (!mutex_trylock (&nsim_bus_dev->nsim_bus_reload_lock)) -return -EBUSY ; - -if (nsim_bus_dev->in_reload) { -mutex_unlock (&nsim_bus_dev->nsim_bus_reload_lock); -return -EBUSY ; - } - ret =nsim_drv_port_add (nsim_bus_dev,NSIM_DEV_PORT_TYPE_PF , port_index); -mutex_unlock (&nsim_bus_dev->nsim_bus_reload_lock);return ret ? ret : count; }
@@ -102,16 +93,7 @@ del_port_store(struct device *dev, struct device_attribute *attr,if (ret)return ret; -if (!mutex_trylock (&nsim_bus_dev->nsim_bus_reload_lock)) -return -EBUSY ; - -if (nsim_bus_dev->in_reload) { -mutex_unlock (&nsim_bus_dev->nsim_bus_reload_lock); -return -EBUSY ; - } - ret =nsim_drv_port_del (nsim_bus_dev,NSIM_DEV_PORT_TYPE_PF , port_index); -mutex_unlock (&nsim_bus_dev->nsim_bus_reload_lock);return ret ? ret : count; }
@@ -298,7 +280,6 @@ nsim_bus_dev_new(unsigned int id, unsigned int port_count, unsigned int num_queu nsim_bus_dev->num_queues = num_queues; nsim_bus_dev->initial_net = current->nsproxy->net_ns; nsim_bus_dev->max_vfs =NSIM_BUS_DEV_MAX_VFS ; -mutex_init (&nsim_bus_dev->nsim_bus_reload_lock);/* Disallow using nsim_bus_dev */ smp_store_release (&nsim_bus_dev->init, false);
drivers/net/netdevsim/dev.c +64 -70
314 lines not on this page · raw message
drivers/net/netdevsim/fib.c +31 -31
80 lines not on this page · raw message
drivers/net/netdevsim/netdevsim.h +0 -3
@@ -376,9 +376,6 @@ struct nsim_bus_dev {*/ unsigned int max_vfs;unsigned int num_vfs; -/* Lock for devlink->reload_enabled in netdevsim module */ -struct mutex nsim_bus_reload_lock; -bool in_reload;bool init; };
include/net/devlink.h +1 -0
@@ -1517,6 +1517,7 @@ struct device *devlink_to_dev(const struct devlink *devlink);/* Devlink instance explicit locking */ void devl_lock (struct devlink *devlink); +int devl_trylock (struct devlink *devlink);void devl_unlock (struct devlink *devlink);void devl_assert_locked (struct devlink *devlink);bool devl_lock_is_held (struct devlink *devlink);
net/core/devlink.c +6 -0
@@ -266,6 +266,12 @@ void devl_lock(struct devlink *devlink) }EXPORT_SYMBOL_GPL (devl_lock); +int devl_trylock (struct devlink *devlink) +{ +return mutex_trylock (&devlink->lock); +} +EXPORT_SYMBOL_GPL (devl_trylock); +void devl_unlock (struct devlink *devlink) {mutex_unlock (&devlink->lock);
Signature · 1 line
2.35.3
Jiri Pirko
maintainerRFC PATCH v2 9/9 net: devlink: remove unused locked functions
In reply to Jiri PirkoFrom: Jiri Pirko <[email protected]>
Remove locked versions of functions that are no longer used by anyone.
--- include/net/devlink.h | 20 ----- net/core/devlink.c | 168 ------------------------------------------ 2 files changed, 188 deletions(-)
include/net/devlink.h +0 -20
@@ -1594,20 +1594,11 @@ int devl_dpipe_table_register(struct devlink *devlink,const char *table_name, struct devlink_dpipe_table_ops *table_ops, void *priv, bool counter_control_extern); -int devlink_dpipe_table_register (struct devlink *devlink, -const char *table_name, -struct devlink_dpipe_table_ops *table_ops, -void *priv,bool counter_control_extern);void devl_dpipe_table_unregister (struct devlink *devlink,const char *table_name); -void devlink_dpipe_table_unregister (struct devlink *devlink, -const char *table_name);void devl_dpipe_headers_register (struct devlink *devlink,struct devlink_dpipe_headers *dpipe_headers); -void devlink_dpipe_headers_register (struct devlink *devlink, -struct devlink_dpipe_headers *dpipe_headers);void devl_dpipe_headers_unregister (struct devlink *devlink); -void devlink_dpipe_headers_unregister (struct devlink *devlink);bool devlink_dpipe_table_counter_enabled (struct devlink *devlink,const char *table_name);int devlink_dpipe_entry_ctx_prepare (struct devlink_dpipe_dump_ctx *dump_ctx);
@@ -1640,9 +1631,6 @@ void devlink_resources_unregister(struct devlink *devlink);int devl_resource_size_get (struct devlink *devlink,u64 resource_id,u64 *p_resource_size); -int devlink_resource_size_get (struct devlink *devlink, -u64 resource_id, -u64 *p_resource_size);int devl_dpipe_table_resource_set (struct devlink *devlink,const char *table_name,u64 resource_id,u64 resource_units);
@@ -1817,18 +1805,10 @@ int devl_trap_policers_register(struct devlink *devlink, const struct devlink_trap_policer *policers, size_t policers_count); -int -devlink_trap_policers_register (struct devlink *devlink, -const struct devlink_trap_policer *policers, -size_t policers_count);void devl_trap_policers_unregister (struct devlink *devlink,const struct devlink_trap_policer *policers,size_t policers_count); -void -devlink_trap_policers_unregister (struct devlink *devlink, -const struct devlink_trap_policer *policers, -size_t policers_count);#if IS_ENABLED (CONFIG_NET_DEVLINK )
net/core/devlink.c +0 -168
216 lines not on this page · raw message
Signature · 1 line
2.35.3