Commit 4900a769 authored by David S. Miller's avatar David S. Miller
Browse files

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



Saeed Mahameed says:

====================
mlx5-updates-2021-10-25

Misc updates for mlx5 driver:

1) Misc updates and cleanups:
 - Don't write directly to netdev->dev_addr, From Jakub Kicinski
 - Remove unnecessary checks for slow path flag in tc module
 - Fix unused function warning of mlx5i_flow_type_mask
 - Bridge, support replacing existing FDB entry

2) Sub Functions, Reduction in memory usage:
 - Reduce flow counters bulk query buffer size
 - Implement max_macs devlink parameter
 - Add devlink vendor params to control Event Queue sizes
 - Added SF life cycle trace points by Parav/

3) From Aya, Firmware health buffer reporting improvements
 - Print health buffer by log level and more missing information
 - Periodic update of host time to firmware
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents cf12e6f9 d67ab0a8

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

+60 −0
Original line number Diff line number Diff line
@@ -543,6 +543,8 @@ The CR-space dump uses vsc interface which is valid even if the FW command 
interface is not functional, which is the case in most FW fatal errors.

The recover function runs recover flow which reloads the driver and triggers fw

reset if needed.

On firmware error, the health buffer is dumped into the dmesg. The log

level is derived from the error's severity (given in health buffer).



User commands examples:
@@ -700,3 +702,61 @@ Eswitch QoS tracepoints: 
    $ cat /sys/kernel/debug/tracing/trace

    ...

    <...>-27418   [006] .... 76547.187258: mlx5_esw_group_qos_destroy: (0000:82:00.0) group=000000007b576bb3 tsar_ix=1



SF tracepoints:



- mlx5_sf_add: trace addition of the SF port::



    $ echo mlx5:mlx5_sf_add >> /sys/kernel/debug/tracing/set_event

    $ cat /sys/kernel/debug/tracing/trace

    ...

    devlink-9363    [031] ..... 24610.188722: mlx5_sf_add: (0000:06:00.0) port_index=32768 controller=0 hw_id=0x8000 sfnum=88



- mlx5_sf_free: trace freeing of the SF port::



    $ echo mlx5:mlx5_sf_free >> /sys/kernel/debug/tracing/set_event

    $ cat /sys/kernel/debug/tracing/trace

    ...

    devlink-9830    [038] ..... 26300.404749: mlx5_sf_free: (0000:06:00.0) port_index=32768 controller=0 hw_id=0x8000



- mlx5_sf_hwc_alloc: trace allocating of the hardware SF context::



    $ echo mlx5:mlx5_sf_hwc_alloc >> /sys/kernel/debug/tracing/set_event

    $ cat /sys/kernel/debug/tracing/trace

    ...

    devlink-9775    [031] ..... 26296.385259: mlx5_sf_hwc_alloc: (0000:06:00.0) controller=0 hw_id=0x8000 sfnum=88



- mlx5_sf_hwc_free: trace freeing of the hardware SF context::



    $ echo mlx5:mlx5_sf_hwc_free >> /sys/kernel/debug/tracing/set_event

    $ cat /sys/kernel/debug/tracing/trace

    ...

    kworker/u128:3-9093    [046] ..... 24625.365771: mlx5_sf_hwc_free: (0000:06:00.0) hw_id=0x8000



- mlx5_sf_hwc_deferred_free : trace deferred freeing of the hardware SF context::



    $ echo mlx5:mlx5_sf_hwc_deferred_free >> /sys/kernel/debug/tracing/set_event

    $ cat /sys/kernel/debug/tracing/trace

    ...

    devlink-9519    [046] ..... 24624.400271: mlx5_sf_hwc_deferred_free: (0000:06:00.0) hw_id=0x8000



- mlx5_sf_vhca_event: trace SF vhca event and state::



    $ echo mlx5:mlx5_sf_vhca_event >> /sys/kernel/debug/tracing/set_event

    $ cat /sys/kernel/debug/tracing/trace

    ...

    kworker/u128:3-9093    [046] ..... 24625.365525: mlx5_sf_vhca_event: (0000:06:00.0) hw_id=0x8000 sfnum=88 vhca_state=1



- mlx5_sf_dev_add : trace SF device add event::



    $ echo mlx5:mlx5_sf_dev_add>> /sys/kernel/debug/tracing/set_event

    $ cat /sys/kernel/debug/tracing/trace

    ...

    kworker/u128:3-9093    [000] ..... 24616.524495: mlx5_sf_dev_add: (0000:06:00.0) sfdev=00000000fc5d96fd aux_id=4 hw_id=0x8000 sfnum=88



- mlx5_sf_dev_del : trace SF device delete event::



    $ echo mlx5:mlx5_sf_dev_del >> /sys/kernel/debug/tracing/set_event

    $ cat /sys/kernel/debug/tracing/trace

    ...

    kworker/u128:3-9093    [044] ..... 24624.400749: mlx5_sf_dev_del: (0000:06:00.0) sfdev=00000000fc5d96fd aux_id=4 hw_id=0x8000 sfnum=88

Documentation/networking/devlink/mlx5.rst

+20 −0
Original line number Diff line number Diff line
@@ -14,8 +14,12 @@ Parameters 


   * - Name

     - Mode

     - Validation

   * - ``enable_roce``

     - driverinit

   * - ``max_macs``

     - driverinit

     - The range is between 1 and 2^31. Only power of 2 values are supported.



The ``mlx5`` driver also implements the following driver-specific

parameters.
@@ -46,6 +50,22 @@ parameters. 


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



Resources

=========



.. list-table:: Driver-specific resources implemented

   :widths: 5 5 5 85



   * - Name

     - Description

   * - ``comp_eq_size``

     - Control the size of I/O completion EQs.

       * The default value is 1024, and the range is between 64 and 4096.

   * - ``event_eq_size``

     - Control the size of the asynchronous control events EQ.

       * The default value is 4096, and the range is between 64 and 4096.





Info versions

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

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

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ mlx5_core-y := main.o cmd.o debugfs.o fw.o eq.o uar.o pagealloc.o \ 
		transobj.o vport.o sriov.o fs_cmd.o fs_core.o pci_irq.o \

		fs_counters.o fs_ft_pool.o rl.o lag/lag.o dev.o events.o wq.o lib/gid.o \

		lib/devcom.o lib/pci_vsc.o lib/dm.o lib/fs_ttc.o diag/fs_tracepoint.o \

		diag/fw_tracer.o diag/crdump.o devlink.o diag/rsc_dump.o \

		diag/fw_tracer.o diag/crdump.o devlink.o devlink_res.o diag/rsc_dump.o \

		fw_reset.o qos.o lib/tout.o



#

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

+69 −0
Original line number Diff line number Diff line
@@ -752,6 +752,68 @@ static void mlx5_devlink_auxdev_params_unregister(struct devlink *devlink) 
	mlx5_devlink_eth_param_unregister(devlink);

}



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

					     union devlink_param_value val,

					     struct netlink_ext_ack *extack)

{

	struct mlx5_core_dev *dev = devlink_priv(devlink);



	/* At least one unicast mac is needed */

	if (val.vu32 == 0) {

		NL_SET_ERR_MSG_MOD(extack, "max_macs value must be greater than 0");

		return -EINVAL;

	}

	/* Check if its power of 2 or not */

	if (!is_power_of_2(val.vu32)) {

		NL_SET_ERR_MSG_MOD(extack,

				   "Only power of 2 values are supported for max_macs");

		return -EOPNOTSUPP;

	}



	if (ilog2(val.vu32) >

	    MLX5_CAP_GEN_MAX(dev, log_max_current_uc_list)) {

		NL_SET_ERR_MSG_MOD(extack, "max_macs value is out of the supported range");

		return -EOPNOTSUPP;

	}



	return 0;

}



static const struct devlink_param max_uc_list_param =

	DEVLINK_PARAM_GENERIC(MAX_MACS, BIT(DEVLINK_PARAM_CMODE_DRIVERINIT),

			      NULL, NULL, mlx5_devlink_max_uc_list_validate);



static int mlx5_devlink_max_uc_list_param_register(struct devlink *devlink)

{

	struct mlx5_core_dev *dev = devlink_priv(devlink);

	union devlink_param_value value;

	int err;



	if (!MLX5_CAP_GEN(dev, log_max_current_uc_list_wr_supported))

		return 0;



	err = devlink_param_register(devlink, &max_uc_list_param);

	if (err)

		return err;



	value.vu32 = 1 << MLX5_CAP_GEN(dev, log_max_current_uc_list);

	devlink_param_driverinit_value_set(devlink,

					   DEVLINK_PARAM_GENERIC_ID_MAX_MACS,

					   value);

	return 0;

}



static void

mlx5_devlink_max_uc_list_param_unregister(struct devlink *devlink)

{

	struct mlx5_core_dev *dev = devlink_priv(devlink);



	if (!MLX5_CAP_GEN(dev, log_max_current_uc_list_wr_supported))

		return;



	devlink_param_unregister(devlink, &max_uc_list_param);

}



#define MLX5_TRAP_DROP(_id, _group_id)					\

	DEVLINK_TRAP_GENERIC(DROP, DROP, _id,				\

			     DEVLINK_TRAP_GROUP_GENERIC_ID_##_group_id, \
@@ -815,11 +877,17 @@ int mlx5_devlink_register(struct devlink *devlink) 
	if (err)

		goto traps_reg_err;



	err = mlx5_devlink_max_uc_list_param_register(devlink);

	if (err)

		goto uc_list_reg_err;



	if (!mlx5_core_is_mp_slave(dev))

		devlink_set_features(devlink, DEVLINK_F_RELOAD);



	return 0;



uc_list_reg_err:

	mlx5_devlink_traps_unregister(devlink);

traps_reg_err:

	mlx5_devlink_auxdev_params_unregister(devlink);

auxdev_reg_err:
@@ -830,6 +898,7 @@ int mlx5_devlink_register(struct devlink *devlink) 


void mlx5_devlink_unregister(struct devlink *devlink)

{

	mlx5_devlink_max_uc_list_param_unregister(devlink);

	mlx5_devlink_traps_unregister(devlink);

	mlx5_devlink_auxdev_params_unregister(devlink);

	devlink_params_unregister(devlink, mlx5_devlink_params,

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

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


#include <net/devlink.h>



enum mlx5_devlink_resource_id {

	MLX5_DL_RES_COMP_EQ = 1,

	MLX5_DL_RES_ASYNC_EQ,



	__MLX5_ID_RES_MAX,

	MLX5_ID_RES_MAX = __MLX5_ID_RES_MAX - 1,

};



enum mlx5_devlink_param_id {

	MLX5_DEVLINK_PARAM_ID_BASE = DEVLINK_PARAM_GENERIC_ID_MAX,

	MLX5_DEVLINK_PARAM_ID_FLOW_STEERING_MODE,
@@ -31,6 +39,10 @@ int mlx5_devlink_trap_get_num_active(struct mlx5_core_dev *dev); 
int mlx5_devlink_traps_get_action(struct mlx5_core_dev *dev, int trap_id,

				  enum devlink_trap_action *action);



void mlx5_devlink_res_register(struct mlx5_core_dev *dev);

void mlx5_devlink_res_unregister(struct mlx5_core_dev *dev);

size_t mlx5_devlink_res_size(struct mlx5_core_dev *dev, enum mlx5_devlink_resource_id id);



struct devlink *mlx5_devlink_alloc(struct device *dev);

void mlx5_devlink_free(struct devlink *devlink);

int mlx5_devlink_register(struct devlink *devlink);