[RFC PATCH mlx5-next 08/18] net/mlx5: Allow passing a namespace on packet reformat allocation

[Leon Romanovsky]

From: Mark Bloch <ma...@mellanox.com>

Currently we attach packet reformat actions only to the FDB namespace,
in preparation to be able to attach it to different namespaces, add the
ability to pass the namespace as a parameter.

Signed-off-by: Mark Bloch <ma...@mellanox.com>
Signed-off-by: Leon Romanovsky <leo...@mellanox.com>
---
 drivers/net/ethernet/mellanox/mlx5/core/en_tc.c  | 3 +++
 drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c | 8 +++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c 
b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
index 1e8b27942426..81bfed3d3db7 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
@@ -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->packet_reformat_id);
        if (err) {
                mlx5_core_warn(priv->mdev, "Failed to offload cached 
encapsulation header, %d\n",
@@ -2314,6 +2315,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->packet_reformat_id);
        if (err)
                goto destroy_neigh_entry;
@@ -2422,6 +2424,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->packet_reformat_id);
        if (err)
                goto destroy_neigh_entry;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c 
b/drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c
index f3e6e532491e..41958bb10f69 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c
@@ -593,16 +593,22 @@ int mlx5_packet_reformat_alloc(struct mlx5_core_dev *dev,
                               int reformat_type,
                               size_t size,
                               void *reformat_data,
+                              int 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);
--
2.14.4