RDMA/mlx5: Fix flow counter query via DEVX

[ Upstream commit 3e358ea8614ddfbc59ca7a3f5dff5dde2b350b2c ]

Commit cited in "fixes" tag added bulk support for flow counters but it
didn't account that's also possible to query a counter using a non-base id
if the counter was allocated as bulk.

When a user performs a query, validate the flow counter id given in the
mailbox is inside the valid range taking bulk value into account.

Fixes: 208d70f562e5 ("IB/mlx5: Support flow counters offset for bulk counters")
Signed-off-by: Mark Bloch <mbloch@nvidia.com>
Reviewed-by: Maor Gottlieb <maorg@nvidia.com>
Link: https://lore.kernel.org/r/79d7fbe291690128e44672418934256254d93115.1681377114.git.leon@kernel.org
Signed-off-by: Leon Romanovsky <leon@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/infiniband/hw/mlx5/devx.c b/drivers/infiniband/hw/mlx5/devx.c
index 2211a0be16f36c32a6e1132503e97a082cc390ac..f8e2baed27a5cecc445d0300c33ee1a7096ce1a4 100644 (file)
--- a/drivers/infiniband/hw/mlx5/devx.c
+++ b/drivers/infiniband/hw/mlx5/devx.c
@@ -666,7 +666,21 @@ static bool devx_is_valid_obj_id(struct uverbs_attr_bundle *attrs,
                                      obj_id;
 
        case MLX5_IB_OBJECT_DEVX_OBJ:
-               return ((struct devx_obj *)uobj->object)->obj_id == obj_id;
+       {
+               u16 opcode = MLX5_GET(general_obj_in_cmd_hdr, in, opcode);
+               struct devx_obj *devx_uobj = uobj->object;
+
+               if (opcode == MLX5_CMD_OP_QUERY_FLOW_COUNTER &&
+                   devx_uobj->flow_counter_bulk_size) {
+                       u64 end;
+
+                       end = devx_uobj->obj_id +
+                               devx_uobj->flow_counter_bulk_size;
+                       return devx_uobj->obj_id <= obj_id && end > obj_id;
+               }
+
+               return devx_uobj->obj_id == obj_id;
+       }
 
        default:
                return false;
@@ -1517,10 +1531,17 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_OBJ_CREATE)(
                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;
+               u32 bulk = MLX5_GET(alloc_flow_counter_in,
+                                   cmd_in,
+                                   flow_counter_bulk_log_size);
+
+               if (bulk)
+                       bulk = 1 << bulk;
+               else
+                       bulk = 128UL * MLX5_GET(alloc_flow_counter_in,
+                                               cmd_in,
+                                               flow_counter_bulk);
+               obj->flow_counter_bulk_size = bulk;
        }
 
        uobj->object = obj;

diff --git a/include/linux/mlx5/mlx5_ifc.h b/include/linux/mlx5/mlx5_ifc.h
index e45bdec73baf119c4d1c5abce5f3c312add8988e..097cbf84c1e05201d932b3c5b7c0a4538bf29f28 100644 (file)
--- a/include/linux/mlx5/mlx5_ifc.h
+++ b/include/linux/mlx5/mlx5_ifc.h
@@ -9063,7 +9063,8 @@ struct mlx5_ifc_alloc_flow_counter_in_bits {
        u8         reserved_at_20[0x10];
        u8         op_mod[0x10];
 
-       u8         reserved_at_40[0x38];
+       u8         reserved_at_40[0x33];
+       u8         flow_counter_bulk_log_size[0x5];
        u8         flow_counter_bulk[0x8];
 };