net: call for phys_port_name into devlink directly if possible
Subsystems (7)
Jiri Pirko
maintainerv3 cover net: call for phys_port_name into devlink directly if possible
From: Jiri Pirko <[email protected]>
phys_port_name may be assembled by a helper in devlink. It is currently the case only for mlxsw driver. Benefit from the get_devlink_port ndo and call into devlink directly from dev_get_phys_port_name(). That saves the trip to the driver, simplifies the code and makes it similar to recently introduced ethtool-devlink compat helpers.
Move bnxt, dsa and partly nfp to let devlink core generate the name too.
Jiri Pirko (12):
nfp: register devlink port before netdev
net: replace ndo_get_devlink with ndo_get_devlink_port
net: devlink: introduce devlink_compat_phys_port_name_get()
mlxsw: Implement ndo_get_devlink_port
mlxsw: Remove ndo_get_phys_port_name implementation
net: devlink: remove unused devlink_port_get_phys_port_name() function
bnxt: implement ndo_get_devlink_port
bnxt: remove ndo_get_phys_port_name implementation
dsa: implement ndo_get_devlink_port
dsa: don't fill-up remove ndo_get_phys_port_name for slaves
nfp: do not handle nn->port defined case in
nfp_net_get_phys_port_name()
net: devlink: add warning for ndo_get_phys_port_name set when not
needed
drivers/net/ethernet/broadcom/bnxt/bnxt.c | 26 +++------- drivers/net/ethernet/mellanox/mlxsw/core.c | 10 ++-- drivers/net/ethernet/mellanox/mlxsw/core.h | 5 +- drivers/net/ethernet/mellanox/mlxsw/minimal.c | 22 ++++----- .../net/ethernet/mellanox/mlxsw/spectrum.c | 22 ++++----- .../net/ethernet/mellanox/mlxsw/switchx2.c | 22 ++++----- drivers/net/ethernet/netronome/nfp/nfp_app.h | 2 +- .../net/ethernet/netronome/nfp/nfp_devlink.c | 10 ++-- .../ethernet/netronome/nfp/nfp_net_common.c | 7 ++- .../net/ethernet/netronome/nfp/nfp_net_main.c | 32 ++++++------ .../net/ethernet/netronome/nfp/nfp_net_repr.c | 2 +- include/linux/netdevice.h | 6 +-- include/net/devlink.h | 25 ++++++++-- net/core/dev.c | 11 +++-- net/core/devlink.c | 41 ++++++++++++++-- net/dsa/dsa_priv.h | 1 + net/dsa/legacy.c | 2 +- net/dsa/slave.c | 49 +++++++++++++++++-- 18 files changed, 197 insertions(+), 98 deletions(-)
Signature · 1 line
2.17.2
Jiri Pirko
maintainerPATCH v3 1/12 nfp: register devlink port before netdev
From: Jiri Pirko <[email protected]>
Change the init/fini flow and register devlink port instance before netdev. Now it is needed for correct behavior of phys_port_name generation, but in general it makes sense to register devlink port first.
---v1->v2:
- new patch
--- .../net/ethernet/netronome/nfp/nfp_net_main.c | 32 ++++++++++--------- 1 file changed, 17 insertions(+), 15 deletions(-)
drivers/net/ethernet/netronome/nfp/nfp_net_main.c +17 -15
@@ -150,37 +150,39 @@ nfp_net_pf_init_vnic(struct nfp_pf *pf, struct nfp_net *nn, unsigned int id) nn->id = id; +if (nn->port) { + err =nfp_devlink_port_register (pf->app, nn->port); +if (err) +return err; + } + err =nfp_net_init (nn);if (err) -return err; + goto err_devlink_port_clean;nfp_net_debugfs_vnic_add (nn, pf->ddir); -if (nn->port) { - err =nfp_devlink_port_register (pf->app, nn->port); -if (err) - goto err_dfs_clean; +if (nn->port)nfp_devlink_port_type_eth_set (nn->port); - }nfp_net_info (nn);if (nfp_net_is_data_vnic (nn)) { err =nfp_app_vnic_init (pf->app, nn);if (err) - goto err_devlink_port_clean; + goto err_devlink_port_type_clean; }return 0 ; -err_devlink_port_clean: -if (nn->port) { +err_devlink_port_type_clean: +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); +err_devlink_port_clean: +if (nn->port) +nfp_devlink_port_unregister (nn->port);return err; }
@@ -223,12 +225,12 @@ 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); +if (nn->port) +nfp_devlink_port_unregister (nn->port); }static int nfp_net_pf_alloc_irqs (struct nfp_pf *pf)
Signature · 1 line
2.17.2
Re: [patch net-next v3 01/12] nfp: register devlink port before netdev
Quoted 8 lines · Jiri Pirko
From: Jiri Pirko <[email protected]>
Change the init/fini flow and register devlink port instance before netdev. Now it is needed for correct behavior of
phys_port_namegeneration, but in general it makes sense to register devlink port first.Signed-off-by Jiri Pirko <[email protected]>
Jiri Pirko
maintainerPATCH v3 2/12 net: replace ndo_get_devlink with ndo_get_devlink_port
In reply to Jiri PirkoFrom: Jiri Pirko <[email protected]>
Follow-up patch is going to need a devlink port instance according to a netdev. Devlink port instance should be always available when devlink is used. So change the recently introduced ndo_get_devlink to ndo_get_devlink_port. With that, adjust the wrapper for the only user to get devlink pointer.
---v1->v2:
- s/for/with/ in patch subject
- rebased
--- drivers/net/ethernet/netronome/nfp/nfp_app.h | 2 +- drivers/net/ethernet/netronome/nfp/nfp_devlink.c | 10 +++++----- .../net/ethernet/netronome/nfp/nfp_net_common.c | 2 +- drivers/net/ethernet/netronome/nfp/nfp_net_repr.c | 2 +- include/linux/netdevice.h | 6 +++--- include/net/devlink.h | 14 ++++++++++++-- 6 files changed, 23 insertions(+), 13 deletions(-)
drivers/net/ethernet/netronome/nfp/nfp_app.h +1 -1
@@ -433,6 +433,6 @@ int nfp_app_nic_vnic_alloc(struct nfp_app *app, struct nfp_net *nn,int nfp_app_nic_vnic_init_phy_port (struct nfp_pf *pf,struct nfp_app *app,struct nfp_net *nn,unsigned int id); -struct devlink *nfp_devlink_get_devlink (struct net_device *netdev); +struct devlink_port *nfp_devlink_get_devlink_port (struct net_device *netdev);#endif
drivers/net/ethernet/netronome/nfp/nfp_devlink.c +5 -5
@@ -386,13 +386,13 @@ 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 devlink_port *nfp_devlink_get_devlink_port (struct net_device *netdev) { -struct nfp_app *app; +struct nfp_port *port; - app =nfp_app_from_netdev (netdev); -if (!app) + port =nfp_port_from_netdev (netdev); +if (!port)return NULL ; -return priv_to_devlink (app->pf); +return &port->dl_port; }
drivers/net/ethernet/netronome/nfp/nfp_net_common.c +1 -1
@@ -3531,7 +3531,7 @@ const struct net_device_ops nfp_net_netdev_ops = { .ndo_udp_tunnel_del = nfp_net_del_vxlan_port, .ndo_bpf = nfp_net_xdp, .ndo_get_port_parent_id = nfp_port_get_port_parent_id, - .ndo_get_devlink = nfp_devlink_get_devlink, + .ndo_get_devlink_port = nfp_devlink_get_devlink_port, };/**
drivers/net/ethernet/netronome/nfp/nfp_net_repr.c +1 -1
@@ -273,7 +273,7 @@ const struct net_device_ops nfp_repr_netdev_ops = { .ndo_set_features = nfp_port_set_features, .ndo_set_mac_address = eth_mac_addr, .ndo_get_port_parent_id = nfp_port_get_port_parent_id, - .ndo_get_devlink = nfp_devlink_get_devlink, + .ndo_get_devlink_port = nfp_devlink_get_devlink_port, };void
include/linux/netdevice.h +3 -3
@@ -1250,8 +1250,8 @@ struct devlink;* that got dropped are freed/returned via xdp_return_frame(). * Returns negative number, means general error invoking ndo, meaning * no frames were xmit'ed and core-caller will free all frames. -* struct devlink *(*ndo_get_devlink)(struct net_device *dev); -* Get devlink instance associated with a given netdev. +* struct devlink_port *(*ndo_get_devlink_port)(struct net_device *dev); +* Get devlink port instance associated with a given netdev. * Called with a reference on the netdevice and devlink locks only, * rtnl_lock is not held. */
@@ -1451,7 +1451,7 @@ struct net_device_ops { u32 flags);int (*ndo_xsk_async_xmit)(struct net_device *dev,u32 queue_id); -struct devlink * (*ndo_get_devlink)(struct net_device *dev); +struct devlink_port * (*ndo_get_devlink_port)(struct net_device *dev); };/**
include/net/devlink.h +12 -2
@@ -547,10 +547,20 @@ static inline struct devlink *priv_to_devlink(void *priv) return container_of(priv, struct devlink, priv); } +static inline struct devlink_port * +netdev_to_devlink_port (struct net_device *dev) +{ +if (dev->netdev_ops->ndo_get_devlink_port) +return dev->netdev_ops->ndo_get_devlink_port (dev); +return NULL ; +} +static inline struct devlink *netdev_to_devlink (struct net_device *dev) { -if (dev->netdev_ops->ndo_get_devlink) -return dev->netdev_ops->ndo_get_devlink (dev); +struct devlink_port *devlink_port =netdev_to_devlink_port (dev); + +if (devlink_port) +return devlink_port->devlink;return NULL ; }
Signature · 1 line
2.17.2
Re: [patch net-next v3 02/12] net: replace ndo_get_devlink with ndo_get_devlink_port
Quoted 11 lines · Jiri Pirko
From: Jiri Pirko <[email protected]>
Follow-up patch is going to need a devlink port instance according to a netdev. Devlink port instance should be always available when devlink is used. So change the recently introduced
ndo_get_devlinktondo_get_devlink_port. With that, adjust the wrapper for the only user to get devlink pointer.Signed-off-by Jiri Pirko <[email protected]>Reviewed-by Michal Kubecek <[email protected]>Reviewed-by Florian Fainelli <[email protected]>
Jiri Pirko
maintainerPATCH v3 3/12 net: devlink: introduce devlink_compat_phys_port_name_get()
In reply to Jiri PirkoFrom: Jiri Pirko <[email protected]>
Introduce devlink_compat_phys_port_name_get() helper that gets the physical port name for specified netdevice according to devlink port attributes.
Call this helper from dev_get_phys_port_name() in case ndo_get_phys_port_name is not defined.
---v1->v2:
- don't take devlink locks
- try ndo first and if it returns EOPNOTSUPP fallback to devlink
- rebase
--- include/net/devlink.h | 9 +++++++++ net/core/dev.c | 11 ++++++++--- net/core/devlink.c | 28 ++++++++++++++++++++++++++-- 3 files changed, 43 insertions(+), 5 deletions(-)
include/net/devlink.h +9 -0
@@ -739,6 +739,8 @@ devlink_health_reporter_state_update(struct devlink_health_reporter *reporter,void devlink_compat_running_version (struct net_device *dev,char *buf,size_t len);int devlink_compat_flash_update (struct net_device *dev,const char *file_name); +int devlink_compat_phys_port_name_get (struct net_device *dev, +char *name,size_t len);#else
@@ -753,6 +755,13 @@ devlink_compat_flash_update(struct net_device *dev, const char *file_name)return -EOPNOTSUPP ; } +static inline int +devlink_compat_phys_port_name_get (struct net_device *dev, +char *name,size_t len) +{ +return -EOPNOTSUPP ; +} +#endif #endif /* _NET_DEVLINK_H_ */
net/core/dev.c +8 -3
@@ -146,6 +146,7 @@#include <net/udp_tunnel.h> #include <linux/net_namespace.h> #include <linux/indirect_call_wrapper.h> +#include <net/devlink.h> #include "net-sysfs.h"
@@ -7877,10 +7878,14 @@ int dev_get_phys_port_name(struct net_device *dev, char *name, size_t len) {const struct net_device_ops *ops = dev->netdev_ops; +int err; -if (!ops->ndo_get_phys_port_name) -return -EOPNOTSUPP ; -return ops->ndo_get_phys_port_name (dev, name, len); +if (ops->ndo_get_phys_port_name) { + err = ops->ndo_get_phys_port_name (dev, name, len); +if (err != -EOPNOTSUPP ) +return err; + } +return devlink_compat_phys_port_name_get (dev, name, len); }EXPORT_SYMBOL (dev_get_phys_port_name);
net/core/devlink.c +26 -2
@@ -5414,8 +5414,8 @@ void devlink_port_attrs_set(struct devlink_port *devlink_port, }EXPORT_SYMBOL_GPL (devlink_port_attrs_set); -int devlink_port_get_phys_port_name (struct devlink_port *devlink_port, -char *name,size_t len) +static int __devlink_port_phys_port_name_get (struct devlink_port *devlink_port, +char *name,size_t len) {struct devlink_port_attrs *attrs = &devlink_port->attrs;int n =0 ;
@@ -5445,6 +5445,12 @@ int devlink_port_get_phys_port_name(struct devlink_port *devlink_port,return 0 ; } + +int devlink_port_get_phys_port_name (struct devlink_port *devlink_port, +char *name,size_t len) +{ +return __devlink_port_phys_port_name_get (devlink_port, name, len); +}EXPORT_SYMBOL_GPL (devlink_port_get_phys_port_name); int devlink_sb_register(struct devlink *devlink, unsigned int sb_index,
@@ -6459,6 +6465,24 @@ int devlink_compat_flash_update(struct net_device *dev, const char *file_name)return ret; } +int devlink_compat_phys_port_name_get (struct net_device *dev, +char *name,size_t len) +{ +struct devlink_port *devlink_port; + +/* RTNL mutex is held here which ensures that devlink_port +* instance cannot disappear in the middle. No need to take +* any devlink lock as only permanent values are accessed. +*/ +ASSERT_RTNL (); + + devlink_port =netdev_to_devlink_port (dev); +if (!devlink_port) +return -EOPNOTSUPP ; + +return __devlink_port_phys_port_name_get (devlink_port, name, len); +} +static int __init devlink_init (void ) {return genl_register_family (&devlink_nl_family);
Signature · 1 line
2.17.2
Jiri Pirko
maintainerPATCH v3 4/12 mlxsw: Implement ndo_get_devlink_port
In reply to Jiri PirkoFrom: Jiri Pirko <[email protected]>
In order for devlink compat functions to work, implement ndo_get_devlink_port.
--- drivers/net/ethernet/mellanox/mlxsw/core.c | 12 ++++++++++++ drivers/net/ethernet/mellanox/mlxsw/core.h | 3 +++ drivers/net/ethernet/mellanox/mlxsw/minimal.c | 11 +++++++++++ drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 11 +++++++++++ drivers/net/ethernet/mellanox/mlxsw/switchx2.c | 11 +++++++++++ 5 files changed, 48 insertions(+)
drivers/net/ethernet/mellanox/mlxsw/core.c +12 -0
@@ -1807,6 +1807,18 @@ int mlxsw_core_port_get_phys_port_name(struct mlxsw_core *mlxsw_core, }EXPORT_SYMBOL (mlxsw_core_port_get_phys_port_name); +struct devlink_port * +mlxsw_core_port_devlink_port_get (struct mlxsw_core *mlxsw_core, +u8 local_port) +{ +struct mlxsw_core_port *mlxsw_core_port = + &mlxsw_core->ports[local_port]; +struct devlink_port *devlink_port = &mlxsw_core_port->devlink_port; + +return devlink_port; +} +EXPORT_SYMBOL (mlxsw_core_port_devlink_port_get); +static void mlxsw_core_buf_dump_dbg (struct mlxsw_core *mlxsw_core,const char *buf,size_t size) {
drivers/net/ethernet/mellanox/mlxsw/core.h +3 -0
@@ -178,6 +178,9 @@ enum devlink_port_type mlxsw_core_port_type_get(struct mlxsw_core *mlxsw_core, u8 local_port);int mlxsw_core_port_get_phys_port_name (struct mlxsw_core *mlxsw_core,u8 local_port,char *name,size_t len); +struct devlink_port * +mlxsw_core_port_devlink_port_get (struct mlxsw_core *mlxsw_core, +u8 local_port);int mlxsw_core_schedule_dw (struct delayed_work *dwork,unsigned long delay);bool mlxsw_core_schedule_work (struct work_struct *work);
drivers/net/ethernet/mellanox/mlxsw/minimal.c +11 -0
@@ -73,11 +73,22 @@ static int mlxsw_m_port_get_port_parent_id(struct net_device *dev,return 0 ; } +static struct devlink_port * +mlxsw_m_port_get_devlink_port (struct net_device *dev) +{ +struct mlxsw_m_port *mlxsw_m_port =netdev_priv (dev); +struct mlxsw_m *mlxsw_m = mlxsw_m_port->mlxsw_m; + +return mlxsw_core_port_devlink_port_get (mlxsw_m->core, + mlxsw_m_port->local_port); +} +static const struct net_device_ops mlxsw_m_port_netdev_ops = { .ndo_open = mlxsw_m_port_dummy_open_stop, .ndo_stop = mlxsw_m_port_dummy_open_stop, .ndo_get_phys_port_name = mlxsw_m_port_get_phys_port_name, .ndo_get_port_parent_id = mlxsw_m_port_get_port_parent_id, + .ndo_get_devlink_port = mlxsw_m_port_get_devlink_port, }; static int mlxsw_m_get_module_info(struct net_device *netdev,
drivers/net/ethernet/mellanox/mlxsw/spectrum.c +11 -0
@@ -1726,6 +1726,16 @@ static int mlxsw_sp_port_get_port_parent_id(struct net_device *dev,return 0 ; } +static struct devlink_port * +mlxsw_sp_port_get_devlink_port (struct net_device *dev) +{ +struct mlxsw_sp_port *mlxsw_sp_port =netdev_priv (dev); +struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp; + +return mlxsw_core_port_devlink_port_get (mlxsw_sp->core, + mlxsw_sp_port->local_port); +} +static const struct net_device_ops mlxsw_sp_port_netdev_ops = { .ndo_open = mlxsw_sp_port_open, .ndo_stop = mlxsw_sp_port_stop,
@@ -1742,6 +1752,7 @@ static const struct net_device_ops mlxsw_sp_port_netdev_ops = { .ndo_get_phys_port_name = mlxsw_sp_port_get_phys_port_name, .ndo_set_features = mlxsw_sp_set_features, .ndo_get_port_parent_id = mlxsw_sp_port_get_port_parent_id, + .ndo_get_devlink_port = mlxsw_sp_port_get_devlink_port, }; static void mlxsw_sp_port_get_drvinfo(struct net_device *dev,
drivers/net/ethernet/mellanox/mlxsw/switchx2.c +11 -0
@@ -401,6 +401,16 @@ static int mlxsw_sx_port_get_port_parent_id(struct net_device *dev,return 0 ; } +static struct devlink_port * +mlxsw_sx_port_get_devlink_port (struct net_device *dev) +{ +struct mlxsw_sx_port *mlxsw_sx_port =netdev_priv (dev); +struct mlxsw_sx *mlxsw_sx = mlxsw_sx_port->mlxsw_sx; + +return mlxsw_core_port_devlink_port_get (mlxsw_sx->core, + mlxsw_sx_port->local_port); +} +static const struct net_device_ops mlxsw_sx_port_netdev_ops = { .ndo_open = mlxsw_sx_port_open, .ndo_stop = mlxsw_sx_port_stop,
@@ -409,6 +419,7 @@ static const struct net_device_ops mlxsw_sx_port_netdev_ops = { .ndo_get_stats64 = mlxsw_sx_port_get_stats64, .ndo_get_phys_port_name = mlxsw_sx_port_get_phys_port_name, .ndo_get_port_parent_id = mlxsw_sx_port_get_port_parent_id, + .ndo_get_devlink_port = mlxsw_sx_port_get_devlink_port, }; static void mlxsw_sx_port_get_drvinfo(struct net_device *dev,
Signature · 1 line
2.17.2
Jiri Pirko
maintainerPATCH v3 5/12 mlxsw: Remove ndo_get_phys_port_name implementation
In reply to Jiri PirkoFrom: Jiri Pirko <[email protected]>
Rely on the previously introduced fallback and let the core call devlink directly in order to get the physical port name.
---v1->v2:
- adjusted patch description
--- drivers/net/ethernet/mellanox/mlxsw/core.c | 10 ---------- drivers/net/ethernet/mellanox/mlxsw/core.h | 2 -- drivers/net/ethernet/mellanox/mlxsw/minimal.c | 11 ----------- drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 11 ----------- drivers/net/ethernet/mellanox/mlxsw/switchx2.c | 11 ----------- 5 files changed, 45 deletions(-)
drivers/net/ethernet/mellanox/mlxsw/core.c +0 -10
@@ -1796,16 +1796,6 @@ enum devlink_port_type mlxsw_core_port_type_get(struct mlxsw_core *mlxsw_core, }EXPORT_SYMBOL (mlxsw_core_port_type_get); -int mlxsw_core_port_get_phys_port_name (struct mlxsw_core *mlxsw_core, -u8 local_port,char *name,size_t len) -{ -struct mlxsw_core_port *mlxsw_core_port = - &mlxsw_core->ports[local_port]; -struct devlink_port *devlink_port = &mlxsw_core_port->devlink_port; - -return devlink_port_get_phys_port_name (devlink_port, name, len); -} -EXPORT_SYMBOL (mlxsw_core_port_get_phys_port_name);struct devlink_port * mlxsw_core_port_devlink_port_get(struct mlxsw_core *mlxsw_core,
drivers/net/ethernet/mellanox/mlxsw/core.h +0 -2
@@ -176,8 +176,6 @@ void mlxsw_core_port_clear(struct mlxsw_core *mlxsw_core, u8 local_port, void *port_driver_priv);enum devlink_port_type mlxsw_core_port_type_get (struct mlxsw_core *mlxsw_core,u8 local_port); -int mlxsw_core_port_get_phys_port_name (struct mlxsw_core *mlxsw_core, -u8 local_port,char *name,size_t len);struct devlink_port *mlxsw_core_port_devlink_port_get (struct mlxsw_core *mlxsw_core,u8 local_port);
drivers/net/ethernet/mellanox/mlxsw/minimal.c +0 -11
@@ -51,16 +51,6 @@ static int mlxsw_m_port_dummy_open_stop(struct net_device *dev)return 0 ; } -static int -mlxsw_m_port_get_phys_port_name (struct net_device *dev,char *name,size_t len) -{ -struct mlxsw_m_port *mlxsw_m_port =netdev_priv (dev); -struct mlxsw_core *core = mlxsw_m_port->mlxsw_m->core; -u8 local_port = mlxsw_m_port->local_port; - -return mlxsw_core_port_get_phys_port_name (core, local_port, name, len); -} -static int mlxsw_m_port_get_port_parent_id (struct net_device *dev,struct netdev_phys_item_id *ppid) {
@@ -86,7 +76,6 @@ mlxsw_m_port_get_devlink_port(struct net_device *dev)static const struct net_device_ops mlxsw_m_port_netdev_ops = { .ndo_open = mlxsw_m_port_dummy_open_stop, .ndo_stop = mlxsw_m_port_dummy_open_stop, - .ndo_get_phys_port_name = mlxsw_m_port_get_phys_port_name, .ndo_get_port_parent_id = mlxsw_m_port_get_port_parent_id, .ndo_get_devlink_port = mlxsw_m_port_get_devlink_port, };
drivers/net/ethernet/mellanox/mlxsw/spectrum.c +0 -11
@@ -1254,16 +1254,6 @@ static int mlxsw_sp_port_kill_vid(struct net_device *dev,return 0 ; } -static int mlxsw_sp_port_get_phys_port_name (struct net_device *dev,char *name, -size_t len) -{ -struct mlxsw_sp_port *mlxsw_sp_port =netdev_priv (dev); - -return mlxsw_core_port_get_phys_port_name (mlxsw_sp_port->mlxsw_sp->core, - mlxsw_sp_port->local_port, - name, len); -} -static struct mlxsw_sp_port_mall_tc_entry *mlxsw_sp_port_mall_tc_entry_find (struct mlxsw_sp_port *port,unsigned long cookie) {
@@ -1749,7 +1739,6 @@ static const struct net_device_ops mlxsw_sp_port_netdev_ops = { .ndo_get_offload_stats = mlxsw_sp_port_get_offload_stats, .ndo_vlan_rx_add_vid = mlxsw_sp_port_add_vid, .ndo_vlan_rx_kill_vid = mlxsw_sp_port_kill_vid, - .ndo_get_phys_port_name = mlxsw_sp_port_get_phys_port_name, .ndo_set_features = mlxsw_sp_set_features, .ndo_get_port_parent_id = mlxsw_sp_port_get_port_parent_id, .ndo_get_devlink_port = mlxsw_sp_port_get_devlink_port,
drivers/net/ethernet/mellanox/mlxsw/switchx2.c +0 -11
@@ -379,16 +379,6 @@ mlxsw_sx_port_get_stats64(struct net_device *dev, stats->tx_dropped = tx_dropped; } -static int mlxsw_sx_port_get_phys_port_name (struct net_device *dev,char *name, -size_t len) -{ -struct mlxsw_sx_port *mlxsw_sx_port =netdev_priv (dev); - -return mlxsw_core_port_get_phys_port_name (mlxsw_sx_port->mlxsw_sx->core, - mlxsw_sx_port->local_port, - name, len); -} -static int mlxsw_sx_port_get_port_parent_id (struct net_device *dev,struct netdev_phys_item_id *ppid) {
@@ -417,7 +407,6 @@ static const struct net_device_ops mlxsw_sx_port_netdev_ops = { .ndo_start_xmit = mlxsw_sx_port_xmit, .ndo_change_mtu = mlxsw_sx_port_change_mtu, .ndo_get_stats64 = mlxsw_sx_port_get_stats64, - .ndo_get_phys_port_name = mlxsw_sx_port_get_phys_port_name, .ndo_get_port_parent_id = mlxsw_sx_port_get_port_parent_id, .ndo_get_devlink_port = mlxsw_sx_port_get_devlink_port, };
Signature · 1 line
2.17.2
Jiri Pirko
maintainerPATCH v3 6/12 net: devlink: remove unused devlink_port_get_phys_port_name() function
In reply to Jiri PirkoFrom: Jiri Pirko <[email protected]>
Now it is unused, remove it.
---v1->v2:
- rebase
--- include/net/devlink.h | 2 -- net/core/devlink.c | 7 ------- 2 files changed, 9 deletions(-)
include/net/devlink.h +0 -2
@@ -583,8 +583,6 @@ void devlink_port_attrs_set(struct devlink_port *devlink_port,enum devlink_port_flavour flavour, u32 port_number, bool split, u32 split_subport_number); -int devlink_port_get_phys_port_name (struct devlink_port *devlink_port, -char *name,size_t len); 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,
net/core/devlink.c +0 -7
@@ -5446,13 +5446,6 @@ static int __devlink_port_phys_port_name_get(struct devlink_port *devlink_port,return 0 ; } -int devlink_port_get_phys_port_name (struct devlink_port *devlink_port, -char *name,size_t len) -{ -return __devlink_port_phys_port_name_get (devlink_port, name, len); -} -EXPORT_SYMBOL_GPL (devlink_port_get_phys_port_name); - 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,
Signature · 1 line
2.17.2
Jiri Pirko
maintainerPATCH v3 7/12 bnxt: implement ndo_get_devlink_port
In reply to Jiri PirkoFrom: Jiri Pirko <[email protected]>
In order for devlink compat functions to work, implement ndo_get_devlink_port. Legacy slaves does not have devlink port instances created for themselves.
---v1->v2:
- new patch
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +9 -1
@@ -10083,6 +10083,13 @@ int bnxt_get_port_parent_id(struct net_device *dev,return 0 ; } +static struct devlink_port *bnxt_get_devlink_port (struct net_device *dev) +{ +struct bnxt *bp =netdev_priv (dev); + +return &bp->dl_port; +} +static const struct net_device_ops bnxt_netdev_ops = { .ndo_open = bnxt_open, .ndo_start_xmit = bnxt_start_xmit,
@@ -10115,7 +10122,8 @@ static const struct net_device_ops bnxt_netdev_ops = { .ndo_bridge_getlink = bnxt_bridge_getlink, .ndo_bridge_setlink = bnxt_bridge_setlink, .ndo_get_port_parent_id = bnxt_get_port_parent_id, - .ndo_get_phys_port_name = bnxt_get_phys_port_name + .ndo_get_phys_port_name = bnxt_get_phys_port_name, + .ndo_get_devlink_port = bnxt_get_devlink_port, };static void bnxt_remove_one (struct pci_dev *pdev)
Signature · 1 line
2.17.2
Jiri Pirko
maintainerPATCH v3 8/12 bnxt: remove ndo_get_phys_port_name implementation
In reply to Jiri PirkoFrom: Jiri Pirko <[email protected]>
Rely on the previously introduced fallback and let the core call devlink in order to get the physical port name.
---v1->v2:
- new patch
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 18 ------------------ 1 file changed, 18 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +0 -18
@@ -10048,23 +10048,6 @@ static int bnxt_bridge_setlink(struct net_device *dev, struct nlmsghdr *nlh,return rc; } -static int bnxt_get_phys_port_name (struct net_device *dev,char *buf, -size_t len) -{ -struct bnxt *bp =netdev_priv (dev); -int rc; - -/* The PF and it's VF-reps only support the switchdev framework */ -if (!BNXT_PF (bp)) -return -EOPNOTSUPP ; - - rc =snprintf (buf, len,"p%d" , bp->pf.port_id); - -if (rc >= len) -return -EOPNOTSUPP ; -return 0 ; -} -int bnxt_get_port_parent_id (struct net_device *dev,struct netdev_phys_item_id *ppid) {
@@ -10122,7 +10105,6 @@ static const struct net_device_ops bnxt_netdev_ops = { .ndo_bridge_getlink = bnxt_bridge_getlink, .ndo_bridge_setlink = bnxt_bridge_setlink, .ndo_get_port_parent_id = bnxt_get_port_parent_id, - .ndo_get_phys_port_name = bnxt_get_phys_port_name, .ndo_get_devlink_port = bnxt_get_devlink_port, };
Signature · 1 line
2.17.2
Jiri Pirko
maintainerPATCH v3 9/12 dsa: implement ndo_get_devlink_port
In reply to Jiri PirkoFrom: Jiri Pirko <[email protected]>
In order for devlink compat functions to work, implement ndo_get_devlink_port. Legacy slaves does not have devlink port instances created for themselves.
---v1->v2:
- new patch
--- net/dsa/dsa_priv.h | 1 + net/dsa/legacy.c | 2 +- net/dsa/slave.c | 48 ++++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 48 insertions(+), 3 deletions(-)
net/dsa/dsa_priv.h +1 -0
@@ -176,6 +176,7 @@ void dsa_port_link_unregister_of(struct dsa_port *dp);extern const struct dsa_device_ops notag_netdev_ops;void dsa_slave_mii_bus_init (struct dsa_switch *ds);int dsa_slave_create (struct dsa_port *dp); +int dsa_slave_create_legacy (struct dsa_port *dp);void dsa_slave_destroy (struct net_device *slave_dev);int dsa_slave_suspend (struct net_device *slave_dev);int dsa_slave_resume (struct net_device *slave_dev);
net/dsa/legacy.c +1 -1
@@ -197,7 +197,7 @@ static int dsa_switch_setup_one(struct dsa_switch *ds,if (!dsa_is_user_port (ds, i))continue ; - ret =dsa_slave_create (&ds->ports[i]); + ret =dsa_slave_create_legacy (&ds->ports[i]);if (ret <0 )netdev_err (master,"[%d]: can't create dsa slave device for port %d(%s): %d\n" , index, i, cd->port_names[i], ret);
net/dsa/slave.c +46 -2
78 lines not on this page · raw message
Signature · 1 line
2.17.2
Jiri Pirko
maintainerPATCH v3 10/12 dsa: don't fill-up remove ndo_get_phys_port_name for slaves
In reply to Jiri PirkoFrom: Jiri Pirko <[email protected]>
Leave it only for legacy. But since each slave has its own devlink port instance correctly set, rely on devlink core to generate correct phys port name.
---v1->v2:
- new patch
--- net/dsa/slave.c | 1 - 1 file changed, 1 deletion(-)
net/dsa/slave.c +0 -1
@@ -1145,7 +1145,6 @@ static const struct net_device_ops dsa_slave_netdev_ops = { .ndo_netpoll_cleanup = dsa_slave_netpoll_cleanup, .ndo_poll_controller = dsa_slave_poll_controller, #endif - .ndo_get_phys_port_name = dsa_slave_get_phys_port_name, .ndo_setup_tc = dsa_slave_setup_tc, .ndo_get_stats64 = dsa_slave_get_stats64, .ndo_get_port_parent_id = dsa_slave_get_port_parent_id,
Signature · 1 line
2.17.2
Jiri Pirko
maintainerPATCH v3 11/12 nfp: do not handle nn->port defined case in nfp_net_get_phys_port_name()
In reply to Jiri PirkoFrom: Jiri Pirko <[email protected]>
If nn->port is defined it means that devlink_port has been registered for this port as well. Devlink core is handling the port name formatting.
---v1->v2:
- new patch
--- drivers/net/ethernet/netronome/nfp/nfp_net_common.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/ethernet/netronome/nfp/nfp_net_common.c +4 -1
@@ -3324,8 +3324,11 @@ nfp_net_get_phys_port_name(struct net_device *netdev, char *name, size_t len)struct nfp_net *nn =netdev_priv (netdev);int n; +/* If port is defined, devlink_port is registered and devlink core +* is taking care of name formatting. +*/ if (nn->port) -return nfp_port_get_phys_port_name (netdev, name, len); +return -EOPNOTSUPP ;if (nn->dp.is_vf || nn->vnic_no_name)return -EOPNOTSUPP ;
Signature · 1 line
2.17.2
Jiri Pirko
maintainerPATCH v3 12/12 net: devlink: add warning for ndo_get_phys_port_name set when not needed
In reply to Jiri PirkoFrom: Jiri Pirko <[email protected]>
Currently if the driver registers devlink port instance, it should set the devlink port attributes as well. Then the devlink core is able to obtain physical port name itself, no need for driver to implement the ndo. Once all drivers will implement devlink port registration, this ndo should be removed. This warning guides new
drivers to do things as they should be done.
---v1->v2:
- new patch
--- net/core/devlink.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
net/core/devlink.c +18 -0
@@ -5358,6 +5358,24 @@ 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) { +/* If driver registers devlink port, it should set devlink port +* attributes accordingly so the compat functions are called +* and the original ops are not used. +*/ +if (netdev->netdev_ops->ndo_get_phys_port_name) { +/* Some drivers use the same set of ndos for netdevs +* that have devlink_port registered and also for +* those who don't. Make sure that ndo_get_phys_port_name +* returns -EOPNOTSUPP here in case it is defined. +* Warn if not. +*/ +const struct net_device_ops *ops = netdev->netdev_ops; +char name[IFNAMSIZ ]; +int err; + + err = ops->ndo_get_phys_port_name (netdev, name,sizeof (name)); +WARN_ON (err != -EOPNOTSUPP ); + }__devlink_port_type_set (devlink_port,DEVLINK_PORT_TYPE_ETH , netdev); }EXPORT_SYMBOL_GPL (devlink_port_type_eth_set);
Signature · 1 line
2.17.2