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

Commit 31ca3648 authored by Mark Bloch's avatar Mark Bloch Committed by Leon Romanovsky
Browse files

net/mlx5: Pass a namespace for packet reformat ID allocation 



Currently we attach packet reformat actions only to the FDB namespace.
In preparation to be able to use that for NIC steering, pass the actual
namespace as a parameter.

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

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

+3 −0
Original line number Diff line number Diff line
@@ -925,6 +925,7 @@ void mlx5e_tc_encap_flows_add(struct mlx5e_priv *priv, 


	err = mlx5_packet_reformat_alloc(priv->mdev, e->tunnel_type,

					 e->encap_size, e->encap_header,

					 MLX5_FLOW_NAMESPACE_FDB,

					 &e->encap_id);

	if (err) {

		mlx5_core_warn(priv->mdev, "Failed to offload cached encapsulation header, %d\n",
@@ -2389,6 +2390,7 @@ static int mlx5e_create_encap_header_ipv4(struct mlx5e_priv *priv, 


	err = mlx5_packet_reformat_alloc(priv->mdev, e->tunnel_type,

					 ipv4_encap_size, encap_header,

					 MLX5_FLOW_NAMESPACE_FDB,

					 &e->encap_id);

	if (err)

		goto destroy_neigh_entry;
@@ -2500,6 +2502,7 @@ static int mlx5e_create_encap_header_ipv6(struct mlx5e_priv *priv, 


	err = mlx5_packet_reformat_alloc(priv->mdev, e->tunnel_type,

					 ipv6_encap_size, encap_header,

					 MLX5_FLOW_NAMESPACE_FDB,

					 &e->encap_id);

	if (err)

		goto destroy_neigh_entry;

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

+7 −1
Original line number Diff line number Diff line
@@ -600,16 +600,22 @@ int mlx5_packet_reformat_alloc(struct mlx5_core_dev *dev, 
			       int reformat_type,

			       size_t size,

			       void *reformat_data,

			       enum mlx5_flow_namespace_type namespace,

			       u32 *packet_reformat_id)

{

	int max_encap_size = MLX5_CAP_ESW(dev, max_encap_header_size);

	u32 out[MLX5_ST_SZ_DW(alloc_packet_reformat_context_out)];

	void *packet_reformat_context_in;

	int max_encap_size;

	void *reformat;

	int inlen;

	int err;

	u32 *in;



	if (namespace == MLX5_FLOW_NAMESPACE_FDB)

		max_encap_size = MLX5_CAP_ESW(dev, max_encap_header_size);

	else

		max_encap_size = MLX5_CAP_FLOWTABLE(dev, max_encap_header_size);



	if (size > max_encap_size) {

		mlx5_core_warn(dev, "encap size %zd too big, max supported is %d\n",

			       size, max_encap_size);

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

+2 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
#include <linux/if_link.h>

#include <linux/firmware.h>

#include <linux/mlx5/cq.h>

#include <linux/mlx5/fs.h>



#define DRIVER_NAME "mlx5_core"

#define DRIVER_VERSION "5.0-0"
@@ -173,6 +174,7 @@ int mlx5_packet_reformat_alloc(struct mlx5_core_dev *dev, 
			       int reformat_type,

			       size_t size,

			       void *reformat_data,

			       enum mlx5_flow_namespace_type namespace,

			       u32 *packet_reformat_id);

void mlx5_packet_reformat_dealloc(struct mlx5_core_dev *dev,

				  u32 packet_reformat_id);