net/mlx5: fix metering with flow ID 0

When getting meter flow_id bits, there's an issue that not handling
correctly if flow_id is 0.

This fix this issue that when flow_id is 0, treat it as 1 bit.

Fixes: 83306d6c465a ("net/mlx5: fix meter statistics")
Cc: stable@dpdk.org
Signed-off-by: Shun Hao <shunh@nvidia.com>
Acked-by: Matan Azrad <matan@nvidia.com>

diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 8d4b4a8..23d4224 100644 (file)
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -4802,8 +4802,8 @@ flow_meter_split_prep(struct rte_eth_dev *dev,
                                        RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL,
                                        "Failed to allocate meter flow id.");
                flow_id = tag_id - 1;
-               flow_id_bits = MLX5_REG_BITS - __builtin_clz(flow_id);
-               flow_id_bits = flow_id_bits ? flow_id_bits : 1;
+               flow_id_bits = (!flow_id) ? 1 :
+                               (MLX5_REG_BITS - __builtin_clz(flow_id));
                if ((flow_id_bits + priv->sh->mtrmng->max_mtr_bits) >
                    mtr_reg_bits) {
                        mlx5_ipool_free(fm->flow_ipool, tag_id);