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

Commit 61444b45 authored by Mark Bloch's avatar Mark Bloch Committed by Leon Romanovsky
Browse files

net/mlx5: Break encap/decap into two separated flow table creation flags 



Today we are able to attach encap and decap actions only to the FDB. In
preparation to enable those actions on the NIC flow tables, break the
single flag into two. Those flags control whatever a decap or encap
operations can be attached to the flow table created. For FDB, if
encapsulation is required, we set both of them.

Signed-off-by: default avatarMark Bloch <markb@mellanox.com>
Reviewed-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
Reviewed-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
parent c3c062f8

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

+2 −1
Original line number Diff line number Diff line
@@ -529,7 +529,8 @@ static int esw_create_offloads_fast_fdb_table(struct mlx5_eswitch *esw) 
		esw_size >>= 1;



	if (esw->offloads.encap != DEVLINK_ESWITCH_ENCAP_MODE_NONE)

		flags |= MLX5_FLOW_TABLE_TUNNEL_EN;

		flags |= (MLX5_FLOW_TABLE_TUNNEL_EN_ENCAP |

			  MLX5_FLOW_TABLE_TUNNEL_EN_DECAP);



	fdb = mlx5_create_auto_grouped_flow_table(root_ns, FDB_FAST_PATH,

						  esw_size,

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

+4 −3
Original line number Diff line number Diff line
@@ -152,7 +152,8 @@ static int mlx5_cmd_create_flow_table(struct mlx5_core_dev *dev, 
				      struct mlx5_flow_table *next_ft,

				      unsigned int *table_id, u32 flags)

{

	int en_encap_decap = !!(flags & MLX5_FLOW_TABLE_TUNNEL_EN);

	int en_encap = !!(flags & MLX5_FLOW_TABLE_TUNNEL_EN_ENCAP);

	int en_decap = !!(flags & MLX5_FLOW_TABLE_TUNNEL_EN_DECAP);

	u32 out[MLX5_ST_SZ_DW(create_flow_table_out)] = {0};

	u32 in[MLX5_ST_SZ_DW(create_flow_table_in)]   = {0};

	int err;
@@ -169,9 +170,9 @@ static int mlx5_cmd_create_flow_table(struct mlx5_core_dev *dev, 
	}



	MLX5_SET(create_flow_table_in, in, flow_table_context.decap_en,

		 en_encap_decap);

		 en_decap);

	MLX5_SET(create_flow_table_in, in, flow_table_context.encap_en,

		 en_encap_decap);

		 en_encap);



	switch (op_mod) {

	case FS_FT_OP_MOD_NORMAL:

include/linux/mlx5/fs.h

+2 −1
Original line number Diff line number Diff line
@@ -45,7 +45,8 @@ enum { 
};



enum {

	MLX5_FLOW_TABLE_TUNNEL_EN = BIT(0),

	MLX5_FLOW_TABLE_TUNNEL_EN_ENCAP = BIT(0),

	MLX5_FLOW_TABLE_TUNNEL_EN_DECAP = BIT(1),

};



#define LEFTOVERS_RULE_NUM	 2