devlink: hold the instance lock in eswitch callbacks
Subsystems (7)
Jakub Kicinski
maintainerv2 cover devlink: hold the instance lock in eswitch callbacks
Series number 2 in the effort to hold the devlink instance lock in call driver callbacks. We have the following drivers using this API:
- bnxt, nfp, netdevsim - their own locking is removed / simplified by this series; all of them needed a lock to protect from changes to the number of VFs while switching modes, now the VF config bus callback takes the devlink instance lock via devl_lock();
- ice - appears not to allow changing modes while SR-IOV enabled, so nothing to do there;
- liquidio - does not contain any locking;
- octeontx2/af - is very special but at least doesn't have locking so doesn't get in the way either;
- mlx5 has a wealth of locks - I chickened out and dropped the lock in the callbacks so that I can leave the driver be, for now.
The last one is obviously not ideal, but I would prefer to transition the API already as it make take longer.
v2: use a wrapper in mlx5 and extend the comment
Jakub Kicinski (5):
bnxt: use the devlink instance lock to protect sriov
devlink: add explicitly locked flavor of the rate node APIs
netdevsim: replace port_list_lock with devlink instance lock
netdevsim: replace vfs_lock with devlink instance lock
devlink: hold the instance lock during eswitch_mode callbacks
drivers/net/ethernet/broadcom/bnxt/bnxt.c | 1 - drivers/net/ethernet/broadcom/bnxt/bnxt.h | 6 -- .../net/ethernet/broadcom/bnxt/bnxt_sriov.c | 4 +- drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c | 22 ++--- .../mellanox/mlx5/core/eswitch_offloads.c | 54 ++++++++--- .../net/ethernet/netronome/nfp/nfp_devlink.c | 7 +- drivers/net/netdevsim/dev.c | 85 +++++++++--------- drivers/net/netdevsim/netdevsim.h | 2 - include/net/devlink.h | 4 + net/core/devlink.c | 90 ++++++++++++------- 10 files changed, 156 insertions(+), 119 deletions(-)
Signature · 1 line
2.34.1
Jakub Kicinski
maintainerPATCH v2 1/5 bnxt: use the devlink instance lock to protect sriov
In prep for .eswitch_mode_set being called with the devlink instance lock held use that lock explicitly instead of creating a local mutex just for the sriov reconfig.
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 1 - drivers/net/ethernet/broadcom/bnxt/bnxt.h | 6 ------ drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c | 4 ++-- drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c | 4 ++-- 4 files changed, 4 insertions(+), 11 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +0 -1
@@ -13470,7 +13470,6 @@ static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)#ifdef CONFIG_BNXT_SRIOV init_waitqueue_head (&bp->sriov_cfg_wait); -mutex_init (&bp->sriov_lock);#endif if (BNXT_SUPPORTS_TPA (bp)) { bp->gro_func = bnxt_gro_func_5730x;
drivers/net/ethernet/broadcom/bnxt/bnxt.h +0 -6
@@ -2072,12 +2072,6 @@ struct bnxt {wait_queue_head_t sriov_cfg_wait;bool sriov_cfg;#define BNXT_SRIOV_CFG_WAIT_TMO msecs_to_jiffies(10000) - -/* lock to protect VF-rep creation/cleanup via -* multiple paths such as ->sriov_configure() and -* devlink ->eswitch_mode_set() -*/ -struct mutex sriov_lock;#endif #if BITS_PER_LONG ==32
drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c +2 -2
@@ -846,7 +846,7 @@ void bnxt_sriov_disable(struct bnxt *bp)return ;/* synchronize VF and VF-rep create and destroy */ -mutex_lock (&bp->sriov_lock); +devl_lock (bp->dl);bnxt_vf_reps_destroy (bp);if (pci_vfs_assigned (bp->pdev)) {
@@ -859,7 +859,7 @@ void bnxt_sriov_disable(struct bnxt *bp)/* Free the HW resources reserved for various VF's */ bnxt_hwrm_func_vf_resource_free (bp, num_vfs); } -mutex_unlock (&bp->sriov_lock); +devl_unlock (bp->dl);bnxt_free_vf_resources (bp);
drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c +2 -2
@@ -561,7 +561,7 @@ int bnxt_dl_eswitch_mode_set(struct devlink *devlink, u16 mode,struct bnxt *bp =bnxt_get_bp_from_dl (devlink);int rc =0 ; -mutex_lock (&bp->sriov_lock); +devl_lock (devlink);if (bp->eswitch_mode == mode) { netdev_info(bp->dev, "already in %s eswitch mode\n", mode == DEVLINK_ESWITCH_MODE_LEGACY ?
@@ -595,7 +595,7 @@ int bnxt_dl_eswitch_mode_set(struct devlink *devlink, u16 mode, goto done; } done: -mutex_unlock (&bp->sriov_lock); +devl_unlock (devlink);return rc; }
Signature · 1 line
2.34.1
Jakub Kicinski
maintainerPATCH v2 2/5 devlink: add explicitly locked flavor of the rate node APIs
In reply to Jakub KicinskiWe'll need an explicitly locked rate node API for netdevsim to switch eswitch mode setting to locked.
--- include/net/devlink.h | 4 ++ net/core/devlink.c | 86 ++++++++++++++++++++++++++++++------------- 2 files changed, 65 insertions(+), 25 deletions(-)
include/net/devlink.h +4 -0
@@ -1490,6 +1490,10 @@ int devl_port_register(struct devlink *devlink, unsigned int port_index);void devl_port_unregister (struct devlink_port *devlink_port); +int devl_rate_leaf_create (struct devlink_port *port,void *priv); +void devl_rate_leaf_destroy (struct devlink_port *devlink_port); +void devl_rate_nodes_destroy (struct devlink *devlink); +struct ib_device ;struct net *devlink_net (const struct devlink *devlink);
net/core/devlink.c +61 -25
148 lines not on this page · raw message
Signature · 1 line
2.34.1
Jakub Kicinski
maintainerPATCH v2 3/5 netdevsim: replace port_list_lock with devlink instance lock
In reply to Jakub KicinskiTake advantage of the devlink instance lock for protecting the port list. This will simplify locking even more once all devlink callbacks hold the instance lock.
We need to add locking in nsim_dev_port_add_all() which used to assume higher layer protection when accessing the list.
--- drivers/net/netdevsim/dev.c | 40 +++++++++++++++---------------- drivers/net/netdevsim/netdevsim.h | 1 - 2 files changed, 20 insertions(+), 21 deletions(-)
drivers/net/netdevsim/dev.c +20 -20
@@ -576,11 +576,11 @@ static int nsim_esw_legacy_enable(struct nsim_dev *nsim_dev,struct nsim_dev_port *nsim_dev_port, *tmp;devlink_rate_nodes_destroy (devlink); -mutex_lock (&nsim_dev->port_list_lock); +devl_lock (devlink);list_for_each_entry_safe (nsim_dev_port, tmp, &nsim_dev->port_list, list)if (nsim_dev_port_is_vf (nsim_dev_port))__nsim_dev_port_del (nsim_dev_port); -mutex_unlock (&nsim_dev->port_list_lock); +devl_unlock (devlink); nsim_dev->esw_mode =DEVLINK_ESWITCH_MODE_LEGACY ;return 0 ; }
@@ -835,14 +835,14 @@ static void nsim_dev_trap_report_work(struct work_struct *work)/* For each running port and enabled packet trap, generate a UDP * packet with a random 5-tuple and report it. */ -mutex_lock (&nsim_dev->port_list_lock); +devl_lock (priv_to_devlink (nsim_dev));list_for_each_entry (nsim_dev_port, &nsim_dev->port_list, list) {if (!netif_running (nsim_dev_port->ns->netdev))continue ;nsim_dev_trap_report (nsim_dev_port); } -mutex_unlock (&nsim_dev->port_list_lock); +devl_unlock (priv_to_devlink (nsim_dev));schedule_delayed_work (&nsim_dev->trap_data->trap_report_dw,msecs_to_jiffies (NSIM_TRAP_REPORT_INTERVAL_MS ));
@@ -924,6 +924,7 @@ static void nsim_dev_traps_exit(struct devlink *devlink) {struct nsim_dev *nsim_dev =devlink_priv (devlink); +/* caution, trap work takes devlink lock */ cancel_delayed_work_sync (&nsim_dev->trap_data->trap_report_dw);devlink_traps_unregister (devlink, nsim_traps_arr,ARRAY_SIZE (nsim_traps_arr));
@@ -1380,8 +1381,8 @@ static int __nsim_dev_port_add(struct nsim_dev *nsim_dev, enum nsim_dev_port_typmemcpy (attrs.switch_id.id, nsim_dev->switch_id.id, nsim_dev->switch_id.id_len); attrs.switch_id.id_len = nsim_dev->switch_id.id_len;devlink_port_attrs_set (devlink_port, &attrs); - err =devlink_port_register (priv_to_devlink (nsim_dev), devlink_port, - nsim_dev_port->port_index); + err =devl_port_register (priv_to_devlink (nsim_dev), devlink_port, + nsim_dev_port->port_index);if (err) goto err_port_free;
@@ -1396,8 +1397,8 @@ static int __nsim_dev_port_add(struct nsim_dev *nsim_dev, enum nsim_dev_port_typ }if (nsim_dev_port_is_vf (nsim_dev_port)) { - err =devlink_rate_leaf_create (&nsim_dev_port->devlink_port, - nsim_dev_port); + err =devl_rate_leaf_create (&nsim_dev_port->devlink_port, + nsim_dev_port);if (err) goto err_nsim_destroy; }
@@ -1412,7 +1413,7 @@ static int __nsim_dev_port_add(struct nsim_dev *nsim_dev, enum nsim_dev_port_typ err_port_debugfs_exit:nsim_dev_port_debugfs_exit (nsim_dev_port); err_dl_port_unregister: -devlink_port_unregister (devlink_port); +devl_port_unregister (devlink_port); err_port_free:kfree (nsim_dev_port);return err;
@@ -1424,11 +1425,11 @@ static void __nsim_dev_port_del(struct nsim_dev_port *nsim_dev_port)list_del (&nsim_dev_port->list);if (nsim_dev_port_is_vf (nsim_dev_port)) -devlink_rate_leaf_destroy (&nsim_dev_port->devlink_port); +devl_rate_leaf_destroy (&nsim_dev_port->devlink_port);devlink_port_type_clear (devlink_port);nsim_destroy (nsim_dev_port->ns);nsim_dev_port_debugfs_exit (nsim_dev_port); -devlink_port_unregister (devlink_port); +devl_port_unregister (devlink_port);kfree (nsim_dev_port); }
@@ -1436,11 +1437,11 @@ static void nsim_dev_port_del_all(struct nsim_dev *nsim_dev) {struct nsim_dev_port *nsim_dev_port, *tmp; -mutex_lock (&nsim_dev->port_list_lock); +devl_lock (priv_to_devlink (nsim_dev));list_for_each_entry_safe (nsim_dev_port, tmp, &nsim_dev->port_list, list)__nsim_dev_port_del (nsim_dev_port); -mutex_unlock (&nsim_dev->port_list_lock); +devl_unlock (priv_to_devlink (nsim_dev)); } static int nsim_dev_port_add_all(struct nsim_dev *nsim_dev,
@@ -1449,7 +1450,9 @@ static int nsim_dev_port_add_all(struct nsim_dev *nsim_dev,int i, err;for (i =0 ; i < port_count; i++) { +devl_lock (priv_to_devlink (nsim_dev)); err =__nsim_dev_port_add (nsim_dev,NSIM_DEV_PORT_TYPE_PF , i); +devl_unlock (priv_to_devlink (nsim_dev));if (err) goto err_port_del_all; }
@@ -1470,7 +1473,6 @@ static int nsim_dev_reload_create(struct nsim_dev *nsim_dev, devlink =priv_to_devlink (nsim_dev); nsim_dev =devlink_priv (devlink);INIT_LIST_HEAD (&nsim_dev->port_list); -mutex_init (&nsim_dev->port_list_lock); nsim_dev->fw_update_status = true; nsim_dev->fw_update_overwrite_mask =0 ;
@@ -1544,7 +1546,6 @@ int nsim_drv_probe(struct nsim_bus_dev *nsim_bus_dev)get_random_bytes (nsim_dev->switch_id.id, nsim_dev->switch_id.id_len);INIT_LIST_HEAD (&nsim_dev->port_list);mutex_init (&nsim_dev->vfs_lock); -mutex_init (&nsim_dev->port_list_lock); nsim_dev->fw_update_status = true; nsim_dev->fw_update_overwrite_mask =0 ; nsim_dev->max_macs =NSIM_DEV_MAX_MACS_DEFAULT ;
@@ -1666,7 +1667,6 @@ static void nsim_dev_reload_destroy(struct nsim_dev *nsim_dev)nsim_fib_destroy (devlink, nsim_dev->fib_data);nsim_dev_traps_exit (devlink);nsim_dev_dummy_region_exit (nsim_dev); -mutex_destroy (&nsim_dev->port_list_lock); }void nsim_drv_remove (struct nsim_bus_dev *nsim_bus_dev)
@@ -1706,12 +1706,12 @@ int nsim_drv_port_add(struct nsim_bus_dev *nsim_bus_dev, enum nsim_dev_port_typestruct nsim_dev *nsim_dev =dev_get_drvdata (&nsim_bus_dev->dev);int err; -mutex_lock (&nsim_dev->port_list_lock); +devl_lock (priv_to_devlink (nsim_dev));if (__nsim_dev_port_lookup (nsim_dev, type, port_index)) err = -EEXIST ;else err =__nsim_dev_port_add (nsim_dev, type, port_index); -mutex_unlock (&nsim_dev->port_list_lock); +devl_unlock (priv_to_devlink (nsim_dev));return err; }
@@ -1722,13 +1722,13 @@ int nsim_drv_port_del(struct nsim_bus_dev *nsim_bus_dev, enum nsim_dev_port_typestruct nsim_dev_port *nsim_dev_port;int err =0 ; -mutex_lock (&nsim_dev->port_list_lock); +devl_lock (priv_to_devlink (nsim_dev)); nsim_dev_port =__nsim_dev_port_lookup (nsim_dev, type, port_index);if (!nsim_dev_port) err = -ENOENT ;else __nsim_dev_port_del (nsim_dev_port); -mutex_unlock (&nsim_dev->port_list_lock); +devl_unlock (priv_to_devlink (nsim_dev));return err; }
drivers/net/netdevsim/netdevsim.h +0 -1
@@ -274,7 +274,6 @@ struct nsim_dev {struct list_head bpf_bound_maps;struct netdev_phys_item_id switch_id;struct list_head port_list; -struct mutex port_list_lock;/* protects port list */ bool fw_update_status;u32 fw_update_overwrite_mask;u32 max_macs;
Signature · 1 line
2.34.1
Jakub Kicinski
maintainerPATCH v2 4/5 netdevsim: replace vfs_lock with devlink instance lock
In reply to Jakub KicinskiSimilarly to the previous commit, use the devlink instance lock and let it replace the vfs_lock.
nsim_esw_legacy_enable() was locked by both port lock and vfs lock so one set of lock/unlocks goes away.
netdevsim's .eswitch_mode_set callback is now ready for the callback to take the instance lock.
--- drivers/net/netdevsim/dev.c | 37 +++++++++++++++++-------------- drivers/net/netdevsim/netdevsim.h | 1 - 2 files changed, 20 insertions(+), 18 deletions(-)
drivers/net/netdevsim/dev.c +20 -17
@@ -59,7 +59,7 @@ static struct dentry *nsim_dev_ddir;unsigned int nsim_dev_get_vfs (struct nsim_dev *nsim_dev) {WARN_ON (!lockdep_rtnl_is_held () && - !lockdep_is_held (&nsim_dev->vfs_lock)); + !devl_lock_is_held (priv_to_devlink (nsim_dev)));return nsim_dev->nsim_bus_dev->num_vfs; }
@@ -275,7 +275,7 @@ static ssize_t nsim_bus_dev_max_vfs_write(struct file *file,return -ENOMEM ; nsim_dev = file->private_data; -mutex_lock (&nsim_dev->vfs_lock); +devl_lock (priv_to_devlink (nsim_dev));/* Reject if VFs are configured */ if (nsim_dev_get_vfs (nsim_dev)) { ret = -EBUSY ;
@@ -285,7 +285,7 @@ static ssize_t nsim_bus_dev_max_vfs_write(struct file *file, *ppos += count; ret = count; } -mutex_unlock (&nsim_dev->vfs_lock); +devl_unlock (priv_to_devlink (nsim_dev));kfree (vfconfigs);return ret;
@@ -339,6 +339,7 @@ static int nsim_dev_debugfs_init(struct nsim_dev *nsim_dev)debugfs_create_bool ("fail_trap_policer_counter_get" ,0600 , nsim_dev->ddir, &nsim_dev->fail_trap_policer_counter_get); +/* caution, dev_max_vfs write takes devlink lock */ debugfs_create_file ("max_vfs" ,0600 , nsim_dev->ddir, nsim_dev, &nsim_dev_max_vfs_fops);
@@ -567,6 +568,9 @@ static void nsim_dev_dummy_region_exit(struct nsim_dev *nsim_dev)devlink_region_destroy (nsim_dev->dummy_region); } +static int +__nsim_dev_port_add (struct nsim_dev *nsim_dev,enum nsim_dev_port_type type, +unsigned int port_index);static void __nsim_dev_port_del (struct nsim_dev_port *nsim_dev_port); static int nsim_esw_legacy_enable(struct nsim_dev *nsim_dev,
@@ -575,12 +579,10 @@ static int nsim_esw_legacy_enable(struct nsim_dev *nsim_dev,struct devlink *devlink =priv_to_devlink (nsim_dev);struct nsim_dev_port *nsim_dev_port, *tmp; -devlink_rate_nodes_destroy (devlink); -devl_lock (devlink); +devl_rate_nodes_destroy (devlink);list_for_each_entry_safe (nsim_dev_port, tmp, &nsim_dev->port_list, list)if (nsim_dev_port_is_vf (nsim_dev_port))__nsim_dev_port_del (nsim_dev_port); -devl_unlock (devlink); nsim_dev->esw_mode =DEVLINK_ESWITCH_MODE_LEGACY ;return 0 ; }
@@ -588,11 +590,11 @@ static int nsim_esw_legacy_enable(struct nsim_dev *nsim_dev,static int nsim_esw_switchdev_enable (struct nsim_dev *nsim_dev,struct netlink_ext_ack *extack) { -struct nsim_bus_dev *nsim_bus_dev = nsim_dev->nsim_bus_dev; +struct nsim_dev_port *nsim_dev_port, *tmp;int i, err;for (i =0 ; i <nsim_dev_get_vfs (nsim_dev); i++) { - err =nsim_drv_port_add (nsim_bus_dev,NSIM_DEV_PORT_TYPE_VF , i); + err =__nsim_dev_port_add (nsim_dev,NSIM_DEV_PORT_TYPE_VF , i);if (err) {NL_SET_ERR_MSG_MOD (extack,"Failed to initialize VFs' netdevsim ports" );pr_err ("Failed to initialize VF id=%d. %d.\n" , i, err);
@@ -603,8 +605,9 @@ static int nsim_esw_switchdev_enable(struct nsim_dev *nsim_dev,return 0 ; err_port_add_vfs: -for (i--; i >=0 ; i--) -nsim_drv_port_del (nsim_bus_dev,NSIM_DEV_PORT_TYPE_VF , i); +list_for_each_entry_safe (nsim_dev_port, tmp, &nsim_dev->port_list, list) +if (nsim_dev_port_is_vf (nsim_dev_port)) +__nsim_dev_port_del (nsim_dev_port);return err; }
@@ -614,7 +617,7 @@ static int nsim_devlink_eswitch_mode_set(struct devlink *devlink, u16 mode,struct nsim_dev *nsim_dev =devlink_priv (devlink);int err =0 ; -mutex_lock (&nsim_dev->vfs_lock); +devl_lock (devlink);if (mode == nsim_dev->esw_mode) goto unlock;
@@ -626,7 +629,7 @@ static int nsim_devlink_eswitch_mode_set(struct devlink *devlink, u16 mode, err = -EINVAL ; unlock: -mutex_unlock (&nsim_dev->vfs_lock); +devl_unlock (devlink);return err; }
@@ -1545,7 +1548,6 @@ int nsim_drv_probe(struct nsim_bus_dev *nsim_bus_dev) nsim_dev->switch_id.id_len =sizeof (nsim_dev->switch_id.id);get_random_bytes (nsim_dev->switch_id.id, nsim_dev->switch_id.id_len);INIT_LIST_HEAD (&nsim_dev->port_list); -mutex_init (&nsim_dev->vfs_lock); nsim_dev->fw_update_status = true; nsim_dev->fw_update_overwrite_mask =0 ; nsim_dev->max_macs =NSIM_DEV_MAX_MACS_DEFAULT ;
@@ -1652,13 +1654,13 @@ static void nsim_dev_reload_destroy(struct nsim_dev *nsim_dev)return ;debugfs_remove (nsim_dev->take_snapshot); -mutex_lock (&nsim_dev->vfs_lock); +devl_lock (devlink);if (nsim_dev_get_vfs (nsim_dev)) {nsim_bus_dev_set_vfs (nsim_dev->nsim_bus_dev,0 );if (nsim_esw_mode_is_switchdev (nsim_dev))nsim_esw_legacy_enable (nsim_dev,NULL ); } -mutex_unlock (&nsim_dev->vfs_lock); +devl_unlock (devlink);nsim_dev_port_del_all (nsim_dev);nsim_dev_hwstats_exit (nsim_dev);
@@ -1736,9 +1738,10 @@ int nsim_drv_configure_vfs(struct nsim_bus_dev *nsim_bus_dev, unsigned int num_vfs) {struct nsim_dev *nsim_dev =dev_get_drvdata (&nsim_bus_dev->dev); +struct devlink *devlink =priv_to_devlink (nsim_dev);int ret =0 ; -mutex_lock (&nsim_dev->vfs_lock); +devl_lock (devlink);if (nsim_bus_dev->num_vfs == num_vfs) goto exit_unlock;if (nsim_bus_dev->num_vfs && num_vfs) {
@@ -1764,7 +1767,7 @@ int nsim_drv_configure_vfs(struct nsim_bus_dev *nsim_bus_dev, } exit_unlock: -mutex_unlock (&nsim_dev->vfs_lock); +devl_unlock (devlink);return ret; }
drivers/net/netdevsim/netdevsim.h +0 -1
@@ -261,7 +261,6 @@ struct nsim_dev {struct dentry *take_snapshot;struct dentry *nodes_ddir; -struct mutex vfs_lock;/* Protects vfconfigs */ struct nsim_vf_config *vfconfigs;struct bpf_offload_dev *bpf_dev;
Signature · 1 line
2.34.1
Jakub Kicinski
maintainerPATCH v2 5/5 devlink: hold the instance lock during eswitch_mode callbacks
In reply to Jakub KicinskiMake the devlink core hold the instance lock during eswitch_mode callbacks. Cheat in case of mlx5 (see the cover letter).
--- drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c | 22 +++----- .../mellanox/mlx5/core/eswitch_offloads.c | 54 ++++++++++++++----- .../net/ethernet/netronome/nfp/nfp_devlink.c | 7 +-- drivers/net/netdevsim/dev.c | 16 ++---- net/core/devlink.c | 6 --- 5 files changed, 54 insertions(+), 51 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c +6 -16
@@ -559,44 +559,34 @@ int bnxt_dl_eswitch_mode_set(struct devlink *devlink, u16 mode, struct netlink_ext_ack *extack) {struct bnxt *bp =bnxt_get_bp_from_dl (devlink); -int rc =0 ; -devl_lock (devlink);if (bp->eswitch_mode == mode) {netdev_info (bp->dev,"already in %s eswitch mode\n" , mode ==DEVLINK_ESWITCH_MODE_LEGACY ?"legacy" :"switchdev" ); - rc = -EINVAL ; - goto done; +return -EINVAL ; }switch (mode) {case DEVLINK_ESWITCH_MODE_LEGACY :bnxt_vf_reps_destroy (bp); -break ; +return 0 ;case DEVLINK_ESWITCH_MODE_SWITCHDEV :if (bp->hwrm_spec_code <0x10803 ) {netdev_warn (bp->dev,"FW does not support SRIOV E-Switch SWITCHDEV mode\n" ); - rc = -ENOTSUPP ; - goto done; +return -ENOTSUPP ; }if (pci_num_vf (bp->pdev) ==0 ) {netdev_info (bp->dev,"Enable VFs before setting switchdev mode\n" ); - rc = -EPERM ; - goto done; +return -EPERM ; } - rc =bnxt_vf_reps_create (bp); -break ; +return bnxt_vf_reps_create (bp);default : - rc = -EINVAL ; - goto done; +return -EINVAL ; } -done: -devl_unlock (devlink); -return rc; }#endif
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c +42 -12
135 lines not on this page · raw message
drivers/net/ethernet/netronome/nfp/nfp_devlink.c +1 -6
@@ -144,13 +144,8 @@ static int nfp_devlink_eswitch_mode_set(struct devlink *devlink, u16 mode, struct netlink_ext_ack *extack) {struct nfp_pf *pf =devlink_priv (devlink); -int ret; - -devl_lock (devlink); - ret =nfp_app_eswitch_mode_set (pf->app, mode); -devl_unlock (devlink); -return ret; +return nfp_app_eswitch_mode_set (pf->app, mode); } static const struct nfp_devlink_versions_simple {
drivers/net/netdevsim/dev.c +5 -11
@@ -615,22 +615,16 @@ static int nsim_devlink_eswitch_mode_set(struct devlink *devlink, u16 mode, struct netlink_ext_ack *extack) {struct nsim_dev *nsim_dev =devlink_priv (devlink); -int err =0 ; -devl_lock (devlink);if (mode == nsim_dev->esw_mode) - goto unlock; +return 0 ;if (mode ==DEVLINK_ESWITCH_MODE_LEGACY ) - err =nsim_esw_legacy_enable (nsim_dev, extack); -else if (mode ==DEVLINK_ESWITCH_MODE_SWITCHDEV ) - err =nsim_esw_switchdev_enable (nsim_dev, extack); -else - err = -EINVAL ; +return nsim_esw_legacy_enable (nsim_dev, extack); +if (mode ==DEVLINK_ESWITCH_MODE_SWITCHDEV ) +return nsim_esw_switchdev_enable (nsim_dev, extack); -unlock: -devl_unlock (devlink); -return err; +return -EINVAL ; }static int nsim_devlink_eswitch_mode_get (struct devlink *devlink,u16 *mode)
net/core/devlink.c +0 -6
@@ -2868,15 +2868,11 @@ static int devlink_rate_nodes_check(struct devlink *devlink, u16 mode, {struct devlink_rate *devlink_rate; -/* Take the lock to sync with destroy */ -mutex_lock (&devlink->lock);list_for_each_entry (devlink_rate, &devlink->rate_list, list)if (devlink_rate_is_node (devlink_rate)) { -mutex_unlock (&devlink->lock);NL_SET_ERR_MSG_MOD (extack,"Rate node(s) exists." );return -EBUSY ; } -mutex_unlock (&devlink->lock);return 0 ; }
@@ -8735,14 +8731,12 @@ static const struct genl_small_ops devlink_nl_ops[] = { .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, .doit = devlink_nl_cmd_eswitch_get_doit, .flags = GENL_ADMIN_PERM, - .internal_flags = DEVLINK_NL_FLAG_NO_LOCK, }, { .cmd = DEVLINK_CMD_ESWITCH_SET, .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, .doit = devlink_nl_cmd_eswitch_set_doit, .flags = GENL_ADMIN_PERM, - .internal_flags = DEVLINK_NL_FLAG_NO_LOCK, }, { .cmd = DEVLINK_CMD_DPIPE_TABLE_GET,
Signature · 1 line
2.34.1
This series was applied to netdev/net-next.git (master) by David S. Miller <[email protected]>:
Hello:
This series was applied to netdev/net-next.git (master) by David S. Miller <[email protected]>:
Quoted 16 lines · On Fri, 18 Mar 2022 12:23:39 -0700 you wrote:
Series number 2 in the effort to hold the devlink instance lock in call driver callbacks. We have the following drivers using this API:
- bnxt, nfp, netdevsim - their own locking is removed / simplified by this series; all of them needed a lock to protect from changes to the number of VFs while switching modes, now the VF config bus callback takes the devlink instance lock via
devl_lock();
- ice - appears not to allow changing modes while SR-IOV enabled, so nothing to do there;
- liquidio - does not contain any locking;
- octeontx2/af - is very special but at least doesn't have locking so doesn't get in the way either;
- mlx5 has a wealth of locks - I chickened out and dropped the lock in the callbacks so that I can leave the driver be, for now.
Quoted 1 line
[...]
Here is the summary with links:
- [net-next,v2,1/5] bnxt: use the devlink instance lock to protect sriov
https://git.kernel.org/netdev/net-next/c/7a1b0b1a555e - [net-next,v2,2/5] devlink: add explicitly locked flavor of the rate node APIs https://git.kernel.org/netdev/net-next/c/8879b32a3a80 - [net-next,v2,3/5] netdevsim: replace port_list_lock with devlink instance lock https://git.kernel.org/netdev/net-next/c/76eea6c2e663 - [net-next,v2,4/5] netdevsim: replace vfs_lock with devlink instance lock https://git.kernel.org/netdev/net-next/c/aff3a9250946 - [net-next,v2,5/5] devlink: hold the instance lock during eswitch_mode callbacks https://git.kernel.org/netdev/net-next/c/14e426bf1a4d
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html