IB/mlx5: Support flow counters offset for bulk counters

Add support for flow steering counters action with a non-base counter
ID (offset) for bulk counters.

When creating a flow counter object, save the bulk value.  This value is
used when a flow action with a non-base counter ID is requested - to
validate that the required offset is in the range of the allocated bulk.

Link: https://lore.kernel.org/r/20191103140723.77411-1-leon@kernel.org
Signed-off-by: Yevgeny Kliteynik <kliteyn@mellanox.com>
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
Reviewed-by: Mark Bloch <markb@mellanox.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>

diff --git a/drivers/infiniband/hw/mlx5/devx.c b/drivers/infiniband/hw/mlx5/devx.c
index 6b1fca91d7d3d131a49a137b12da6a8d595bf420..2a5812a4c3bba5b08645279e34d37d0bffb1f399 100644 (file)
--- a/drivers/infiniband/hw/mlx5/devx.c
+++ b/drivers/infiniband/hw/mlx5/devx.c
@@ -100,6 +100,7 @@ struct devx_obj {
                struct mlx5_ib_devx_mr  devx_mr;
                struct mlx5_core_dct    core_dct;
                struct mlx5_core_cq     core_cq;
+               u32                     flow_counter_bulk_size;
        };
        struct list_head event_sub; /* holds devx_event_subscription entries */
 };
@@ -192,15 +193,20 @@ bool mlx5_ib_devx_is_flow_dest(void *obj, int *dest_id, int *dest_type)
        }
 }
 
-bool mlx5_ib_devx_is_flow_counter(void *obj, u32 *counter_id)
+bool mlx5_ib_devx_is_flow_counter(void *obj, u32 offset, u32 *counter_id)
 {
        struct devx_obj *devx_obj = obj;
        u16 opcode = MLX5_GET(general_obj_in_cmd_hdr, devx_obj->dinbox, opcode);
 
        if (opcode == MLX5_CMD_OP_DEALLOC_FLOW_COUNTER) {
+
+               if (offset && offset >= devx_obj->flow_counter_bulk_size)
+                       return false;
+
                *counter_id = MLX5_GET(dealloc_flow_counter_in,
                                       devx_obj->dinbox,
                                       flow_counter_id);
+               *counter_id += offset;
                return true;
        }
 
@@ -1463,6 +1469,13 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_OBJ_CREATE)(
        if (err)
                goto obj_free;
 
+       if (opcode == MLX5_CMD_OP_ALLOC_FLOW_COUNTER) {
+               u8 bulk = MLX5_GET(alloc_flow_counter_in,
+                                  cmd_in,
+                                  flow_counter_bulk);
+               obj->flow_counter_bulk_size = 128UL * bulk;
+       }
+
        uobj->object = obj;
        INIT_LIST_HEAD(&obj->event_sub);
        obj->ib_dev = dev;

diff --git a/drivers/infiniband/hw/mlx5/flow.c b/drivers/infiniband/hw/mlx5/flow.c
index b198ff10cde96c441bdf686c73739d0e3a1b596a..dbee17d22d50b844ce28dfad3546012959f5a49e 100644 (file)
--- a/drivers/infiniband/hw/mlx5/flow.c
+++ b/drivers/infiniband/hw/mlx5/flow.c
@@ -85,6 +85,8 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_CREATE_FLOW)(
        struct mlx5_ib_dev *dev = mlx5_udata_to_mdev(&attrs->driver_udata);
        int len, ret, i;
        u32 counter_id = 0;
+       u32 *offset_attr;
+       u32 offset = 0;
 
        if (!capable(CAP_NET_RAW))
                return -EPERM;
@@ -151,8 +153,27 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_CREATE_FLOW)(
        if (len) {
                devx_obj = arr_flow_actions[0]->object;
 
-               if (!mlx5_ib_devx_is_flow_counter(devx_obj, &counter_id))
+               if (uverbs_attr_is_valid(attrs,
+                                        MLX5_IB_ATTR_CREATE_FLOW_ARR_COUNTERS_DEVX_OFFSET)) {
+
+                       int num_offsets = uverbs_attr_ptr_get_array_size(
+                               attrs,
+                               MLX5_IB_ATTR_CREATE_FLOW_ARR_COUNTERS_DEVX_OFFSET,
+                               sizeof(u32));
+
+                       if (num_offsets != 1)
+                               return -EINVAL;
+
+                       offset_attr = uverbs_attr_get_alloced_ptr(
+                               attrs,
+                               MLX5_IB_ATTR_CREATE_FLOW_ARR_COUNTERS_DEVX_OFFSET);
+                       offset = *offset_attr;
+               }
+
+               if (!mlx5_ib_devx_is_flow_counter(devx_obj, offset,
+                                                 &counter_id))
                        return -EINVAL;
+
                flow_act.action |= MLX5_FLOW_CONTEXT_ACTION_COUNT;
        }
 
@@ -598,7 +619,11 @@ DECLARE_UVERBS_NAMED_METHOD(
        UVERBS_ATTR_IDRS_ARR(MLX5_IB_ATTR_CREATE_FLOW_ARR_COUNTERS_DEVX,
                             MLX5_IB_OBJECT_DEVX_OBJ,
                             UVERBS_ACCESS_READ, 1, 1,
-                            UA_OPTIONAL));
+                            UA_OPTIONAL),
+       UVERBS_ATTR_PTR_IN(MLX5_IB_ATTR_CREATE_FLOW_ARR_COUNTERS_DEVX_OFFSET,
+                          UVERBS_ATTR_MIN_SIZE(sizeof(u32)),
+                          UA_OPTIONAL,
+                          UA_ALLOC_AND_COPY));
 
 DECLARE_UVERBS_NAMED_METHOD_DESTROY(
        MLX5_IB_METHOD_DESTROY_FLOW,

diff --git a/drivers/infiniband/hw/mlx5/mlx5_ib.h b/drivers/infiniband/hw/mlx5/mlx5_ib.h
index 933a2059886b04cc656221866a1f8a2fba66eca0..d14fe43837e728dda01280b81755816d4aa093ba 100644 (file)
--- a/drivers/infiniband/hw/mlx5/mlx5_ib.h
+++ b/drivers/infiniband/hw/mlx5/mlx5_ib.h
@@ -1366,7 +1366,7 @@ struct mlx5_ib_flow_handler *mlx5_ib_raw_fs_rule_add(
        struct mlx5_flow_act *flow_act, u32 counter_id,
        void *cmd_in, int inlen, int dest_id, int dest_type);
 bool mlx5_ib_devx_is_flow_dest(void *obj, int *dest_id, int *dest_type);
-bool mlx5_ib_devx_is_flow_counter(void *obj, u32 *counter_id);
+bool mlx5_ib_devx_is_flow_counter(void *obj, u32 offset, u32 *counter_id);
 int mlx5_ib_get_flow_trees(const struct uverbs_object_tree_def **root);
 void mlx5_ib_destroy_flow_action_raw(struct mlx5_ib_flow_action *maction);
 #else

diff --git a/include/uapi/rdma/mlx5_user_ioctl_cmds.h b/include/uapi/rdma/mlx5_user_ioctl_cmds.h
index d0da070cf0ab76867ddb0a2995cc6b321b264c0d..20d88307f75f3b9b24fc062eadb79aa90d8fd1dc 100644 (file)
--- a/include/uapi/rdma/mlx5_user_ioctl_cmds.h
+++ b/include/uapi/rdma/mlx5_user_ioctl_cmds.h
@@ -198,6 +198,7 @@ enum mlx5_ib_create_flow_attrs {
        MLX5_IB_ATTR_CREATE_FLOW_ARR_FLOW_ACTIONS,
        MLX5_IB_ATTR_CREATE_FLOW_TAG,
        MLX5_IB_ATTR_CREATE_FLOW_ARR_COUNTERS_DEVX,
+       MLX5_IB_ATTR_CREATE_FLOW_ARR_COUNTERS_DEVX_OFFSET,
 };
 
 enum mlx5_ib_destoy_flow_attrs {