Re: [PATCH rdma-next v2 05/13] RDMA/counter: Add an is_disabled field in struct rdma_hw_stats

From: Jason Gunthorpe
Date: Mon Oct 04 2021 - 14:00:27 EST


On Thu, Sep 30, 2021 at 11:02:21AM +0300, Leon Romanovsky wrote:
> diff --git a/drivers/infiniband/core/nldev.c b/drivers/infiniband/core/nldev.c
> index 3f6b98a87566..67519730b1ac 100644
> +++ b/drivers/infiniband/core/nldev.c
> @@ -968,15 +968,21 @@ static int fill_stat_counter_hwcounters(struct sk_buff *msg,
> if (!table_attr)
> return -EMSGSIZE;
>
> - for (i = 0; i < st->num_counters; i++)
> + mutex_lock(&st->lock);
> + for (i = 0; i < st->num_counters; i++) {
> + if (test_bit(i, st->is_disabled))
> + continue;
> if (rdma_nl_stat_hwcounter_entry(msg, st->descs[i].name,
> st->value[i]))
> goto err;
> + }
> + mutex_unlock(&st->lock);
>
> nla_nest_end(msg, table_attr);
> return 0;
>
> err:
> + mutex_unlock(&st->lock);
> nla_nest_cancel(msg, table_attr);
> return -EMSGSIZE;
> }
> @@ -2104,6 +2110,9 @@ static int stat_get_doit_default_counter(struct sk_buff *skb,
> goto err_stats;
> }
> for (i = 0; i < num_cnts; i++) {
> + if (test_bit(i, stats->is_disabled))
> + continue;
> +
> v = stats->value[i] +
> rdma_counter_get_hwstat_value(device, port, i);
> if (rdma_nl_stat_hwcounter_entry(msg,
> diff --git a/drivers/infiniband/core/verbs.c b/drivers/infiniband/core/verbs.c
> index 71ece4b00234..890593d5100d 100644
> +++ b/drivers/infiniband/core/verbs.c
> @@ -2987,16 +2987,28 @@ struct rdma_hw_stats *rdma_alloc_hw_stats_struct(
> if (!stats)
> return NULL;
>
> + stats->is_disabled = kcalloc(BITS_TO_LONGS(num_counters),
> + sizeof(long), GFP_KERNEL);

is_disabled is an unsigned long, not a long

This should just be sizeof(*stats->is_disabled)

Jason