lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Message-ID: <20190301124526.GF29992@unicorn.suse.cz> Date: Fri, 1 Mar 2019 13:45:26 +0100 From: Michal Kubecek <mkubecek@...e.cz> To: Jiri Pirko <jiri@...nulli.us> Cc: netdev@...r.kernel.org, davem@...emloft.net, mlxsw@...lanox.com, idosch@...lanox.com, jakub.kicinski@...ronome.com, dirk.vandermerwe@...ronome.com, f.fainelli@...il.com, andrew@...n.ch, vivien.didelot@...il.com Subject: Re: [patch net-next 1/5] net: replace ndo_get_devlink for ndo_get_devlink_port On Fri, Mar 01, 2019 at 09:13:58AM +0100, Jiri Pirko wrote: > From: Jiri Pirko <jiri@...lanox.com> > > 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. I noticed netdevsim has devlink interface but it does not register devlink ports for its network devices. But that seems to be rather an omission in netdevsim, right? > 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. > > Signed-off-by: Jiri Pirko <jiri@...lanox.com> Reviewed-by: Michal Kubecek <mkubecek@...e.cz> > --- > drivers/net/ethernet/netronome/nfp/nfp_app.h | 2 +- > drivers/net/ethernet/netronome/nfp/nfp_devlink.c | 10 +++++----- > drivers/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 | 16 +++++++++++++--- > 6 files changed, 24 insertions(+), 14 deletions(-) > > diff --git a/drivers/net/ethernet/netronome/nfp/nfp_app.h b/drivers/net/ethernet/netronome/nfp/nfp_app.h > index f8d422713705..a6fda07fce43 100644 > --- a/drivers/net/ethernet/netronome/nfp/nfp_app.h > +++ b/drivers/net/ethernet/netronome/nfp/nfp_app.h > @@ -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 > diff --git a/drivers/net/ethernet/netronome/nfp/nfp_devlink.c b/drivers/net/ethernet/netronome/nfp/nfp_devlink.c > index e9eca99cf493..f24a7fc11b9f 100644 > --- a/drivers/net/ethernet/netronome/nfp/nfp_devlink.c > +++ b/drivers/net/ethernet/netronome/nfp/nfp_devlink.c > @@ -377,13 +377,13 @@ void nfp_devlink_port_unregister(struct nfp_port *port) > devlink_port_unregister(&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; > } > diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c > index 6d1b8816552e..7dd6b3fbb394 100644 > --- a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c > +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c > @@ -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, > }; > > /** > diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_repr.c b/drivers/net/ethernet/netronome/nfp/nfp_net_repr.c > index d2c803bb4e56..bf621674f583 100644 > --- a/drivers/net/ethernet/netronome/nfp/nfp_net_repr.c > +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_repr.c > @@ -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 > diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h > index c10b60297d28..dc9d72b8932a 100644 > --- a/include/linux/netdevice.h > +++ b/include/linux/netdevice.h > @@ -1251,8 +1251,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. > */ > @@ -1453,7 +1453,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); > }; > > /** > diff --git a/include/net/devlink.h b/include/net/devlink.h > index 7f5a0bdca228..f34107def48e 100644 > --- a/include/net/devlink.h > +++ b/include/net/devlink.h > @@ -538,15 +538,25 @@ static inline struct devlink *priv_to_devlink(void *priv) > return container_of(priv, struct devlink, priv); > } > > -static inline struct devlink *netdev_to_devlink(struct net_device *dev) > +static inline struct devlink_port * > +netdev_to_devlink_port(struct net_device *dev) > { > #if IS_ENABLED(CONFIG_NET_DEVLINK) > - if (dev->netdev_ops->ndo_get_devlink) > - return dev->netdev_ops->ndo_get_devlink(dev); > + if (dev->netdev_ops->ndo_get_devlink_port) > + return dev->netdev_ops->ndo_get_devlink_port(dev); > #endif > return NULL; > } > > +static inline struct devlink *netdev_to_devlink(struct net_device *dev) > +{ > + struct devlink_port *devlink_port = netdev_to_devlink_port(dev); > + > + if (devlink_port) > + return devlink_port->devlink; > + return NULL; > +} > + > struct ib_device; > > #if IS_ENABLED(CONFIG_NET_DEVLINK) > -- > 2.14.5 >
Powered by blists - more mailing lists