Commit 4a65912f authored by David S. Miller's avatar David S. Miller
Browse files

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



Saeed Mahameed says:

====================
mlx5-updates-2021-04-13

mlx5 core and netdev driver updates

1) E-Switch updates from Parav,
  1.1) Devlink parameter to control mlx5 metadata enablement for E-Switch
  1.2) Trivial cleanups for E-Switch code
  1.3) Dynamically allocate vport steering namespaces only when required

2) From Jianbo, Use variably sized data structures for Software steering

3) Several minor cleanups
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 652d3be2 5b232ea9

Documentation/networking/device_drivers/ethernet/mellanox/mlx5.rst

+34 −0
Original line number Diff line number Diff line
@@ -183,6 +183,40 @@ User command examples: 
      values:

         cmode driverinit value true



esw_port_metadata: Eswitch port metadata state

----------------------------------------------

When applicable, disabling Eswitch metadata can increase packet rate

up to 20% depending on the use case and packet sizes.



Eswitch port metadata state controls whether to internally tag packets with

metadata. Metadata tagging must be enabled for multi-port RoCE, failover

between representors and stacked devices.

By default metadata is enabled on the supported devices in E-switch.

Metadata is applicable only for E-switch in switchdev mode and

users may disable it when NONE of the below use cases will be in use:

1. HCA is in Dual/multi-port RoCE mode.

2. VF/SF representor bonding (Usually used for Live migration)

3. Stacked devices



When metadata is disabled, the above use cases will fail to initialize if

users try to enable them.



- Show eswitch port metadata::



    $ devlink dev param show pci/0000:06:00.0 name esw_port_metadata

      pci/0000:06:00.0:

        name esw_port_metadata type driver-specific

          values:

            cmode runtime value true



- Disable eswitch port metadata::



    $ devlink dev param set pci/0000:06:00.0 name esw_port_metadata value false cmode runtime



- Change eswitch mode to switchdev mode where after choosing the metadata value::



    $ devlink dev eswitch set pci/0000:06:00.0 mode switchdev



mlx5 subfunction

================

mlx5 supports subfunction management using devlink port (see :ref:`Documentation/networking/devlink/devlink-port.rst <devlink_port>`) interface.

drivers/net/ethernet/mellanox/mlx5/core/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ mlx5_core-$(CONFIG_MLX5_TC_CT) += en/tc_ct.o 
# Core extra

#

mlx5_core-$(CONFIG_MLX5_ESWITCH)   += eswitch.o eswitch_offloads.o eswitch_offloads_termtbl.o \

				      ecpf.o rdma.o

				      ecpf.o rdma.o esw/legacy.o

mlx5_core-$(CONFIG_MLX5_ESWITCH)   += esw/acl/helper.o \

				      esw/acl/egress_lgcy.o esw/acl/egress_ofld.o \

				      esw/acl/ingress_lgcy.o esw/acl/ingress_ofld.o \

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

+62 −0
Original line number Diff line number Diff line
@@ -456,6 +456,50 @@ static int mlx5_devlink_large_group_num_validate(struct devlink *devlink, u32 id 


	return 0;

}



static int mlx5_devlink_esw_port_metadata_set(struct devlink *devlink, u32 id,

					      struct devlink_param_gset_ctx *ctx)

{

	struct mlx5_core_dev *dev = devlink_priv(devlink);



	if (!MLX5_ESWITCH_MANAGER(dev))

		return -EOPNOTSUPP;



	return mlx5_esw_offloads_vport_metadata_set(dev->priv.eswitch, ctx->val.vbool);

}



static int mlx5_devlink_esw_port_metadata_get(struct devlink *devlink, u32 id,

					      struct devlink_param_gset_ctx *ctx)

{

	struct mlx5_core_dev *dev = devlink_priv(devlink);



	if (!MLX5_ESWITCH_MANAGER(dev))

		return -EOPNOTSUPP;



	ctx->val.vbool = mlx5_eswitch_vport_match_metadata_enabled(dev->priv.eswitch);

	return 0;

}



static int mlx5_devlink_esw_port_metadata_validate(struct devlink *devlink, u32 id,

						   union devlink_param_value val,

						   struct netlink_ext_ack *extack)

{

	struct mlx5_core_dev *dev = devlink_priv(devlink);

	u8 esw_mode;



	if (!MLX5_ESWITCH_MANAGER(dev)) {

		NL_SET_ERR_MSG_MOD(extack, "E-Switch is unsupported");

		return -EOPNOTSUPP;

	}

	esw_mode = mlx5_eswitch_mode(dev);

	if (esw_mode == MLX5_ESWITCH_OFFLOADS) {

		NL_SET_ERR_MSG_MOD(extack,

				   "E-Switch must either disabled or non switchdev mode");

		return -EBUSY;

	}

	return 0;

}



#endif



static int mlx5_devlink_enable_remote_dev_reset_set(struct devlink *devlink, u32 id,
@@ -490,6 +534,12 @@ static const struct devlink_param mlx5_devlink_params[] = { 
			     BIT(DEVLINK_PARAM_CMODE_DRIVERINIT),

			     NULL, NULL,

			     mlx5_devlink_large_group_num_validate),

	DEVLINK_PARAM_DRIVER(MLX5_DEVLINK_PARAM_ID_ESW_PORT_METADATA,

			     "esw_port_metadata", DEVLINK_PARAM_TYPE_BOOL,

			     BIT(DEVLINK_PARAM_CMODE_RUNTIME),

			     mlx5_devlink_esw_port_metadata_get,

			     mlx5_devlink_esw_port_metadata_set,

			     mlx5_devlink_esw_port_metadata_validate),

#endif

	DEVLINK_PARAM_GENERIC(ENABLE_REMOTE_DEV_RESET, BIT(DEVLINK_PARAM_CMODE_RUNTIME),

			      mlx5_devlink_enable_remote_dev_reset_get,
@@ -519,6 +569,18 @@ static void mlx5_devlink_set_params_init_values(struct devlink *devlink) 
	devlink_param_driverinit_value_set(devlink,

					   MLX5_DEVLINK_PARAM_ID_ESW_LARGE_GROUP_NUM,

					   value);



	if (MLX5_ESWITCH_MANAGER(dev)) {

		if (mlx5_esw_vport_match_metadata_supported(dev->priv.eswitch)) {

			dev->priv.eswitch->flags |= MLX5_ESWITCH_VPORT_MATCH_METADATA;

			value.vbool = true;

		} else {

			value.vbool = false;

		}

		devlink_param_driverinit_value_set(devlink,

						   MLX5_DEVLINK_PARAM_ID_ESW_PORT_METADATA,

						   value);

	}

#endif

}

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

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ enum mlx5_devlink_param_id { 
	MLX5_DEVLINK_PARAM_ID_BASE = DEVLINK_PARAM_GENERIC_ID_MAX,

	MLX5_DEVLINK_PARAM_ID_FLOW_STEERING_MODE,

	MLX5_DEVLINK_PARAM_ID_ESW_LARGE_GROUP_NUM,

	MLX5_DEVLINK_PARAM_ID_ESW_PORT_METADATA,

};



struct mlx5_trap_ctx {

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

+2 −2
Original line number Diff line number Diff line
@@ -392,11 +392,11 @@ static void arfs_may_expire_flow(struct mlx5e_priv *priv) 
{

	struct arfs_rule *arfs_rule;

	struct hlist_node *htmp;

	HLIST_HEAD(del_list);

	int quota = 0;

	int i;

	int j;



	HLIST_HEAD(del_list);

	spin_lock_bh(&priv->fs.arfs->arfs_lock);

	mlx5e_for_each_arfs_rule(arfs_rule, htmp, priv->fs.arfs->arfs_tables, i, j) {

		if (!work_pending(&arfs_rule->arfs_work) &&
@@ -422,10 +422,10 @@ static void arfs_del_rules(struct mlx5e_priv *priv) 
{

	struct hlist_node *htmp;

	struct arfs_rule *rule;

	HLIST_HEAD(del_list);

	int i;

	int j;



	HLIST_HEAD(del_list);

	spin_lock_bh(&priv->fs.arfs->arfs_lock);

	mlx5e_for_each_arfs_rule(rule, htmp, priv->fs.arfs->arfs_tables, i, j) {

		hlist_del_init(&rule->hlist);