Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 876d634d authored by Maor Gottlieb's avatar Maor Gottlieb Committed by David S. Miller
Browse files

net/mlx5: Fix flow steering NIC capabilities check 



Flow steering infrastructure is currently used only on link layer
ethernet, therefore the driver should initialize the flow steering
when the device link layer is ethernet.

In addition, add missing capability check before initializing the
namespace of NIC RX flow tables.

Fixes: 25302363 ('net/mlx5_core: Flow steering tree initialization')
Signed-off-by: default avatarMaor Gottlieb <maorg@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2fee37a4

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

+9 −1
Original line number Original line Diff line number Diff line
@@ -1767,6 +1767,9 @@ static void cleanup_root_ns(struct mlx5_core_dev *dev) 




void mlx5_cleanup_fs(struct mlx5_core_dev *dev)

void mlx5_cleanup_fs(struct mlx5_core_dev *dev)

{

{

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

		return;



	cleanup_root_ns(dev);

	cleanup_root_ns(dev);

	cleanup_single_prio_root_ns(dev, dev->priv.fdb_root_ns);

	cleanup_single_prio_root_ns(dev, dev->priv.fdb_root_ns);

	cleanup_single_prio_root_ns(dev, dev->priv.esw_egress_root_ns);

	cleanup_single_prio_root_ns(dev, dev->priv.esw_egress_root_ns);
@@ -1828,15 +1831,20 @@ int mlx5_init_fs(struct mlx5_core_dev *dev) 
{

{

	int err = 0;

	int err = 0;





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

		return 0;



	err = mlx5_init_fc_stats(dev);

	err = mlx5_init_fc_stats(dev);

	if (err)

	if (err)

		return err;

		return err;





	if (MLX5_CAP_GEN(dev, nic_flow_table)) {

	if (MLX5_CAP_GEN(dev, nic_flow_table) &&

	    MLX5_CAP_FLOWTABLE_NIC_RX(dev, ft_support)) {

		err = init_root_ns(dev);

		err = init_root_ns(dev);

		if (err)

		if (err)

			goto err;

			goto err;

	}

	}



	if (MLX5_CAP_GEN(dev, eswitch_flow_table)) {

	if (MLX5_CAP_GEN(dev, eswitch_flow_table)) {

		err = init_fdb_root_ns(dev);

		err = init_fdb_root_ns(dev);

		if (err)

		if (err)

include/linux/mlx5/device.h

+6 −0
Original line number Original line Diff line number Diff line
@@ -1367,6 +1367,12 @@ enum mlx5_cap_type { 
#define MLX5_CAP_FLOWTABLE_MAX(mdev, cap) \

#define MLX5_CAP_FLOWTABLE_MAX(mdev, cap) \

	MLX5_GET(flow_table_nic_cap, mdev->hca_caps_max[MLX5_CAP_FLOW_TABLE], cap)

	MLX5_GET(flow_table_nic_cap, mdev->hca_caps_max[MLX5_CAP_FLOW_TABLE], cap)





#define MLX5_CAP_FLOWTABLE_NIC_RX(mdev, cap) \

	MLX5_CAP_FLOWTABLE(mdev, flow_table_properties_nic_receive.cap)



#define MLX5_CAP_FLOWTABLE_NIC_RX_MAX(mdev, cap) \

	MLX5_CAP_FLOWTABLE_MAX(mdev, flow_table_properties_nic_receive.cap)



#define MLX5_CAP_ESW_FLOWTABLE(mdev, cap) \

#define MLX5_CAP_ESW_FLOWTABLE(mdev, cap) \

	MLX5_GET(flow_table_eswitch_cap, \

	MLX5_GET(flow_table_eswitch_cap, \

		 mdev->hca_caps_cur[MLX5_CAP_ESWITCH_FLOW_TABLE], cap)

		 mdev->hca_caps_cur[MLX5_CAP_ESWITCH_FLOW_TABLE], cap)