mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 16:29:59 +00:00
Merge branch 'devlink-virtual-port'
Parav Pandit says: ==================== devlink: Introduce devlink port flavour virtual Currently PCI PF and VF devlink devices register their ports as physical port in non-representors mode. Introduce a new port flavour as virtual so that virtual devices can register 'virtual' flavour to make it more clear to users. An example of one PCI PF and 2 PCI virtual functions, each having one devlink port. $ devlink port show pci/0000:06:00.0/1: type eth netdev ens2f0 flavour physical port 0 pci/0000:06:00.2/1: type eth netdev ens2f2 flavour virtual port 0 pci/0000:06:00.3/1: type eth netdev ens2f3 flavour virtual port 0 Patch summary: Patch-1 Introduces new devlink port flavour 'virtual'. Patch-2 Uses new flavour to register PCI VF virtual ports. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
commit
0a303214f8
6 changed files with 32 additions and 23 deletions
|
@ -880,7 +880,7 @@ struct mlx5e_priv {
|
|||
#endif
|
||||
struct devlink_health_reporter *tx_reporter;
|
||||
struct devlink_health_reporter *rx_reporter;
|
||||
struct devlink_port dl_phy_port;
|
||||
struct devlink_port dl_port;
|
||||
struct mlx5e_xsk xsk;
|
||||
#if IS_ENABLED(CONFIG_PCI_HYPERV_INTERFACE)
|
||||
struct mlx5e_hv_vhca_stats_agent stats_agent;
|
||||
|
|
|
@ -3,36 +3,43 @@
|
|||
|
||||
#include "en/devlink.h"
|
||||
|
||||
int mlx5e_devlink_phy_port_register(struct net_device *dev)
|
||||
int mlx5e_devlink_port_register(struct net_device *netdev)
|
||||
{
|
||||
struct mlx5_core_dev *dev;
|
||||
struct mlx5e_priv *priv;
|
||||
struct devlink *devlink;
|
||||
int err;
|
||||
|
||||
priv = netdev_priv(dev);
|
||||
devlink = priv_to_devlink(priv->mdev);
|
||||
priv = netdev_priv(netdev);
|
||||
dev = priv->mdev;
|
||||
|
||||
devlink_port_attrs_set(&priv->dl_phy_port,
|
||||
DEVLINK_PORT_FLAVOUR_PHYSICAL,
|
||||
PCI_FUNC(priv->mdev->pdev->devfn),
|
||||
false, 0,
|
||||
NULL, 0);
|
||||
err = devlink_port_register(devlink, &priv->dl_phy_port, 1);
|
||||
if (mlx5_core_is_pf(dev))
|
||||
devlink_port_attrs_set(&priv->dl_port,
|
||||
DEVLINK_PORT_FLAVOUR_PHYSICAL,
|
||||
PCI_FUNC(dev->pdev->devfn),
|
||||
false, 0,
|
||||
NULL, 0);
|
||||
else
|
||||
devlink_port_attrs_set(&priv->dl_port,
|
||||
DEVLINK_PORT_FLAVOUR_VIRTUAL,
|
||||
0, false, 0, NULL, 0);
|
||||
|
||||
devlink = priv_to_devlink(dev);
|
||||
err = devlink_port_register(devlink, &priv->dl_port, 1);
|
||||
if (err)
|
||||
return err;
|
||||
devlink_port_type_eth_set(&priv->dl_phy_port, dev);
|
||||
devlink_port_type_eth_set(&priv->dl_port, netdev);
|
||||
return 0;
|
||||
}
|
||||
|
||||
void mlx5e_devlink_phy_port_unregister(struct mlx5e_priv *priv)
|
||||
void mlx5e_devlink_port_unregister(struct mlx5e_priv *priv)
|
||||
{
|
||||
devlink_port_unregister(&priv->dl_phy_port);
|
||||
devlink_port_unregister(&priv->dl_port);
|
||||
}
|
||||
|
||||
struct devlink_port *mlx5e_get_devlink_phy_port(struct net_device *dev)
|
||||
struct devlink_port *mlx5e_get_devlink_port(struct net_device *dev)
|
||||
{
|
||||
struct mlx5e_priv *priv = netdev_priv(dev);
|
||||
|
||||
return &priv->dl_phy_port;
|
||||
return &priv->dl_port;
|
||||
}
|
||||
|
||||
|
|
|
@ -7,9 +7,8 @@
|
|||
#include <net/devlink.h>
|
||||
#include "en.h"
|
||||
|
||||
int mlx5e_devlink_phy_port_register(struct net_device *dev);
|
||||
void mlx5e_devlink_phy_port_unregister(struct mlx5e_priv *priv);
|
||||
struct devlink_port *mlx5e_get_devlink_phy_port(struct net_device *dev);
|
||||
int mlx5e_devlink_port_register(struct net_device *dev);
|
||||
void mlx5e_devlink_port_unregister(struct mlx5e_priv *priv);
|
||||
struct devlink_port *mlx5e_get_devlink_port(struct net_device *dev);
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
@ -4606,7 +4606,7 @@ const struct net_device_ops mlx5e_netdev_ops = {
|
|||
.ndo_set_vf_link_state = mlx5e_set_vf_link_state,
|
||||
.ndo_get_vf_stats = mlx5e_get_vf_stats,
|
||||
#endif
|
||||
.ndo_get_devlink_port = mlx5e_get_devlink_phy_port,
|
||||
.ndo_get_devlink_port = mlx5e_get_devlink_port,
|
||||
};
|
||||
|
||||
static int mlx5e_check_required_hca_cap(struct mlx5_core_dev *mdev)
|
||||
|
@ -5473,7 +5473,7 @@ static void *mlx5e_add(struct mlx5_core_dev *mdev)
|
|||
goto err_detach;
|
||||
}
|
||||
|
||||
err = mlx5e_devlink_phy_port_register(netdev);
|
||||
err = mlx5e_devlink_port_register(netdev);
|
||||
if (err) {
|
||||
mlx5_core_err(mdev, "mlx5e_devlink_phy_port_register failed, %d\n", err);
|
||||
goto err_unregister_netdev;
|
||||
|
@ -5507,7 +5507,7 @@ static void mlx5e_remove(struct mlx5_core_dev *mdev, void *vpriv)
|
|||
#ifdef CONFIG_MLX5_CORE_EN_DCB
|
||||
mlx5e_dcbnl_delete_app(priv);
|
||||
#endif
|
||||
mlx5e_devlink_phy_port_unregister(priv);
|
||||
mlx5e_devlink_port_unregister(priv);
|
||||
unregister_netdev(priv->netdev);
|
||||
mlx5e_detach(mdev, vpriv);
|
||||
mlx5e_destroy_netdev(priv);
|
||||
|
|
|
@ -187,6 +187,7 @@ enum devlink_port_flavour {
|
|||
* for the PCI VF. It is an internal
|
||||
* port that faces the PCI VF.
|
||||
*/
|
||||
DEVLINK_PORT_FLAVOUR_VIRTUAL, /* Any virtual port facing the user. */
|
||||
};
|
||||
|
||||
enum devlink_param_cmode {
|
||||
|
|
|
@ -545,6 +545,7 @@ static int devlink_nl_port_attrs_put(struct sk_buff *msg,
|
|||
case DEVLINK_PORT_FLAVOUR_PHYSICAL:
|
||||
case DEVLINK_PORT_FLAVOUR_CPU:
|
||||
case DEVLINK_PORT_FLAVOUR_DSA:
|
||||
case DEVLINK_PORT_FLAVOUR_VIRTUAL:
|
||||
if (nla_put_u32(msg, DEVLINK_ATTR_PORT_NUMBER,
|
||||
attrs->phys.port_number))
|
||||
return -EMSGSIZE;
|
||||
|
@ -6806,6 +6807,7 @@ static int __devlink_port_phys_port_name_get(struct devlink_port *devlink_port,
|
|||
|
||||
switch (attrs->flavour) {
|
||||
case DEVLINK_PORT_FLAVOUR_PHYSICAL:
|
||||
case DEVLINK_PORT_FLAVOUR_VIRTUAL:
|
||||
if (!attrs->split)
|
||||
n = snprintf(name, len, "p%u", attrs->phys.port_number);
|
||||
else
|
||||
|
|
Loading…
Reference in a new issue