devlink: small spring cleanup
Subsystems (9)
Jiri Pirko
maintainerv3 cover devlink: small spring cleanup
From: Jiri Pirko <[email protected]>
Mostly cosmetics and janitor work.
Jiri Pirko (15):
net: devlink: add couple of missing mutex_destroy() calls
bnxt: add missing net/devlink.h include
dsa: add missing net/devlink.h include
bnxt: set devlink port attrs properly
bnxt: call devlink_port_type_eth_set() before port register
net: devlink: don't take devlink_mutex for devlink_compat_*
net: devlink: don't pass return value of __devlink_port_type_set()
mlxsw: Move devlink_port_attrs_set() call before register
dsa: move devlink_port_attrs_set() call before register
net: devlink: disallow port_attrs_set() to be called before register
nfp: move devlink port type set after netdev registration
bnxt: set devlink port type after registration
net: devlink: warn on setting type on unregistered port
net: devlink: add port type spinlock
net: devlink: select NET_DEVLINK from drivers
drivers/net/Kconfig | 1 + drivers/net/ethernet/broadcom/Kconfig | 1 + .../net/ethernet/broadcom/bnxt/bnxt_devlink.c | 3 + drivers/net/ethernet/cavium/Kconfig | 1 + drivers/net/ethernet/mellanox/mlx4/Kconfig | 1 + .../net/ethernet/mellanox/mlx5/core/Kconfig | 1 + drivers/net/ethernet/mellanox/mlxsw/Kconfig | 1 + drivers/net/ethernet/mellanox/mlxsw/core.c | 12 +- drivers/net/ethernet/mellanox/mlxsw/core.h | 8 +- drivers/net/ethernet/mellanox/mlxsw/minimal.c | 5 +- .../net/ethernet/mellanox/mlxsw/spectrum.c | 6 +- .../net/ethernet/mellanox/mlxsw/switchib.c | 3 +- .../net/ethernet/mellanox/mlxsw/switchx2.c | 5 +- drivers/net/ethernet/netronome/Kconfig | 1 + .../net/ethernet/netronome/nfp/nfp_devlink.c | 11 +- .../net/ethernet/netronome/nfp/nfp_net_main.c | 9 +- drivers/net/ethernet/netronome/nfp/nfp_port.h | 2 + include/net/devlink.h | 499 +----------------- net/Kconfig | 7 +- net/core/devlink.c | 51 +- net/dsa/Kconfig | 1 + net/dsa/dsa2.c | 48 +- 22 files changed, 117 insertions(+), 560 deletions(-)
Signature · 1 line
2.17.2
Jiri Pirko
maintainerPATCH v3 1/15 net: devlink: add couple of missing mutex_destroy() calls
From: Jiri Pirko <[email protected]>
Add missing called to mutex_destroy() for two mutexes used in devlink code.
--- net/core/devlink.c | 2 ++ 1 file changed, 2 insertions(+)
net/core/devlink.c +2 -0
@@ -4491,6 +4491,7 @@ devlink_health_reporter_destroy(struct devlink_health_reporter *reporter) {mutex_lock (&reporter->devlink->lock);list_del (&reporter->list); +mutex_destroy (&reporter->dump_lock);mutex_unlock (&reporter->devlink->lock);if (reporter->dump_fmsg)devlink_fmsg_free (reporter->dump_fmsg);
@@ -5303,6 +5304,7 @@ EXPORT_SYMBOL_GPL(devlink_unregister);*/ void devlink_free (struct devlink *devlink) { +mutex_destroy (&devlink->lock);WARN_ON (!list_empty (&devlink->reporter_list));WARN_ON (!list_empty (&devlink->region_list));WARN_ON (!list_empty (&devlink->param_list));
Signature · 1 line
2.17.2
Jiri Pirko
maintainerPATCH v3 2/15 bnxt: add missing net/devlink.h include
In reply to Jiri PirkoFrom: Jiri Pirko <[email protected]>
devlink functions are in use, so include the related header file.
--- drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c +1 -0
@@ -9,6 +9,7 @@#include <linux/pci.h> #include <linux/netdevice.h> +#include <net/devlink.h> #include "bnxt_hsi.h" #include "bnxt.h" #include "bnxt_vfr.h"
Signature · 1 line
2.17.2
Jiri Pirko
maintainerPATCH v3 3/15 dsa: add missing net/devlink.h include
In reply to Jiri PirkoFrom: Jiri Pirko <[email protected]>
devlink functions are in use, so include the related header file.
--- net/dsa/dsa2.c | 1 + 1 file changed, 1 insertion(+)
net/dsa/dsa2.c +1 -0
@@ -18,6 +18,7 @@#include <linux/rtnetlink.h> #include <linux/of.h> #include <linux/of_net.h> +#include <net/devlink.h> #include "dsa_priv.h"
Signature · 1 line
2.17.2
Jiri Pirko
maintainerPATCH v3 4/15 bnxt: set devlink port attrs properly
In reply to Jiri PirkoFrom: Jiri Pirko <[email protected]>
Set the attrs properly so delink has enough info to generate physical port names.
--- drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c +2 -0
@@ -229,6 +229,8 @@ int bnxt_dl_register(struct bnxt *bp) goto err_dl_unreg; } +devlink_port_attrs_set (&bp->dl_port,DEVLINK_PORT_FLAVOUR_PHYSICAL , + bp->pf.port_id, false,0 ); rc =devlink_port_register (dl, &bp->dl_port, bp->pf.port_id);if (rc) {netdev_err (bp->dev,"devlink_port_register failed" );
Signature · 1 line
2.17.2
Jiri Pirko
maintainerPATCH v3 5/15 bnxt: call devlink_port_type_eth_set() before port register
In reply to Jiri PirkoFrom: Jiri Pirko <[email protected]>
Call devlink_port_type_eth_set() before devlink_port_register(). Bnxt instances won't change type during lifetime. This avoids one extra userspace devlink notification.
--- drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c +1 -1
@@ -229,6 +229,7 @@ int bnxt_dl_register(struct bnxt *bp) goto err_dl_unreg; } +devlink_port_type_eth_set (&bp->dl_port, bp->dev);devlink_port_attrs_set (&bp->dl_port,DEVLINK_PORT_FLAVOUR_PHYSICAL , bp->pf.port_id, false,0 ); rc =devlink_port_register (dl, &bp->dl_port, bp->pf.port_id);
@@ -236,7 +237,6 @@ int bnxt_dl_register(struct bnxt *bp)netdev_err (bp->dev,"devlink_port_register failed" ); goto err_dl_param_unreg; } -devlink_port_type_eth_set (&bp->dl_port, bp->dev); rc =devlink_port_params_register (&bp->dl_port, bnxt_dl_port_params,ARRAY_SIZE (bnxt_dl_port_params));
Signature · 1 line
2.17.2
Jiri Pirko
maintainerPATCH v3 6/15 net: devlink: don't take devlink_mutex for devlink_compat_*
In reply to Jiri PirkoFrom: Jiri Pirko <[email protected]>
The netdevice is guaranteed to not disappear so we can rely that devlink_port and devlink won't disappear as well. No need to take devlink_mutex so don't take it here.
--- net/core/devlink.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-)
net/core/devlink.c +8 -10
@@ -6449,17 +6449,15 @@ void devlink_compat_running_version(struct net_device *dev,dev_hold (dev);rtnl_unlock (); -mutex_lock (&devlink_mutex); devlink =netdev_to_devlink (dev);if (!devlink || !devlink->ops->info_get) - goto unlock_list; + goto out;mutex_lock (&devlink->lock);__devlink_compat_running_version (devlink, buf, len);mutex_unlock (&devlink->lock); -unlock_list: -mutex_unlock (&devlink_mutex); +out:rtnl_lock ();dev_put (dev); }
@@ -6467,22 +6465,22 @@ void devlink_compat_running_version(struct net_device *dev,int devlink_compat_flash_update (struct net_device *dev,const char *file_name) {struct devlink *devlink; -int ret = -EOPNOTSUPP ; +int ret;dev_hold (dev);rtnl_unlock (); -mutex_lock (&devlink_mutex); devlink =netdev_to_devlink (dev); -if (!devlink || !devlink->ops->flash_update) - goto unlock_list; +if (!devlink || !devlink->ops->flash_update) { + ret = -EOPNOTSUPP ; + goto out; + }mutex_lock (&devlink->lock); ret = devlink->ops->flash_update (devlink, file_name,NULL ,NULL );mutex_unlock (&devlink->lock); -unlock_list: -mutex_unlock (&devlink_mutex); +out:rtnl_lock ();dev_put (dev);
Signature · 1 line
2.17.2
Jiri Pirko
maintainerPATCH v3 7/15 net: devlink: don't pass return value of __devlink_port_type_set()
In reply to Jiri PirkoFrom: Jiri Pirko <[email protected]>
__devlink_port_type_set() returns void, it makes no sense to pass it on, so don't do that.
--- net/core/devlink.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
net/core/devlink.c +3 -6
@@ -5384,8 +5384,7 @@ static void __devlink_port_type_set(struct devlink_port *devlink_port,void devlink_port_type_eth_set (struct devlink_port *devlink_port,struct net_device *netdev) { -return __devlink_port_type_set (devlink_port, -DEVLINK_PORT_TYPE_ETH , netdev); +__devlink_port_type_set (devlink_port,DEVLINK_PORT_TYPE_ETH , netdev); }EXPORT_SYMBOL_GPL (devlink_port_type_eth_set);
@@ -5398,8 +5397,7 @@ EXPORT_SYMBOL_GPL(devlink_port_type_eth_set);void devlink_port_type_ib_set (struct devlink_port *devlink_port,struct ib_device *ibdev) { -return __devlink_port_type_set (devlink_port, -DEVLINK_PORT_TYPE_IB , ibdev); +__devlink_port_type_set (devlink_port,DEVLINK_PORT_TYPE_IB , ibdev); }EXPORT_SYMBOL_GPL (devlink_port_type_ib_set);
@@ -5410,8 +5408,7 @@ EXPORT_SYMBOL_GPL(devlink_port_type_ib_set);*/ void devlink_port_type_clear (struct devlink_port *devlink_port) { -return __devlink_port_type_set (devlink_port, -DEVLINK_PORT_TYPE_NOTSET ,NULL ); +__devlink_port_type_set (devlink_port,DEVLINK_PORT_TYPE_NOTSET ,NULL ); }EXPORT_SYMBOL_GPL (devlink_port_type_clear);
Signature · 1 line
2.17.2
Jiri Pirko
maintainerPATCH v3 8/15 mlxsw: Move devlink_port_attrs_set() call before register
In reply to Jiri PirkoFrom: Jiri Pirko <[email protected]>
Since attrs are static during the existence of devlink port, set the before registration of the port.
--- drivers/net/ethernet/mellanox/mlxsw/core.c | 12 ++++++------ drivers/net/ethernet/mellanox/mlxsw/core.h | 8 ++++---- drivers/net/ethernet/mellanox/mlxsw/minimal.c | 5 +++-- drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 6 +++--- drivers/net/ethernet/mellanox/mlxsw/switchib.c | 3 ++- drivers/net/ethernet/mellanox/mlxsw/switchx2.c | 5 +++-- 6 files changed, 21 insertions(+), 18 deletions(-)
drivers/net/ethernet/mellanox/mlxsw/core.c +6 -6
@@ -1718,7 +1718,9 @@ u64 mlxsw_core_res_get(struct mlxsw_core *mlxsw_core, }EXPORT_SYMBOL (mlxsw_core_res_get); -int mlxsw_core_port_init (struct mlxsw_core *mlxsw_core,u8 local_port) +int mlxsw_core_port_init (struct mlxsw_core *mlxsw_core,u8 local_port, +u32 port_number,bool split, +u32 split_port_subnumber) {struct devlink *devlink =priv_to_devlink (mlxsw_core); struct mlxsw_core_port *mlxsw_core_port =
@@ -1727,6 +1729,8 @@ int mlxsw_core_port_init(struct mlxsw_core *mlxsw_core, u8 local_port)int err; mlxsw_core_port->local_port = local_port; +devlink_port_attrs_set (devlink_port,DEVLINK_PORT_FLAVOUR_PHYSICAL , + port_number, split, split_port_subnumber); err =devlink_port_register (devlink, devlink_port, local_port);if (err)memset (mlxsw_core_port,0 ,sizeof (*mlxsw_core_port));
@@ -1746,17 +1750,13 @@ void mlxsw_core_port_fini(struct mlxsw_core *mlxsw_core, u8 local_port)EXPORT_SYMBOL (mlxsw_core_port_fini);void mlxsw_core_port_eth_set (struct mlxsw_core *mlxsw_core,u8 local_port, -void *port_driver_priv,struct net_device *dev, -u32 port_number,bool split, -u32 split_port_subnumber) +void *port_driver_priv,struct net_device *dev) {struct mlxsw_core_port *mlxsw_core_port = &mlxsw_core->ports[local_port];struct devlink_port *devlink_port = &mlxsw_core_port->devlink_port; mlxsw_core_port->port_driver_priv = port_driver_priv; -devlink_port_attrs_set (devlink_port,DEVLINK_PORT_FLAVOUR_PHYSICAL , - port_number, split, split_port_subnumber);devlink_port_type_eth_set (devlink_port, dev); }EXPORT_SYMBOL (mlxsw_core_port_eth_set);
drivers/net/ethernet/mellanox/mlxsw/core.h +4 -4
@@ -164,12 +164,12 @@ void mlxsw_core_lag_mapping_clear(struct mlxsw_core *mlxsw_core, u16 lag_id, u8 local_port);void *mlxsw_core_port_driver_priv (struct mlxsw_core_port *mlxsw_core_port); -int mlxsw_core_port_init (struct mlxsw_core *mlxsw_core,u8 local_port); +int mlxsw_core_port_init (struct mlxsw_core *mlxsw_core,u8 local_port, +u32 port_number,bool split, +u32 split_port_subnumber);void mlxsw_core_port_fini (struct mlxsw_core *mlxsw_core,u8 local_port);void mlxsw_core_port_eth_set (struct mlxsw_core *mlxsw_core,u8 local_port, -void *port_driver_priv,struct net_device *dev, -u32 port_number,bool split, -u32 split_port_subnumber); +void *port_driver_priv,struct net_device *dev);void mlxsw_core_port_ib_set (struct mlxsw_core *mlxsw_core,u8 local_port,void *port_driver_priv); void mlxsw_core_port_clear(struct mlxsw_core *mlxsw_core, u8 local_port,
drivers/net/ethernet/mellanox/mlxsw/minimal.c +3 -2
@@ -150,7 +150,8 @@ mlxsw_m_port_create(struct mlxsw_m *mlxsw_m, u8 local_port, u8 module)struct net_device *dev;int err; - err =mlxsw_core_port_init (mlxsw_m->core, local_port); + err =mlxsw_core_port_init (mlxsw_m->core, local_port, + module +1 , false,0 );if (err) {dev_err (mlxsw_m->bus_info->dev,"Port %d: Failed to init core port\n" , local_port);
@@ -190,7 +191,7 @@ mlxsw_m_port_create(struct mlxsw_m *mlxsw_m, u8 local_port, u8 module) }mlxsw_core_port_eth_set (mlxsw_m->core, mlxsw_m_port->local_port, - mlxsw_m_port, dev, module +1 , false,0 ); + mlxsw_m_port, dev);return 0 ;
drivers/net/ethernet/mellanox/mlxsw/spectrum.c +3 -3
@@ -3391,7 +3391,8 @@ static int mlxsw_sp_port_create(struct mlxsw_sp *mlxsw_sp, u8 local_port,struct net_device *dev;int err; - err =mlxsw_core_port_init (mlxsw_sp->core, local_port); + err =mlxsw_core_port_init (mlxsw_sp->core, local_port, + module +1 , split, lane / width);if (err) {dev_err (mlxsw_sp->bus_info->dev,"Port %d: Failed to init core port\n" , local_port);
@@ -3573,8 +3574,7 @@ static int mlxsw_sp_port_create(struct mlxsw_sp *mlxsw_sp, u8 local_port, }mlxsw_core_port_eth_set (mlxsw_sp->core, mlxsw_sp_port->local_port, - mlxsw_sp_port, dev, module +1 , - mlxsw_sp_port->split, lane / width); + mlxsw_sp_port, dev);mlxsw_core_schedule_dw (&mlxsw_sp_port->periodic_hw_stats.update_dw,0 );return 0 ;
drivers/net/ethernet/mellanox/mlxsw/switchib.c +2 -1
@@ -267,7 +267,8 @@ static int mlxsw_sib_port_create(struct mlxsw_sib *mlxsw_sib, u8 local_port, {int err; - err =mlxsw_core_port_init (mlxsw_sib->core, local_port); + err =mlxsw_core_port_init (mlxsw_sib->core, local_port, + module +1 , false,0 );if (err) {dev_err (mlxsw_sib->bus_info->dev,"Port %d: Failed to init core port\n" , local_port);
drivers/net/ethernet/mellanox/mlxsw/switchx2.c +3 -2
@@ -1102,7 +1102,7 @@ static int __mlxsw_sx_port_eth_create(struct mlxsw_sx *mlxsw_sx, u8 local_port, }mlxsw_core_port_eth_set (mlxsw_sx->core, mlxsw_sx_port->local_port, - mlxsw_sx_port, dev, module +1 , false,0 ); + mlxsw_sx_port, dev); mlxsw_sx->ports[local_port] = mlxsw_sx_port;return 0 ;
@@ -1127,7 +1127,8 @@ static int mlxsw_sx_port_eth_create(struct mlxsw_sx *mlxsw_sx, u8 local_port, {int err; - err =mlxsw_core_port_init (mlxsw_sx->core, local_port); + err =mlxsw_core_port_init (mlxsw_sx->core, local_port, + module +1 , false,0 );if (err) {dev_err (mlxsw_sx->bus_info->dev,"Port %d: Failed to init core port\n" , local_port);
Signature · 1 line
2.17.2
Jiri Pirko
maintainerPATCH v3 9/15 dsa: move devlink_port_attrs_set() call before register
In reply to Jiri PirkoFrom: Jiri Pirko <[email protected]>
Since attrs are static during the existence of devlink port, set the before registration of the port.
---v1->v2:
- fixed comment for port numbering
--- net/dsa/dsa2.c | 47 ++++++++++++++++++++++++++--------------------- 1 file changed, 26 insertions(+), 21 deletions(-)
net/dsa/dsa2.c +26 -21
@@ -258,14 +258,36 @@ static void dsa_tree_teardown_default_cpu(struct dsa_switch_tree *dst)static int dsa_port_setup (struct dsa_port *dp) { +enum devlink_port_flavour flavour;struct dsa_switch *ds = dp->ds; -int err =0 ; +int err; + +if (dp->type ==DSA_PORT_TYPE_UNUSED ) +return 0 ;memset (&dp->devlink_port,0 ,sizeof (dp->devlink_port)); -if (dp->type !=DSA_PORT_TYPE_UNUSED ) - err =devlink_port_register (ds->devlink, &dp->devlink_port, - dp->index); +switch (dp->type) { +case DSA_PORT_TYPE_CPU : + flavour =DEVLINK_PORT_FLAVOUR_CPU ; +break ; +case DSA_PORT_TYPE_DSA : + flavour =DEVLINK_PORT_FLAVOUR_DSA ; +break ; +case DSA_PORT_TYPE_USER :/* fall-through */ +default : + flavour =DEVLINK_PORT_FLAVOUR_PHYSICAL ; +break ; + } + +/* dp->index is used now as port_number. However +* CPU and DSA ports should have separate numbering +* independent from front panel port numbers. +*/ +devlink_port_attrs_set (&dp->devlink_port, flavour, + dp->index, false,0 ); + err =devlink_port_register (ds->devlink, &dp->devlink_port, + dp->index);if (err)return err;
@@ -273,13 +295,6 @@ static int dsa_port_setup(struct dsa_port *dp)case DSA_PORT_TYPE_UNUSED :break ;case DSA_PORT_TYPE_CPU : -/* dp->index is used now as port_number. However -* CPU ports should have separate numbering -* independent from front panel port numbers. -*/ -devlink_port_attrs_set (&dp->devlink_port, -DEVLINK_PORT_FLAVOUR_CPU , - dp->index, false,0 ); err =dsa_port_link_register_of (dp);if (err) { dev_err(ds->dev, "failed to setup link for port %d.%d\n",
@@ -288,13 +303,6 @@ static int dsa_port_setup(struct dsa_port *dp) }break ;case DSA_PORT_TYPE_DSA : -/* dp->index is used now as port_number. However -* DSA ports should have separate numbering -* independent from front panel port numbers. -*/ -devlink_port_attrs_set (&dp->devlink_port, -DEVLINK_PORT_FLAVOUR_DSA , - dp->index, false,0 ); err =dsa_port_link_register_of (dp);if (err) { dev_err(ds->dev, "failed to setup link for port %d.%d\n",
@@ -303,9 +311,6 @@ static int dsa_port_setup(struct dsa_port *dp) }break ;case DSA_PORT_TYPE_USER : -devlink_port_attrs_set (&dp->devlink_port, -DEVLINK_PORT_FLAVOUR_PHYSICAL , - dp->index, false,0 ); err =dsa_slave_create (dp);if (err) dev_err(ds->dev, "failed to create slave for port %d.%d\n",
Signature · 1 line
2.17.2
Jiri Pirko
maintainerPATCH v3 10/15 net: devlink: disallow port_attrs_set() to be called before register
In reply to Jiri PirkoFrom: Jiri Pirko <[email protected]>
Since the port attributes are static and cannot change during the port lifetime, WARN_ON if some driver calls it after registration. Also, no need to call notifications as it is noop anyway due to check of devlink_port->registered there.
--- net/core/devlink.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/core/devlink.c +2 -1
@@ -5430,12 +5430,13 @@ void devlink_port_attrs_set(struct devlink_port *devlink_port, {struct devlink_port_attrs *attrs = &devlink_port->attrs; +if (WARN_ON (devlink_port->registered)) +return ; attrs->set = true; attrs->flavour = flavour; attrs->port_number = port_number; attrs->split = split; attrs->split_subport_number = split_subport_number; -devlink_port_notify (devlink_port,DEVLINK_CMD_PORT_NEW ); }EXPORT_SYMBOL_GPL (devlink_port_attrs_set);
Signature · 1 line
2.17.2
Jiri Pirko
maintainerPATCH v3 11/15 nfp: move devlink port type set after netdev registration
In reply to Jiri PirkoFrom: Jiri Pirko <[email protected]>
Similar to other driver, move the port type set after netdev registration is done. Along with that, clear the type before unregistration.
---v2->v3:
- move type set to be called before nfp_app_vnic_init() v1->v2:
- new patch
--- drivers/net/ethernet/netronome/nfp/nfp_devlink.c | 11 ++++++++++- drivers/net/ethernet/netronome/nfp/nfp_net_main.c | 9 +++++++-- drivers/net/ethernet/netronome/nfp/nfp_port.h | 2 ++ 3 files changed, 19 insertions(+), 3 deletions(-)
drivers/net/ethernet/netronome/nfp/nfp_devlink.c +10 -1
@@ -362,7 +362,6 @@ int nfp_devlink_port_register(struct nfp_app *app, struct nfp_port *port)if (ret)return ret; -devlink_port_type_eth_set (&port->dl_port, port->netdev);devlink_port_attrs_set (&port->dl_port,DEVLINK_PORT_FLAVOUR_PHYSICAL , eth_port.label_port, eth_port.is_split, eth_port.label_subport);
@@ -377,6 +376,16 @@ void nfp_devlink_port_unregister(struct nfp_port *port)devlink_port_unregister (&port->dl_port); } +void nfp_devlink_port_type_eth_set (struct nfp_port *port) +{ +devlink_port_type_eth_set (&port->dl_port, port->netdev); +} + +void nfp_devlink_port_type_clear (struct nfp_port *port) +{ +devlink_port_type_clear (&port->dl_port); +} +struct devlink *nfp_devlink_get_devlink (struct net_device *netdev) {struct nfp_app *app;
drivers/net/ethernet/netronome/nfp/nfp_net_main.c +7 -2
@@ -160,6 +160,7 @@ nfp_net_pf_init_vnic(struct nfp_pf *pf, struct nfp_net *nn, unsigned int id) err =nfp_devlink_port_register (pf->app, nn->port);if (err) goto err_dfs_clean; +nfp_devlink_port_type_eth_set (nn->port); }nfp_net_info (nn);
@@ -173,8 +174,10 @@ nfp_net_pf_init_vnic(struct nfp_pf *pf, struct nfp_net *nn, unsigned int id)return 0 ; err_devlink_port_clean: -if (nn->port) +if (nn->port) { +nfp_devlink_port_type_clear (nn->port);nfp_devlink_port_unregister (nn->port); + } err_dfs_clean:nfp_net_debugfs_dir_clean (&nn->debugfs_dir);nfp_net_clean (nn);
@@ -220,8 +223,10 @@ static void nfp_net_pf_clean_vnic(struct nfp_pf *pf, struct nfp_net *nn) {if (nfp_net_is_data_vnic (nn))nfp_app_vnic_clean (pf->app, nn); -if (nn->port) +if (nn->port) { +nfp_devlink_port_type_clear (nn->port);nfp_devlink_port_unregister (nn->port); + }nfp_net_debugfs_dir_clean (&nn->debugfs_dir);nfp_net_clean (nn); }
drivers/net/ethernet/netronome/nfp/nfp_port.h +2 -0
@@ -131,6 +131,8 @@ int nfp_net_refresh_port_table_sync(struct nfp_pf *pf);int nfp_devlink_port_register (struct nfp_app *app,struct nfp_port *port);void nfp_devlink_port_unregister (struct nfp_port *port); +void nfp_devlink_port_type_eth_set (struct nfp_port *port); +void nfp_devlink_port_type_clear (struct nfp_port *port);/** * Mac stats (0x0000 - 0x0200)
Signature · 1 line
2.17.2
Jiri Pirko
maintainerPATCH v3 12/15 bnxt: set devlink port type after registration
In reply to Jiri PirkoFrom: Jiri Pirko <[email protected]>
Move the type set of devlink port after it is registered.
---v1->v2:
- new patch
--- drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c +1 -1
@@ -229,7 +229,6 @@ int bnxt_dl_register(struct bnxt *bp) goto err_dl_unreg; } -devlink_port_type_eth_set (&bp->dl_port, bp->dev);devlink_port_attrs_set (&bp->dl_port,DEVLINK_PORT_FLAVOUR_PHYSICAL , bp->pf.port_id, false,0 ); rc =devlink_port_register (dl, &bp->dl_port, bp->pf.port_id);
@@ -237,6 +236,7 @@ int bnxt_dl_register(struct bnxt *bp)netdev_err (bp->dev,"devlink_port_register failed" ); goto err_dl_param_unreg; } +devlink_port_type_eth_set (&bp->dl_port, bp->dev); rc =devlink_port_params_register (&bp->dl_port, bnxt_dl_port_params,ARRAY_SIZE (bnxt_dl_port_params));
Signature · 1 line
2.17.2
Jiri Pirko
maintainerPATCH v3 13/15 net: devlink: warn on setting type on unregistered port
In reply to Jiri PirkoFrom: Jiri Pirko <[email protected]>
Port needs to be registered first before the type is set. Warn and bail-out in case it is not.
---v1->v2:
- new patch
--- net/core/devlink.c | 2 ++ 1 file changed, 2 insertions(+)
net/core/devlink.c +2 -0
@@ -5370,6 +5370,8 @@ static void __devlink_port_type_set(struct devlink_port *devlink_port, enum devlink_port_type type, void *type_dev) { +if (WARN_ON (!devlink_port->registered)) +return ; devlink_port->type = type; devlink_port->type_dev = type_dev;devlink_port_notify (devlink_port,DEVLINK_CMD_PORT_NEW );
Signature · 1 line
2.17.2
Jiri Pirko
maintainerPATCH v3 14/15 net: devlink: add port type spinlock
In reply to Jiri PirkoFrom: Jiri Pirko <[email protected]>
Add spinlock to protect port type and type_dev pointer consistency. Without that, userspace may see inconsistent type and type_dev combinations.
v1->v2:
- rebased
--- include/net/devlink.h | 4 ++++ net/core/devlink.c | 17 +++++++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-)
include/net/devlink.h +4 -0
@@ -16,6 +16,7 @@#include <linux/gfp.h> #include <linux/list.h> #include <linux/netdevice.h> +#include <linux/spinlock.h> #include <net/net_namespace.h> #include <uapi/linux/devlink.h>
@@ -53,6 +54,9 @@ struct devlink_port {struct devlink *devlink;unsigned index;bool registered; +spinlock_t type_lock;/* Protects type and type_dev +* pointer consistency. +*/ enum devlink_port_type type;enum devlink_port_type desired_type;void *type_dev;
net/core/devlink.c +13 -4
@@ -19,6 +19,7 @@#include <linux/device.h> #include <linux/list.h> #include <linux/netdevice.h> +#include <linux/spinlock.h> #include <rdma/ib_verbs.h> #include <net/netlink.h> #include <net/genetlink.h>
@@ -543,12 +544,14 @@ static int devlink_nl_port_fill(struct sk_buff *msg, struct devlink *devlink, goto nla_put_failure;if (nla_put_u32 (msg,DEVLINK_ATTR_PORT_INDEX , devlink_port->index)) goto nla_put_failure; + +spin_lock (&devlink_port->type_lock);if (nla_put_u16 (msg,DEVLINK_ATTR_PORT_TYPE , devlink_port->type)) - goto nla_put_failure; + goto nla_put_failure_type_locked;if (devlink_port->desired_type !=DEVLINK_PORT_TYPE_NOTSET &&nla_put_u16 (msg,DEVLINK_ATTR_PORT_DESIRED_TYPE , devlink_port->desired_type)) - goto nla_put_failure; + goto nla_put_failure_type_locked;if (devlink_port->type ==DEVLINK_PORT_TYPE_ETH ) {struct net_device *netdev = devlink_port->type_dev;
@@ -557,7 +560,7 @@ static int devlink_nl_port_fill(struct sk_buff *msg, struct devlink *devlink, netdev->ifindex) || nla_put_string(msg, DEVLINK_ATTR_PORT_NETDEV_NAME, netdev->name))) - goto nla_put_failure; + goto nla_put_failure_type_locked; }if (devlink_port->type ==DEVLINK_PORT_TYPE_IB ) {struct ib_device *ibdev = devlink_port->type_dev;
@@ -565,14 +568,17 @@ static int devlink_nl_port_fill(struct sk_buff *msg, struct devlink *devlink,if (ibdev &&nla_put_string (msg,DEVLINK_ATTR_PORT_IBDEV_NAME , ibdev->name)) - goto nla_put_failure; + goto nla_put_failure_type_locked; } +spin_unlock (&devlink_port->type_lock);if (devlink_nl_port_attrs_put (msg, devlink_port)) goto nla_put_failure;genlmsg_end (msg, hdr);return 0 ; +nla_put_failure_type_locked: +spin_unlock (&devlink_port->type_lock); nla_put_failure:genlmsg_cancel (msg, hdr);return -EMSGSIZE ;
@@ -5342,6 +5348,7 @@ int devlink_port_register(struct devlink *devlink, devlink_port->devlink = devlink; devlink_port->index = port_index; devlink_port->registered = true; +spin_lock_init (&devlink_port->type_lock);list_add_tail (&devlink_port->list, &devlink->port_list);INIT_LIST_HEAD (&devlink_port->param_list);mutex_unlock (&devlink->lock);
@@ -5372,8 +5379,10 @@ static void __devlink_port_type_set(struct devlink_port *devlink_port, {if (WARN_ON (!devlink_port->registered))return ; +spin_lock (&devlink_port->type_lock); devlink_port->type = type; devlink_port->type_dev = type_dev; +spin_unlock (&devlink_port->type_lock);devlink_port_notify (devlink_port,DEVLINK_CMD_PORT_NEW ); }
Signature · 1 line
2.17.2
Jiri Pirko
maintainerPATCH v3 15/15 net: devlink: select NET_DEVLINK from drivers
In reply to Jiri PirkoFrom: Jiri Pirko <[email protected]>
Some drivers are becoming more dependent on NET_DEVLINK being selected in configuration. With upcoming compat functions, the behavior would be wrong in case devlink was not compiled in. So make the drivers select NET_DEVLINK and rely on the functions being there, not just stubs.
--- drivers/net/Kconfig | 1 + drivers/net/ethernet/broadcom/Kconfig | 1 + drivers/net/ethernet/cavium/Kconfig | 1 + drivers/net/ethernet/mellanox/mlx4/Kconfig | 1 + .../net/ethernet/mellanox/mlx5/core/Kconfig | 1 + drivers/net/ethernet/mellanox/mlxsw/Kconfig | 1 + drivers/net/ethernet/netronome/Kconfig | 1 + include/net/devlink.h | 495 +----------------- net/Kconfig | 7 +- net/dsa/Kconfig | 1 + 10 files changed, 13 insertions(+), 497 deletions(-)
drivers/net/Kconfig +1 -0
@@ -505,6 +505,7 @@ source "drivers/net/hyperv/Kconfig" config NETDEVSIM tristate "Simulated networking device" depends on DEBUG_FS + select NET_DEVLINK help This driver is a developer testing tool and software model that can be used to test various control path networking APIs, especially
drivers/net/ethernet/broadcom/Kconfig +1 -0
@@ -196,6 +196,7 @@ config BNXT depends on PCI select FW_LOADER select LIBCRC32C + select NET_DEVLINK ---help--- This driver supports Broadcom NetXtreme-C/E 10/25/40/50 gigabit Ethernet cards. To compile this driver as a module, choose M here:
drivers/net/ethernet/cavium/Kconfig +1 -0
@@ -68,6 +68,7 @@ config LIQUIDIO imply PTP_1588_CLOCK select FW_LOADER select LIBCRC32C + select NET_DEVLINK ---help--- This driver supports Cavium LiquidIO Intelligent Server Adapters based on CN66XX, CN68XX and CN23XX chips.
drivers/net/ethernet/mellanox/mlx4/Kconfig +1 -0
@@ -26,6 +26,7 @@ config MLX4_EN_DCB config MLX4_CORE tristate depends on PCI + select NET_DEVLINK default n config MLX4_DEBUG
drivers/net/ethernet/mellanox/mlx5/core/Kconfig +1 -0
@@ -5,6 +5,7 @@ config MLX5_CORE tristate "Mellanox 5th generation network adapters (ConnectX series) core driver" depends on PCI + select NET_DEVLINK imply PTP_1588_CLOCK imply VXLAN default n
drivers/net/ethernet/mellanox/mlxsw/Kconfig +1 -0
@@ -4,6 +4,7 @@ config MLXSW_CORE tristate "Mellanox Technologies Switch ASICs support" + select NET_DEVLINK ---help--- This driver supports Mellanox Technologies Switch ASICs family.
drivers/net/ethernet/netronome/Kconfig +1 -0
@@ -19,6 +19,7 @@ config NFP tristate "Netronome(R) NFP4000/NFP6000 NIC driver" depends on PCI && PCI_MSI depends on VXLAN || VXLAN=n + select NET_DEVLINK ---help--- This driver supports the Netronome(R) NFP4000/NFP6000 based cards working as a advanced Ethernet NIC. It works with both
include/net/devlink.h +3 -492
526 lines not on this page · raw message
net/Kconfig +2 -5
@@ -429,11 +429,8 @@ config NET_SOCK_MSG with the help of BPF programs. config NET_DEVLINK - bool "Network physical/parent device Netlink interface" - help - Network physical/parent device Netlink interface provides - infrastructure to support access to physical chip-wide config and - monitoring. + bool + default n config PAGE_POOL bool
net/dsa/Kconfig +1 -0
@@ -10,6 +10,7 @@ config NET_DSA depends on BRIDGE || BRIDGE=n select NET_SWITCHDEV select PHYLINK + select NET_DEVLINK ---help--- Say Y if you want to enable support for the hardware switches supported by the Distributed Switch Architecture.
Signature · 1 line
2.17.2
David Miller
maintainerFrom: Jiri Pirko <[email protected]>
Date: Sun, 24 Mar 2019 11:14:23 +0100
Quoted 1 line
Mostly cosmetics and janitor work.
Series applied, thanks Jiri.