Commit 0c88eda9 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'mlx5-updates-2021-03-16' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux 



Saeed Mahameed says:

====================
mlx5-updates-2021-03-16

mlx5 uplink representor netdev persistence.

Before this patchset we used to have separate netdevs for Native NIC mode
and Switchdev mode (uplink representor netdev), meaning that if user
switches modes between Native to Switchdev and vice versa, the driver
would cleanup the current netdev representor and create a new one for the
new mode, such behavior created an administrative nightmare for users,
where users need to be aware of such loss of both data path and control
path configurations, e.g. netdev attributes and arp/route tables,
where the later is more painful.

A simple solution for this is not to replace the netdev in first place
and use a single netdev to serve the uplink/physical port whether it is
in switchdev mode or native mode.

We already have different HW profiles for each netdev mode, in this series
we just replace the HW profile on the fly and we keep the same netdev
attached.

Refactoring: Some refactoring has been made to overcome some technical
difficulties
1) The netdev is created with the maximum amount of tx/rx queues to serve
the two profiles.

2) Some ndos are not supported in some modes, so we added a mode check for
   such cases, e.g legacy sriov ndos must be blocked in switchdev mode.

3) Some mlx5 netdev private attributes need to be moved out of profiles
   and kept in a persistent place, where the netdev is created
   e.g devlink port and other global HW resources

4) The netdev devlink port is now always registered with the switch id

Implementation: the last three patches implement the mechanism now as the
netdev can be shared.

5) Don't recreate the netdev on switchdev mode changes
6) Prevent changing switchdev mode when some netdev operations
are active, mostly when TC rules are being processed.
This is required since the netdev is kept registered while switchdev mode
can be changed.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents ebfbc46b 7dc84de9

drivers/net/ethernet/mellanox/mlx5/core/dev.c

+0 −3
Original line number Diff line number Diff line
@@ -58,9 +58,6 @@ static bool is_eth_supported(struct mlx5_core_dev *dev) 
	if (!IS_ENABLED(CONFIG_MLX5_CORE_EN))

		return false;



	if (is_eth_rep_supported(dev))

		return false;



	if (MLX5_CAP_GEN(dev, port_type) != MLX5_CAP_PORT_TYPE_ETH)

		return false;

drivers/net/ethernet/mellanox/mlx5/core/en.h

+1 −1
Original line number Diff line number Diff line
@@ -880,7 +880,6 @@ struct mlx5e_priv { 
#endif

	struct devlink_health_reporter *tx_reporter;

	struct devlink_health_reporter *rx_reporter;

	struct devlink_port            dl_port;

	struct mlx5e_xsk           xsk;

#if IS_ENABLED(CONFIG_PCI_HYPERV_INTERFACE)

	struct mlx5e_hv_vhca_stats_agent stats_agent;
@@ -1174,6 +1173,7 @@ void mlx5e_detach_netdev(struct mlx5e_priv *priv); 
void mlx5e_destroy_netdev(struct mlx5e_priv *priv);

int mlx5e_netdev_change_profile(struct mlx5e_priv *priv,

				const struct mlx5e_profile *new_profile, void *new_ppriv);

void mlx5e_netdev_attach_nic_profile(struct mlx5e_priv *priv);

void mlx5e_set_netdev_mtu_boundaries(struct mlx5e_priv *priv);

void mlx5e_build_nic_params(struct mlx5e_priv *priv, struct mlx5e_xsk *xsk, u16 mtu);

void mlx5e_build_rq_params(struct mlx5_core_dev *mdev,

drivers/net/ethernet/mellanox/mlx5/core/en/devlink.c

+33 −5
Original line number Diff line number Diff line
@@ -2,37 +2,65 @@ 
/* Copyright (c) 2020, Mellanox Technologies inc.  All rights reserved. */



#include "en/devlink.h"

#include "eswitch.h"



static void

mlx5e_devlink_get_port_parent_id(struct mlx5_core_dev *dev, struct netdev_phys_item_id *ppid)

{

	u64 parent_id;



	parent_id = mlx5_query_nic_system_image_guid(dev);

	ppid->id_len = sizeof(parent_id);

	memcpy(ppid->id, &parent_id, sizeof(parent_id));

}



int mlx5e_devlink_port_register(struct mlx5e_priv *priv)

{

	struct devlink *devlink = priv_to_devlink(priv->mdev);

	struct devlink_port_attrs attrs = {};

	struct netdev_phys_item_id ppid = {};

	struct devlink_port *dl_port;

	unsigned int dl_port_index;



	if (mlx5_core_is_pf(priv->mdev)) {

		attrs.flavour = DEVLINK_PORT_FLAVOUR_PHYSICAL;

		attrs.phys.port_number = PCI_FUNC(priv->mdev->pdev->devfn);

		if (MLX5_ESWITCH_MANAGER(priv->mdev)) {

			mlx5e_devlink_get_port_parent_id(priv->mdev, &ppid);

			memcpy(attrs.switch_id.id, ppid.id, ppid.id_len);

			attrs.switch_id.id_len = ppid.id_len;

		}

		dl_port_index = mlx5_esw_vport_to_devlink_port_index(priv->mdev,

								     MLX5_VPORT_UPLINK);

	} else {

		attrs.flavour = DEVLINK_PORT_FLAVOUR_VIRTUAL;

		dl_port_index = mlx5_esw_vport_to_devlink_port_index(priv->mdev, 0);

	}



	devlink_port_attrs_set(&priv->dl_port, &attrs);

	dl_port = mlx5e_devlink_get_dl_port(priv);

	memset(dl_port, 0, sizeof(*dl_port));

	devlink_port_attrs_set(dl_port, &attrs);



	return devlink_port_register(devlink, &priv->dl_port, 1);

	return devlink_port_register(devlink, dl_port, dl_port_index);

}



void mlx5e_devlink_port_type_eth_set(struct mlx5e_priv *priv)

{

	devlink_port_type_eth_set(&priv->dl_port, priv->netdev);

	struct devlink_port *dl_port = mlx5e_devlink_get_dl_port(priv);



	devlink_port_type_eth_set(dl_port, priv->netdev);

}



void mlx5e_devlink_port_unregister(struct mlx5e_priv *priv)

{

	devlink_port_unregister(&priv->dl_port);

	struct devlink_port *dl_port = mlx5e_devlink_get_dl_port(priv);



	devlink_port_unregister(dl_port);

}



struct devlink_port *mlx5e_get_devlink_port(struct net_device *dev)

{

	struct mlx5e_priv *priv = netdev_priv(dev);



	return &priv->dl_port;

	return mlx5e_devlink_get_dl_port(priv);

}

drivers/net/ethernet/mellanox/mlx5/core/en/devlink.h

+6 −0
Original line number Diff line number Diff line
@@ -12,4 +12,10 @@ void mlx5e_devlink_port_unregister(struct mlx5e_priv *priv); 
void mlx5e_devlink_port_type_eth_set(struct mlx5e_priv *priv);

struct devlink_port *mlx5e_get_devlink_port(struct net_device *dev);



static inline struct devlink_port *

mlx5e_devlink_get_dl_port(struct mlx5e_priv *priv)

{

	return &priv->mdev->mlx5e_res.dl_port;

}



#endif

drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c

+2 −2
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ static int mlx5e_ptp_alloc_txqsq(struct mlx5e_port_ptp *c, int txq_ix, 
	sq->mdev      = mdev;

	sq->ch_ix     = c->ix;

	sq->txq_ix    = txq_ix;

	sq->uar_map   = mdev->mlx5e_res.bfreg.map;

	sq->uar_map   = mdev->mlx5e_res.hw_objs.bfreg.map;

	sq->min_inline_mode = params->tx_min_inline_mode;

	sq->hw_mtu    = MLX5E_SW2HW_MTU(params, params->sw_mtu);

	sq->stats     = &c->priv->port_ptp_stats.sq[tc];
@@ -475,7 +475,7 @@ int mlx5e_port_ptp_open(struct mlx5e_priv *priv, struct mlx5e_params *params, 
	c->ix       = 0;

	c->pdev     = mlx5_core_dma_dev(priv->mdev);

	c->netdev   = priv->netdev;

	c->mkey_be  = cpu_to_be32(priv->mdev->mlx5e_res.mkey.key);

	c->mkey_be  = cpu_to_be32(priv->mdev->mlx5e_res.hw_objs.mkey.key);

	c->num_tc   = params->num_tc;

	c->stats    = &priv->port_ptp_stats.ch;

	c->lag_port = lag_port;