RDMA/mlx5: Extend packet reformat verbs

We expose new actions:

L2_TO_L2_TUNNEL - A generic encap from L2 to L2, the data passed should
		  be the encapsulating headers.

L3_TUNNEL_TO_L2 - Will do decap where the inner packet starts from L3,
		  the data should be mac or mac + vlan (14 or 18 bytes).

L2_TO_L3_TUNNEL - Will do encap where is L2 of the original packet will
		  not be included, the data should be the encapsulating
		  header.

Signed-off-by: Mark Bloch <markb@mellanox.com>
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>

diff --git a/drivers/infiniband/hw/mlx5/flow.c b/drivers/infiniband/hw/mlx5/flow.c
index 888f79d6a125ab7358372f5b4ff95434d3b5eaa7..5750a650884e1e356866102466aac09c07dd8918 100644 (file)
--- a/drivers/infiniband/hw/mlx5/flow.c
+++ b/drivers/infiniband/hw/mlx5/flow.c
@@ -202,6 +202,10 @@ void mlx5_ib_destroy_flow_action_raw(struct mlx5_ib_flow_action *maction)
                mlx5_modify_header_dealloc(maction->flow_action_raw.dev->mdev,
                                           maction->flow_action_raw.action_id);
                break;
+       case MLX5_IB_FLOW_ACTION_PACKET_REFORMAT:
+               mlx5_packet_reformat_dealloc(maction->flow_action_raw.dev->mdev,
+                       maction->flow_action_raw.action_id);
+               break;
        case MLX5_IB_FLOW_ACTION_DECAP:
                break;
        default:
@@ -293,6 +297,21 @@ static bool mlx5_ib_flow_action_packet_reformat_valid(struct mlx5_ib_dev *ibdev,
                                                      u8 ft_type)
 {
        switch (packet_reformat_type) {
+       case MLX5_IB_UAPI_FLOW_ACTION_PACKET_REFORMAT_TYPE_L2_TO_L2_TUNNEL:
+               if (ft_type == MLX5_IB_UAPI_FLOW_TABLE_TYPE_NIC_TX)
+                       return MLX5_CAP_FLOWTABLE(ibdev->mdev,
+                                                 encap_general_header);
+               break;
+       case MLX5_IB_UAPI_FLOW_ACTION_PACKET_REFORMAT_TYPE_L2_TO_L3_TUNNEL:
+               if (ft_type == MLX5_IB_UAPI_FLOW_TABLE_TYPE_NIC_TX)
+                       return MLX5_CAP_FLOWTABLE_NIC_TX(ibdev->mdev,
+                               reformat_l2_to_l3_tunnel);
+               break;
+       case MLX5_IB_UAPI_FLOW_ACTION_PACKET_REFORMAT_TYPE_L3_TUNNEL_TO_L2:
+               if (ft_type == MLX5_IB_UAPI_FLOW_TABLE_TYPE_NIC_RX)
+                       return MLX5_CAP_FLOWTABLE_NIC_RX(ibdev->mdev,
+                               reformat_l3_tunnel_to_l2);
+               break;
        case MLX5_IB_UAPI_FLOW_ACTION_PACKET_REFORMAT_TYPE_L2_TUNNEL_TO_L2:
                if (ft_type == MLX5_IB_UAPI_FLOW_TABLE_TYPE_NIC_RX)
                        return MLX5_CAP_FLOWTABLE_NIC_RX(ibdev->mdev, decap);
@@ -304,6 +323,56 @@ static bool mlx5_ib_flow_action_packet_reformat_valid(struct mlx5_ib_dev *ibdev,
        return false;
 }
 
+static int mlx5_ib_dv_to_prm_packet_reforamt_type(u8 dv_prt, u8 *prm_prt)
+{
+       switch (dv_prt) {
+       case MLX5_IB_UAPI_FLOW_ACTION_PACKET_REFORMAT_TYPE_L2_TO_L2_TUNNEL:
+               *prm_prt = MLX5_REFORMAT_TYPE_L2_TO_L2_TUNNEL;
+               break;
+       case MLX5_IB_UAPI_FLOW_ACTION_PACKET_REFORMAT_TYPE_L3_TUNNEL_TO_L2:
+               *prm_prt = MLX5_REFORMAT_TYPE_L3_TUNNEL_TO_L2;
+               break;
+       case MLX5_IB_UAPI_FLOW_ACTION_PACKET_REFORMAT_TYPE_L2_TO_L3_TUNNEL:
+               *prm_prt = MLX5_REFORMAT_TYPE_L2_TO_L3_TUNNEL;
+               break;
+       default:
+               return -EINVAL;
+       }
+
+       return 0;
+}
+
+static int mlx5_ib_flow_action_create_packet_reformat_ctx(
+       struct mlx5_ib_dev *dev,
+       struct mlx5_ib_flow_action *maction,
+       u8 ft_type, u8 dv_prt,
+       void *in, size_t len)
+{
+       enum mlx5_flow_namespace_type namespace;
+       u8 prm_prt;
+       int ret;
+
+       ret = mlx5_ib_ft_type_to_namespace(ft_type, &namespace);
+       if (ret)
+               return ret;
+
+       ret = mlx5_ib_dv_to_prm_packet_reforamt_type(dv_prt, &prm_prt);
+       if (ret)
+               return ret;
+
+       ret = mlx5_packet_reformat_alloc(dev->mdev, prm_prt, len,
+                                        in, namespace,
+                                        &maction->flow_action_raw.action_id);
+       if (ret)
+               return ret;
+
+       maction->flow_action_raw.sub_type =
+               MLX5_IB_FLOW_ACTION_PACKET_REFORMAT;
+       maction->flow_action_raw.dev = dev;
+
+       return 0;
+}
+
 static int UVERBS_HANDLER(MLX5_IB_METHOD_FLOW_ACTION_CREATE_PACKET_REFORMAT)(
        struct ib_uverbs_file *file,
        struct uverbs_attr_bundle *attrs)
@@ -338,12 +407,34 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_FLOW_ACTION_CREATE_PACKET_REFORMAT)(
                maction->flow_action_raw.sub_type =
                        MLX5_IB_FLOW_ACTION_DECAP;
                maction->flow_action_raw.dev = mdev;
+       } else {
+               void *in;
+               int len;
+
+               in = uverbs_attr_get_alloced_ptr(attrs,
+                       MLX5_IB_ATTR_CREATE_PACKET_REFORMAT_DATA_BUF);
+               if (IS_ERR(in)) {
+                       ret = PTR_ERR(in);
+                       goto free_maction;
+               }
+
+               len = uverbs_attr_get_len(attrs,
+                       MLX5_IB_ATTR_CREATE_PACKET_REFORMAT_DATA_BUF);
+
+               ret = mlx5_ib_flow_action_create_packet_reformat_ctx(mdev,
+                       maction, ft_type, dv_prt, in, len);
+               if (ret)
+                       goto free_maction;
        }
 
        uverbs_flow_action_fill_action(&maction->ib_action, uobj,
                                       uobj->context->device,
                                       IB_FLOW_ACTION_UNSPECIFIED);
        return 0;
+
+free_maction:
+       kfree(maction);
+       return ret;
 }
 
 DECLARE_UVERBS_NAMED_METHOD(
@@ -401,6 +492,10 @@ DECLARE_UVERBS_NAMED_METHOD(
                        UVERBS_OBJECT_FLOW_ACTION,
                        UVERBS_ACCESS_NEW,
                        UA_MANDATORY),
+       UVERBS_ATTR_PTR_IN(MLX5_IB_ATTR_CREATE_PACKET_REFORMAT_DATA_BUF,
+                          UVERBS_ATTR_MIN_SIZE(1),
+                          UA_ALLOC_AND_COPY,
+                          UA_OPTIONAL),
        UVERBS_ATTR_CONST_IN(MLX5_IB_ATTR_CREATE_PACKET_REFORMAT_TYPE,
                             enum mlx5_ib_uapi_flow_action_packet_reformat_type,
                             UA_MANDATORY),

diff --git a/drivers/infiniband/hw/mlx5/mlx5_ib.h b/drivers/infiniband/hw/mlx5/mlx5_ib.h
index 8ac84cc00fd54d186fee8ebd54b13f92af98a07e..eb6a0ca0247f58010bf55afbf85ea35f9067aa66 100644 (file)
--- a/drivers/infiniband/hw/mlx5/mlx5_ib.h
+++ b/drivers/infiniband/hw/mlx5/mlx5_ib.h
@@ -153,6 +153,7 @@ struct mlx5_ib_pd {
 
 enum {
        MLX5_IB_FLOW_ACTION_MODIFY_HEADER,
+       MLX5_IB_FLOW_ACTION_PACKET_REFORMAT,
        MLX5_IB_FLOW_ACTION_DECAP,
 };
 

diff --git a/include/uapi/rdma/mlx5_user_ioctl_cmds.h b/include/uapi/rdma/mlx5_user_ioctl_cmds.h
index 40db7fca3d0bd89fc83f2c20c6ecbe7b421bfb20..75c7093fd95be84831c634bbb4dc27f3c98e03a1 100644 (file)
--- a/include/uapi/rdma/mlx5_user_ioctl_cmds.h
+++ b/include/uapi/rdma/mlx5_user_ioctl_cmds.h
@@ -181,6 +181,7 @@ enum mlx5_ib_create_flow_action_create_packet_reformat_attrs {
        MLX5_IB_ATTR_CREATE_PACKET_REFORMAT_HANDLE = (1U << UVERBS_ID_NS_SHIFT),
        MLX5_IB_ATTR_CREATE_PACKET_REFORMAT_TYPE,
        MLX5_IB_ATTR_CREATE_PACKET_REFORMAT_FT_TYPE,
+       MLX5_IB_ATTR_CREATE_PACKET_REFORMAT_DATA_BUF,
 };
 
 #endif

diff --git a/include/uapi/rdma/mlx5_user_ioctl_verbs.h b/include/uapi/rdma/mlx5_user_ioctl_verbs.h
index b5fda0fcd484b1b537fd839ddd57d2aa5140071f..4ef62c0e8452be693e6c707b1ba257b8a2aaf184 100644 (file)
--- a/include/uapi/rdma/mlx5_user_ioctl_verbs.h
+++ b/include/uapi/rdma/mlx5_user_ioctl_verbs.h
@@ -46,6 +46,9 @@ enum mlx5_ib_uapi_flow_table_type {
 
 enum mlx5_ib_uapi_flow_action_packet_reformat_type {
        MLX5_IB_UAPI_FLOW_ACTION_PACKET_REFORMAT_TYPE_L2_TUNNEL_TO_L2 = 0x0,
+       MLX5_IB_UAPI_FLOW_ACTION_PACKET_REFORMAT_TYPE_L2_TO_L2_TUNNEL = 0x1,
+       MLX5_IB_UAPI_FLOW_ACTION_PACKET_REFORMAT_TYPE_L3_TUNNEL_TO_L2 = 0x2,
+       MLX5_IB_UAPI_FLOW_ACTION_PACKET_REFORMAT_TYPE_L2_TO_L3_TUNNEL = 0x3,
 };
 
 #endif