Skip to content

Commit

Permalink
RDMA/nldev: Allow optional-counter status configuration through RDMA …
Browse files Browse the repository at this point in the history
…netlink

Provide an option to allow users to enable/disable optional counters
through RDMA netlink. Limiting it to users with ADMIN capability only.

Examples:
1. Enable optional counters cc_rx_ce_pkts and cc_rx_cnp_pkts (and
   disable all others):
$ sudo rdma statistic set link rocep8s0f0/1 optional-counters \
    cc_rx_ce_pkts,cc_rx_cnp_pkts

2. Remove all optional counters:
$ sudo rdma statistic unset link rocep8s0f0/1 optional-counters

Link: https://lore.kernel.org/r/20211008122439.166063-10-markzhang@nvidia.com
Signed-off-by: Aharon Landau <aharonl@nvidia.com>
Signed-off-by: Leon Romanovsky <leonro@nvidia.com>
Signed-off-by: Mark Zhang <markzhang@nvidia.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
  • Loading branch information
Aharon Landau authored and Jason Gunthorpe committed Oct 12, 2021
1 parent 822cf78 commit 3c3c1f1
Showing 1 changed file with 57 additions and 4 deletions.
61 changes: 57 additions & 4 deletions drivers/infiniband/core/nldev.c
Original file line number Diff line number Diff line change
Expand Up @@ -1945,6 +1945,50 @@ static int nldev_stat_set_mode_doit(struct sk_buff *msg,
return ret;
}

static int nldev_stat_set_counter_dynamic_doit(struct nlattr *tb[],
struct ib_device *device,
u32 port)
{
struct rdma_hw_stats *stats;
int rem, i, index, ret = 0;
struct nlattr *entry_attr;
unsigned long *target;

stats = ib_get_hw_stats_port(device, port);
if (!stats)
return -EINVAL;

target = kcalloc(BITS_TO_LONGS(stats->num_counters),
sizeof(*stats->is_disabled), GFP_KERNEL);
if (!target)
return -ENOMEM;

nla_for_each_nested(entry_attr, tb[RDMA_NLDEV_ATTR_STAT_HWCOUNTERS],
rem) {
index = nla_get_u32(entry_attr);
if ((index >= stats->num_counters) ||
!(stats->descs[index].flags & IB_STAT_FLAG_OPTIONAL)) {
ret = -EINVAL;
goto out;
}

set_bit(index, target);
}

for (i = 0; i < stats->num_counters; i++) {
if (!(stats->descs[i].flags & IB_STAT_FLAG_OPTIONAL))
continue;

ret = rdma_counter_modify(device, port, i, test_bit(i, target));
if (ret)
goto out;
}

out:
kfree(target);
return ret;
}

static int nldev_stat_set_doit(struct sk_buff *skb, struct nlmsghdr *nlh,
struct netlink_ext_ack *extack)
{
Expand All @@ -1971,7 +2015,8 @@ static int nldev_stat_set_doit(struct sk_buff *skb, struct nlmsghdr *nlh,
goto err_put_device;
}

if (!tb[RDMA_NLDEV_ATTR_STAT_MODE]) {
if (!tb[RDMA_NLDEV_ATTR_STAT_MODE] &&
!tb[RDMA_NLDEV_ATTR_STAT_HWCOUNTERS]) {
ret = -EINVAL;
goto err_put_device;
}
Expand All @@ -1991,9 +2036,17 @@ static int nldev_stat_set_doit(struct sk_buff *skb, struct nlmsghdr *nlh,
goto err_free_msg;
}

ret = nldev_stat_set_mode_doit(msg, extack, tb, device, port);
if (ret)
goto err_free_msg;
if (tb[RDMA_NLDEV_ATTR_STAT_MODE]) {
ret = nldev_stat_set_mode_doit(msg, extack, tb, device, port);
if (ret)
goto err_free_msg;
}

if (tb[RDMA_NLDEV_ATTR_STAT_HWCOUNTERS]) {
ret = nldev_stat_set_counter_dynamic_doit(tb, device, port);
if (ret)
goto err_free_msg;
}

nlmsg_end(msg, nlh);
ib_device_put(device);
Expand Down

0 comments on commit 3c3c1f1

Please sign in to comment.