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

Commit cecae747 authored by Maor Gottlieb's avatar Maor Gottlieb Committed by Doug Ledford
Browse files

RDMA/mlx5: Consider eswitch encap mode 



When flow steering is created, then the encap support should
consider the eswitch encap mode. If the eswitch flow table (FDB)
supports encap then it shouldn't be supported on NIC RX flow tables.

Fixes: 4adda112 ('RDMA/mlx5: Enable decap and packet reformat on flow tables')
Signed-off-by: default avatarMaor Gottlieb <maorg@mellanox.com>
Reviewed-by: default avatarPetr Vorel <pvorel@suse.cz>
Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 12dbc04d

drivers/infiniband/hw/mlx5/main.c

+14 −6
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ 
#include <linux/mlx5/port.h>

#include <linux/mlx5/vport.h>

#include <linux/mlx5/fs.h>

#include <linux/mlx5/eswitch.h>

#include <linux/list.h>

#include <rdma/ib_smi.h>

#include <rdma/ib_umem.h>
@@ -3252,11 +3253,14 @@ static struct mlx5_ib_flow_prio *get_flow_table(struct mlx5_ib_dev *dev, 
	int max_table_size;

	int num_entries;

	int num_groups;

	bool esw_encap;

	u32 flags = 0;

	int priority;



	max_table_size = BIT(MLX5_CAP_FLOWTABLE_NIC_RX(dev->mdev,

						       log_max_ft_size));

	esw_encap = mlx5_eswitch_get_encap_mode(dev->mdev) !=

		DEVLINK_ESWITCH_ENCAP_MODE_NONE;

	if (flow_attr->type == IB_FLOW_ATTR_NORMAL) {

		enum mlx5_flow_namespace_type fn_type;
@@ -3269,10 +3273,10 @@ static struct mlx5_ib_flow_prio *get_flow_table(struct mlx5_ib_dev *dev, 
		if (ft_type == MLX5_IB_FT_RX) {

			fn_type = MLX5_FLOW_NAMESPACE_BYPASS;

			prio = &dev->flow_db->prios[priority];

			if (!dev->is_rep &&

			if (!dev->is_rep && !esw_encap &&

			    MLX5_CAP_FLOWTABLE_NIC_RX(dev->mdev, decap))

				flags |= MLX5_FLOW_TABLE_TUNNEL_EN_DECAP;

			if (!dev->is_rep &&

			if (!dev->is_rep && !esw_encap &&

			    MLX5_CAP_FLOWTABLE_NIC_RX(dev->mdev,

					reformat_l3_tunnel_to_l2))

				flags |= MLX5_FLOW_TABLE_TUNNEL_EN_REFORMAT;
@@ -3282,7 +3286,7 @@ static struct mlx5_ib_flow_prio *get_flow_table(struct mlx5_ib_dev *dev, 
							      log_max_ft_size));

			fn_type = MLX5_FLOW_NAMESPACE_EGRESS;

			prio = &dev->flow_db->egress_prios[priority];

			if (!dev->is_rep &&

			if (!dev->is_rep && !esw_encap &&

			    MLX5_CAP_FLOWTABLE_NIC_TX(dev->mdev, reformat))

				flags |= MLX5_FLOW_TABLE_TUNNEL_EN_REFORMAT;

		}
@@ -3892,6 +3896,7 @@ _get_flow_table(struct mlx5_ib_dev *dev, 
	struct mlx5_flow_namespace *ns = NULL;

	struct mlx5_ib_flow_prio *prio = NULL;

	int max_table_size = 0;

	bool esw_encap;

	u32 flags = 0;

	int priority;
@@ -3900,18 +3905,21 @@ _get_flow_table(struct mlx5_ib_dev *dev, 
	else

		priority = ib_prio_to_core_prio(fs_matcher->priority, false);



	esw_encap = mlx5_eswitch_get_encap_mode(dev->mdev) !=

		DEVLINK_ESWITCH_ENCAP_MODE_NONE;

	if (fs_matcher->ns_type == MLX5_FLOW_NAMESPACE_BYPASS) {

		max_table_size = BIT(MLX5_CAP_FLOWTABLE_NIC_RX(dev->mdev,

					log_max_ft_size));

		if (MLX5_CAP_FLOWTABLE_NIC_RX(dev->mdev, decap))

		if (MLX5_CAP_FLOWTABLE_NIC_RX(dev->mdev, decap) && !esw_encap)

			flags |= MLX5_FLOW_TABLE_TUNNEL_EN_DECAP;

		if (MLX5_CAP_FLOWTABLE_NIC_RX(dev->mdev,

					      reformat_l3_tunnel_to_l2))

					      reformat_l3_tunnel_to_l2) &&

		    !esw_encap)

			flags |= MLX5_FLOW_TABLE_TUNNEL_EN_REFORMAT;

	} else if (fs_matcher->ns_type == MLX5_FLOW_NAMESPACE_EGRESS) {

		max_table_size = BIT(

			MLX5_CAP_FLOWTABLE_NIC_TX(dev->mdev, log_max_ft_size));

		if (MLX5_CAP_FLOWTABLE_NIC_TX(dev->mdev, reformat))

		if (MLX5_CAP_FLOWTABLE_NIC_TX(dev->mdev, reformat) && !esw_encap)

			flags |= MLX5_FLOW_TABLE_TUNNEL_EN_REFORMAT;

	} else if (fs_matcher->ns_type == MLX5_FLOW_NAMESPACE_FDB) {

		max_table_size = BIT(