Commit fabdc100 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge mlx5 updates 2023-03-13 

Saeed Mahameed says:

====================
mlx5-updates-2023-03-13

1) Trivial cleanup patches
2) By Sandipan Patra: Implement thermal zone to report NIC temperature
3) Adham Faris, Improves devlink health diagnostics for netdev objects
4) From Maor, Enable TC offload for egress and engress MACVLAN over bond
5) From Gal, add devlink hairpin queues parameters to replace debugfs
   as was discussed in [1]:
[1] https://lore.kernel.org/all/20230111194608.7f15b9a1@kernel.org/
====================

Link: https://lore.kernel.org/all/20230314054234.267365-1-saeed@kernel.org/


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents a57cc54d 63b02048

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

+35 −0
Original line number Diff line number Diff line
@@ -122,6 +122,41 @@ users try to enable them. 


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



hairpin_num_queues: Number of hairpin queues

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

We refer to a TC NIC rule that involves forwarding as "hairpin".



Hairpin queues are mlx5 hardware specific implementation for hardware

forwarding of such packets.



- Show the number of hairpin queues::



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

      pci/0000:06:00.0:

        name hairpin_num_queues type driver-specific

          values:

            cmode driverinit value 2



- Change the number of hairpin queues::



    $ devlink dev param set pci/0000:06:00.0 name hairpin_num_queues value 4 cmode driverinit



hairpin_queue_size: Size of the hairpin queues

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

Control the size of the hairpin queues.



- Show the size of the hairpin queues::



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

      pci/0000:06:00.0:

        name hairpin_queue_size type driver-specific

          values:

            cmode driverinit value 1024



- Change the size (in packets) of the hairpin queues::



    $ devlink dev param set pci/0000:06:00.0 name hairpin_queue_size value 512 cmode driverinit



Health reporters

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

Documentation/networking/devlink/mlx5.rst

+12 −0
Original line number Diff line number Diff line
@@ -72,6 +72,18 @@ parameters. 


       Default: disabled



   * - ``hairpin_num_queues``

     - u32

     - driverinit

     - We refer to a TC NIC rule that involves forwarding as "hairpin".

       Hairpin queues are mlx5 hardware specific implementation for hardware

       forwarding of such packets.



       Control the number of hairpin queues.

   * - ``hairpin_queue_size``

     - u32

     - driverinit

     - Control the size (in packets) of the hairpin queues.



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

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

+1 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ mlx5_core-$(CONFIG_MLX5_ESWITCH) += esw/acl/helper.o \ 


mlx5_core-$(CONFIG_MLX5_BRIDGE)    += esw/bridge.o en/rep/bridge.o



mlx5_core-$(CONFIG_THERMAL)        += thermal.o

mlx5_core-$(CONFIG_MLX5_MPFS)      += lib/mpfs.o

mlx5_core-$(CONFIG_VXLAN)          += lib/vxlan.o

mlx5_core-$(CONFIG_PTP_1588_CLOCK) += lib/clock.o

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

+71 −0
Original line number Diff line number Diff line
@@ -494,6 +494,61 @@ static int mlx5_devlink_eq_depth_validate(struct devlink *devlink, u32 id, 
	return (val.vu32 >= 64 && val.vu32 <= 4096) ? 0 : -EINVAL;

}



static int

mlx5_devlink_hairpin_num_queues_validate(struct devlink *devlink, u32 id,

					 union devlink_param_value val,

					 struct netlink_ext_ack *extack)

{

	return val.vu32 ? 0 : -EINVAL;

}



static int

mlx5_devlink_hairpin_queue_size_validate(struct devlink *devlink, u32 id,

					 union devlink_param_value val,

					 struct netlink_ext_ack *extack)

{

	struct mlx5_core_dev *dev = devlink_priv(devlink);

	u32 val32 = val.vu32;



	if (!is_power_of_2(val32)) {

		NL_SET_ERR_MSG_MOD(extack, "Value is not power of two");

		return -EINVAL;

	}



	if (val32 > BIT(MLX5_CAP_GEN(dev, log_max_hairpin_num_packets))) {

		NL_SET_ERR_MSG_FMT_MOD(

			extack, "Maximum hairpin queue size is %lu",

			BIT(MLX5_CAP_GEN(dev, log_max_hairpin_num_packets)));

		return -EINVAL;

	}



	return 0;

}



static void mlx5_devlink_hairpin_params_init_values(struct devlink *devlink)

{

	struct mlx5_core_dev *dev = devlink_priv(devlink);

	union devlink_param_value value;

	u64 link_speed64;

	u32 link_speed;



	/* set hairpin pair per each 50Gbs share of the link */

	mlx5_port_max_linkspeed(dev, &link_speed);

	link_speed = max_t(u32, link_speed, 50000);

	link_speed64 = link_speed;

	do_div(link_speed64, 50000);



	value.vu32 = link_speed64;

	devl_param_driverinit_value_set(

		devlink, MLX5_DEVLINK_PARAM_ID_HAIRPIN_NUM_QUEUES, value);



	value.vu32 =

		BIT(min_t(u32, 16 - MLX5_MPWRQ_MIN_LOG_STRIDE_SZ(dev),

			  MLX5_CAP_GEN(dev, log_max_hairpin_num_packets)));

	devl_param_driverinit_value_set(

		devlink, MLX5_DEVLINK_PARAM_ID_HAIRPIN_QUEUE_SIZE, value);

}



static const struct devlink_param mlx5_devlink_params[] = {

	DEVLINK_PARAM_GENERIC(ENABLE_ROCE, BIT(DEVLINK_PARAM_CMODE_DRIVERINIT),

			      NULL, NULL, mlx5_devlink_enable_roce_validate),
@@ -547,6 +602,14 @@ static void mlx5_devlink_set_params_init_values(struct devlink *devlink) 
static const struct devlink_param mlx5_devlink_eth_params[] = {

	DEVLINK_PARAM_GENERIC(ENABLE_ETH, BIT(DEVLINK_PARAM_CMODE_DRIVERINIT),

			      NULL, NULL, NULL),

	DEVLINK_PARAM_DRIVER(MLX5_DEVLINK_PARAM_ID_HAIRPIN_NUM_QUEUES,

			     "hairpin_num_queues", DEVLINK_PARAM_TYPE_U32,

			     BIT(DEVLINK_PARAM_CMODE_DRIVERINIT), NULL, NULL,

			     mlx5_devlink_hairpin_num_queues_validate),

	DEVLINK_PARAM_DRIVER(MLX5_DEVLINK_PARAM_ID_HAIRPIN_QUEUE_SIZE,

			     "hairpin_queue_size", DEVLINK_PARAM_TYPE_U32,

			     BIT(DEVLINK_PARAM_CMODE_DRIVERINIT), NULL, NULL,

			     mlx5_devlink_hairpin_queue_size_validate),

};



static int mlx5_devlink_eth_params_register(struct devlink *devlink)
@@ -567,6 +630,9 @@ static int mlx5_devlink_eth_params_register(struct devlink *devlink) 
	devl_param_driverinit_value_set(devlink,

					DEVLINK_PARAM_GENERIC_ID_ENABLE_ETH,

					value);



	mlx5_devlink_hairpin_params_init_values(devlink);



	return 0;

}
@@ -805,6 +871,11 @@ int mlx5_devlink_params_register(struct devlink *devlink) 
{

	int err;



	/* Here only the driver init params should be registered.

	 * Runtime params should be registered by the code which

	 * behaviour they configure.

	 */



	err = devl_params_register(devlink, mlx5_devlink_params,

				   ARRAY_SIZE(mlx5_devlink_params));

	if (err)

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

+2 −0
Original line number Diff line number Diff line
@@ -12,6 +12,8 @@ enum mlx5_devlink_param_id { 
	MLX5_DEVLINK_PARAM_ID_ESW_LARGE_GROUP_NUM,

	MLX5_DEVLINK_PARAM_ID_ESW_PORT_METADATA,

	MLX5_DEVLINK_PARAM_ID_ESW_MULTIPORT,

	MLX5_DEVLINK_PARAM_ID_HAIRPIN_NUM_QUEUES,

	MLX5_DEVLINK_PARAM_ID_HAIRPIN_QUEUE_SIZE,

};



struct mlx5_trap_ctx {