Commit 549da338 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'mlx5-updates-2020-02-27' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux 



Saeed Mahameed says:

====================
mlx5-updates-2020-02-27

mlx5 misc updates and minor cleanups:

1) Use per vport tables for mirroring
2) Improve log messages for SW steering (DR)
3) Add devlink fdb_large_groups parameter
4) E-Switch, Allow goto earlier chain
5) Don't allow forwarding between uplink representors
6) Add support for devlink-port in non-representors mode
7) Minor misc cleanups
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 9f6e0559 bc1d75fa

Documentation/networking/devlink/mlx5.rst

+6 −0
Original line number Diff line number Diff line
@@ -37,6 +37,12 @@ parameters. 
       * ``smfs`` Software managed flow steering. In SMFS mode, the HW

         steering entities are created and manage through the driver without

         firmware intervention.

   * - ``fdb_large_groups``

     - u32

     - driverinit

     - Control the number of large groups (size > 1) in the FDB table.



       * The default value is 15, and the range is between 1 and 1024.



The ``mlx5`` driver supports reloading via ``DEVLINK_CMD_RELOAD``

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

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ mlx5_core-$(CONFIG_MLX5_CORE_EN) += en_main.o en_common.o en_fs.o en_ethtool.o \ 
		en_tx.o en_rx.o en_dim.o en_txrx.o en/xdp.o en_stats.o \

		en_selftest.o en/port.o en/monitor_stats.o en/health.o \

		en/reporter_tx.o en/reporter_rx.o en/params.o en/xsk/umem.o \

		en/xsk/setup.o en/xsk/rx.o en/xsk/tx.o

		en/xsk/setup.o en/xsk/rx.o en/xsk/tx.o en/devlink.o



#

# Netdev extra

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

+33 −7
Original line number Diff line number Diff line
@@ -190,11 +190,6 @@ static int mlx5_devlink_fs_mode_get(struct devlink *devlink, u32 id, 
	return 0;

}



enum mlx5_devlink_param_id {

	MLX5_DEVLINK_PARAM_ID_BASE = DEVLINK_PARAM_GENERIC_ID_MAX,

	MLX5_DEVLINK_PARAM_FLOW_STEERING_MODE,

};



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

					     union devlink_param_value val,

					     struct netlink_ext_ack *extack)
@@ -210,14 +205,38 @@ static int mlx5_devlink_enable_roce_validate(struct devlink *devlink, u32 id, 
	return 0;

}



#ifdef CONFIG_MLX5_ESWITCH

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

						 union devlink_param_value val,

						 struct netlink_ext_ack *extack)

{

	int group_num = val.vu32;



	if (group_num < 1 || group_num > 1024) {

		NL_SET_ERR_MSG_MOD(extack,

				   "Unsupported group number, supported range is 1-1024");

		return -EOPNOTSUPP;

	}



	return 0;

}

#endif



static const struct devlink_param mlx5_devlink_params[] = {

	DEVLINK_PARAM_DRIVER(MLX5_DEVLINK_PARAM_FLOW_STEERING_MODE,

	DEVLINK_PARAM_DRIVER(MLX5_DEVLINK_PARAM_ID_FLOW_STEERING_MODE,

			     "flow_steering_mode", DEVLINK_PARAM_TYPE_STRING,

			     BIT(DEVLINK_PARAM_CMODE_RUNTIME),

			     mlx5_devlink_fs_mode_get, mlx5_devlink_fs_mode_set,

			     mlx5_devlink_fs_mode_validate),

	DEVLINK_PARAM_GENERIC(ENABLE_ROCE, BIT(DEVLINK_PARAM_CMODE_DRIVERINIT),

			      NULL, NULL, mlx5_devlink_enable_roce_validate),

#ifdef CONFIG_MLX5_ESWITCH

	DEVLINK_PARAM_DRIVER(MLX5_DEVLINK_PARAM_ID_ESW_LARGE_GROUP_NUM,

			     "fdb_large_groups", DEVLINK_PARAM_TYPE_U32,

			     BIT(DEVLINK_PARAM_CMODE_DRIVERINIT),

			     NULL, NULL,

			     mlx5_devlink_large_group_num_validate),

#endif

};



static void mlx5_devlink_set_params_init_values(struct devlink *devlink)
@@ -230,13 +249,20 @@ static void mlx5_devlink_set_params_init_values(struct devlink *devlink) 
	else

		strcpy(value.vstr, "smfs");

	devlink_param_driverinit_value_set(devlink,

					   MLX5_DEVLINK_PARAM_FLOW_STEERING_MODE,

					   MLX5_DEVLINK_PARAM_ID_FLOW_STEERING_MODE,

					   value);



	value.vbool = MLX5_CAP_GEN(dev, roce);

	devlink_param_driverinit_value_set(devlink,

					   DEVLINK_PARAM_GENERIC_ID_ENABLE_ROCE,

					   value);



#ifdef CONFIG_MLX5_ESWITCH

	value.vu32 = ESW_OFFLOADS_DEFAULT_NUM_GROUPS;

	devlink_param_driverinit_value_set(devlink,

					   MLX5_DEVLINK_PARAM_ID_ESW_LARGE_GROUP_NUM,

					   value);

#endif

}



int mlx5_devlink_register(struct devlink *devlink, struct device *dev)

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

+6 −0
Original line number Diff line number Diff line
@@ -6,6 +6,12 @@ 


#include <net/devlink.h>



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,

};



struct devlink *mlx5_devlink_alloc(void);

void mlx5_devlink_free(struct devlink *devlink);

int mlx5_devlink_register(struct devlink *devlink, struct device *dev);

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

+1 −0
Original line number Diff line number Diff line
@@ -880,6 +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 mlx5e_xsk           xsk;

#if IS_ENABLED(CONFIG_PCI_HYPERV_INTERFACE)

	struct mlx5e_hv_vhca_stats_agent stats_agent;

CRA Git | Maintained and supported by SUSTech CRA and CCSE