RDMA/mlx5: Add flow actions support to raw create flow

Support attaching flow actions to a flow rule via raw create flow.
For now only NIC RX path is supported. This change requires to export
flow resources management functions so we can maintain proper bookkeeping
of flow actions.

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

diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c
index c054d65..9c87c98 100644 (file)
--- a/drivers/infiniband/core/uverbs_cmd.c
+++ b/drivers/infiniband/core/uverbs_cmd.c
@@ -2747,7 +2747,7 @@ out_put:
        return ret ? ret : in_len;
 }
 
-static struct ib_uflow_resources *flow_resources_alloc(size_t num_specs)
+struct ib_uflow_resources *flow_resources_alloc(size_t num_specs)
 {
        struct ib_uflow_resources *resources;
 
@@ -2777,6 +2777,7 @@ err:
 
        return NULL;
 }
+EXPORT_SYMBOL(flow_resources_alloc);
 
 void ib_uverbs_flow_resources_free(struct ib_uflow_resources *uflow_res)
 {
@@ -2795,10 +2796,11 @@ void ib_uverbs_flow_resources_free(struct ib_uflow_resources *uflow_res)
        kfree(uflow_res->counters);
        kfree(uflow_res);
 }
+EXPORT_SYMBOL(ib_uverbs_flow_resources_free);
 
-static void flow_resources_add(struct ib_uflow_resources *uflow_res,
-                              enum ib_flow_spec_type type,
-                              void *ibobj)
+void flow_resources_add(struct ib_uflow_resources *uflow_res,
+                       enum ib_flow_spec_type type,
+                       void *ibobj)
 {
        WARN_ON(uflow_res->num >= uflow_res->max);
 
@@ -2819,6 +2821,7 @@ static void flow_resources_add(struct ib_uflow_resources *uflow_res,
 
        uflow_res->num++;
 }
+EXPORT_SYMBOL(flow_resources_add);
 
 static int kern_spec_to_ib_spec_action(struct ib_uverbs_file *ufile,
                                       struct ib_uverbs_flow_spec *kern_spec,

diff --git a/drivers/infiniband/hw/mlx5/flow.c b/drivers/infiniband/hw/mlx5/flow.c
index 0e91349..ce9276a 100644 (file)
--- a/drivers/infiniband/hw/mlx5/flow.c
+++ b/drivers/infiniband/hw/mlx5/flow.c
@@ -58,12 +58,15 @@ static const struct uverbs_attr_spec mlx5_ib_flow_type[] = {
        },
 };
 
+#define MLX5_IB_CREATE_FLOW_MAX_FLOW_ACTIONS 2
 static int UVERBS_HANDLER(MLX5_IB_METHOD_CREATE_FLOW)(
        struct ib_uverbs_file *file, struct uverbs_attr_bundle *attrs)
 {
        struct mlx5_flow_act flow_act = {.flow_tag = MLX5_FS_DEFAULT_FLOW_TAG};
        struct mlx5_ib_flow_handler *flow_handler;
        struct mlx5_ib_flow_matcher *fs_matcher;
+       struct ib_uobject **arr_flow_actions;
+       struct ib_uflow_resources *uflow_res;
        void *devx_obj;
        int dest_id, dest_type;
        void *cmd_in;
@@ -73,6 +76,7 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_CREATE_FLOW)(
        struct ib_uobject *uobj =
                uverbs_attr_get_uobject(attrs, MLX5_IB_ATTR_CREATE_FLOW_HANDLE);
        struct mlx5_ib_dev *dev = to_mdev(uobj->context->device);
+       int len, ret, i;
 
        if (!capable(CAP_NET_RAW))
                return -EPERM;
@@ -124,15 +128,38 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_CREATE_FLOW)(
                                    MLX5_IB_ATTR_CREATE_FLOW_MATCH_VALUE);
        fs_matcher = uverbs_attr_get_obj(attrs,
                                         MLX5_IB_ATTR_CREATE_FLOW_MATCHER);
+
+       uflow_res = flow_resources_alloc(MLX5_IB_CREATE_FLOW_MAX_FLOW_ACTIONS);
+       if (!uflow_res)
+               return -ENOMEM;
+
+       len = uverbs_attr_get_uobjs_arr(attrs,
+               MLX5_IB_ATTR_CREATE_FLOW_ARR_FLOW_ACTIONS, &arr_flow_actions);
+       for (i = 0; i < len; i++) {
+               struct mlx5_ib_flow_action *maction =
+                       to_mflow_act(arr_flow_actions[i]->object);
+
+               ret = parse_flow_flow_action(maction, false, &flow_act);
+               if (ret)
+                       goto err_out;
+               flow_resources_add(uflow_res, IB_FLOW_SPEC_ACTION_HANDLE,
+                                  arr_flow_actions[i]->object);
+       }
+
        flow_handler = mlx5_ib_raw_fs_rule_add(dev, fs_matcher, &flow_act,
                                               cmd_in, inlen,
                                               dest_id, dest_type);
-       if (IS_ERR(flow_handler))
-               return PTR_ERR(flow_handler);
+       if (IS_ERR(flow_handler)) {
+               ret = PTR_ERR(flow_handler);
+               goto err_out;
+       }
 
-       ib_set_flow(uobj, &flow_handler->ibflow, qp, &dev->ib_dev, NULL);
+       ib_set_flow(uobj, &flow_handler->ibflow, qp, &dev->ib_dev, uflow_res);
 
        return 0;
+err_out:
+       ib_uverbs_flow_resources_free(uflow_res);
+       return ret;
 }
 
 static int flow_matcher_cleanup(struct ib_uobject *uobject,
@@ -459,7 +486,12 @@ DECLARE_UVERBS_NAMED_METHOD(
                        UVERBS_ACCESS_READ),
        UVERBS_ATTR_IDR(MLX5_IB_ATTR_CREATE_FLOW_DEST_DEVX,
                        MLX5_IB_OBJECT_DEVX_OBJ,
-                       UVERBS_ACCESS_READ));
+                       UVERBS_ACCESS_READ),
+       UVERBS_ATTR_IDRS_ARR(MLX5_IB_ATTR_CREATE_FLOW_ARR_FLOW_ACTIONS,
+                            UVERBS_OBJECT_FLOW_ACTION,
+                            UVERBS_ACCESS_READ, 1,
+                            MLX5_IB_CREATE_FLOW_MAX_FLOW_ACTIONS,
+                            UA_OPTIONAL));
 
 DECLARE_UVERBS_NAMED_METHOD_DESTROY(
        MLX5_IB_METHOD_DESTROY_FLOW,

diff --git a/include/rdma/uverbs_std_types.h b/include/rdma/uverbs_std_types.h
index dfd6d35..3db2802 100644 (file)
--- a/include/rdma/uverbs_std_types.h
+++ b/include/rdma/uverbs_std_types.h
@@ -166,6 +166,12 @@ struct ib_uflow_object {
        struct ib_uflow_resources       *resources;
 };
 
+struct ib_uflow_resources *flow_resources_alloc(size_t num_specs);
+void flow_resources_add(struct ib_uflow_resources *uflow_res,
+                       enum ib_flow_spec_type type,
+                       void *ibobj);
+void ib_uverbs_flow_resources_free(struct ib_uflow_resources *uflow_res);
+
 static inline void ib_set_flow(struct ib_uobject *uobj, struct ib_flow *ibflow,
                               struct ib_qp *qp, struct ib_device *device,
                               struct ib_uflow_resources *uflow_res)

diff --git a/include/uapi/rdma/mlx5_user_ioctl_cmds.h b/include/uapi/rdma/mlx5_user_ioctl_cmds.h
index 75c7093..91c3d42 100644 (file)
--- a/include/uapi/rdma/mlx5_user_ioctl_cmds.h
+++ b/include/uapi/rdma/mlx5_user_ioctl_cmds.h
@@ -155,6 +155,7 @@ enum mlx5_ib_create_flow_attrs {
        MLX5_IB_ATTR_CREATE_FLOW_DEST_QP,
        MLX5_IB_ATTR_CREATE_FLOW_DEST_DEVX,
        MLX5_IB_ATTR_CREATE_FLOW_MATCHER,
+       MLX5_IB_ATTR_CREATE_FLOW_ARR_FLOW_ACTIONS,
 };
 
 enum mlx5_ib_destoy_flow_attrs {