rdma: Add stat "mode" support

This patch introduces the "mode" command, which presents the enabled or
supported (when the "supported" argument is available) optional
counters.

An optional counter is a vendor-specific counter that may be
dynamically enabled/disabled. This enhancement of hwcounters allows
exposing of counters which are for example mutual exclusive and cannot
be enabled at the same time, counters that might degrades performance,
optional debug counters, etc.

Examples:
To present currently enabled optional counters on link rocep8s0f0/1:
    $ rdma statistic mode link rocep8s0f0/1
    link rocep8s0f0/1 optional-counters cc_rx_ce_pkts

To present supported optional counters on link rocep8s0f0/1:
    $ rdma statistic mode supported link rocep8s0f0/1
    link rocep8s0f0/1 supported optional-counters cc_rx_ce_pkts,cc_rx_cnp_pkts,cc_tx_cnp_pkts

Signed-off-by: Neta Ostrovsky <netao@nvidia.com>
Reviewed-by: Leon Romanovsky <leonro@nvidia.com>
Signed-off-by: Mark Zhang <markzhang@nvidia.com>
Signed-off-by: David Ahern <dsahern@kernel.org>

diff --git a/man/man8/rdma-statistic.8 b/man/man8/rdma-statistic.8
index 7160bcdf48fd73661ba17f1f0b54c15161ec981f..885769bc9eb66f6fb1112d38279cbc0cad70486c 100644 (file)
--- a/man/man8/rdma-statistic.8
+++ b/man/man8/rdma-statistic.8
@@ -58,6 +58,13 @@ rdma-statistic \- RDMA statistic counter configuration
 .RI "[ " COUNTER-ID " ]"
 .RI "[ " OBJECT-ID " ]"
 
+.ti -8
+.B rdma statistic
+.B mode
+.B "[" supported "]"
+.B link
+.RI "[ " DEV/PORT_INDEX " ]"
+
 .ti -8
 .IR COUNTER_SCOPE " := "
 .RB "{ " link " | " dev " }"
@@ -100,6 +107,10 @@ When unbound the statistics of this object are no longer available in this count
 - specifies the id of the counter to be bound.
 If this argument is omitted then a new counter will be allocated.
 
+.SS rdma statistic mode - Display the enabled optional counters for each link.
+
+.SS rdma statistic mode supported - Display the supported optional counters for each link.
+
 .SH "EXAMPLES"
 .PP
 rdma statistic show
@@ -186,6 +197,16 @@ rdma statistic show mr mrn 6
 .RS 4
 Dump a specific MR statistics with mrn 6. Dumps nothing if does not exists.
 .RE
+.PP
+rdma statistic mode link mlx5_2/1
+.RS 4
+Display the optional counters that was enabled on mlx5_2/1.
+.RE
+.PP
+rdma statistic mode supported link mlx5_2/1
+.RS 4
+Display the optional counters that mlx5_2/1 supports.
+.RE
 
 .SH SEE ALSO
 .BR rdma (8),
@@ -198,3 +219,5 @@ Dump a specific MR statistics with mrn 6. Dumps nothing if does not exists.
 Mark Zhang <markz@mellanox.com>
 .br
 Erez Alfasi <ereza@mellanox.com>
+.br
+Neta Ostrovsky <netao@nvidia.com>

diff --git a/rdma/stat.c b/rdma/stat.c
index 8edf7bf1c3747d53145bf1c3235a1fa69063c401..7d645d8f6a2a85769882ef7f8152f2defd3b66f0 100644 (file)
--- a/rdma/stat.c
+++ b/rdma/stat.c
@@ -20,6 +20,8 @@ static int stat_help(struct rd *rd)
        pr_out("       %s statistic OBJECT unbind COUNTER_SCOPE [DEV/PORT_INDEX] [COUNTER-ID]\n", rd->filename);
        pr_out("       %s statistic show\n", rd->filename);
        pr_out("       %s statistic show link [ DEV/PORT_INDEX ]\n", rd->filename);
+       pr_out("       %s statistic mode [ supported ]\n", rd->filename);
+       pr_out("       %s statistic mode [ supported ] link [ DEV/PORT_INDEX ]\n", rd->filename);
        pr_out("where  OBJECT: = { qp }\n");
        pr_out("       CRITERIA : = { type }\n");
        pr_out("       COUNTER_SCOPE: = { link | dev }\n");
@@ -37,6 +39,10 @@ static int stat_help(struct rd *rd)
        pr_out("       %s statistic qp unbind link mlx5_2/1 cntn 4 lqpn 178\n", rd->filename);
        pr_out("       %s statistic show\n", rd->filename);
        pr_out("       %s statistic show link mlx5_2/1\n", rd->filename);
+       pr_out("       %s statistic mode\n", rd->filename);
+       pr_out("       %s statistic mode link mlx5_2/1\n", rd->filename);
+       pr_out("       %s statistic mode supported\n", rd->filename);
+       pr_out("       %s statistic mode supported link mlx5_2/1\n", rd->filename);
 
        return 0;
 }
@@ -715,6 +721,162 @@ static int stat_qp(struct rd *rd)
        return rd_exec_cmd(rd, cmds, "parameter");
 }
 
+static int do_stat_mode_parse_cb(const struct nlmsghdr *nlh, void *data,
+                                bool supported)
+{
+       struct nlattr *tb[RDMA_NLDEV_ATTR_MAX] = {};
+       struct nlattr *nla_entry;
+       const char *dev, *name;
+       struct rd *rd = data;
+       int enabled, err = 0;
+       bool isfirst = true;
+       uint32_t port;
+
+       mnl_attr_parse(nlh, 0, rd_attr_cb, tb);
+       if (!tb[RDMA_NLDEV_ATTR_DEV_INDEX] || !tb[RDMA_NLDEV_ATTR_DEV_NAME] ||
+           !tb[RDMA_NLDEV_ATTR_PORT_INDEX] ||
+           !tb[RDMA_NLDEV_ATTR_STAT_HWCOUNTERS])
+               return MNL_CB_ERROR;
+
+       dev = mnl_attr_get_str(tb[RDMA_NLDEV_ATTR_DEV_NAME]);
+       port = mnl_attr_get_u32(tb[RDMA_NLDEV_ATTR_PORT_INDEX]);
+
+       mnl_attr_for_each_nested(nla_entry,
+                                tb[RDMA_NLDEV_ATTR_STAT_HWCOUNTERS]) {
+               struct nlattr *cnt[RDMA_NLDEV_ATTR_MAX] = {};
+
+               err  = mnl_attr_parse_nested(nla_entry, rd_attr_cb, cnt);
+               if ((err != MNL_CB_OK) ||
+                   (!cnt[RDMA_NLDEV_ATTR_STAT_HWCOUNTER_ENTRY_NAME]))
+                       return -EINVAL;
+
+               if (!cnt[RDMA_NLDEV_ATTR_STAT_HWCOUNTER_DYNAMIC])
+                       continue;
+
+               enabled = mnl_attr_get_u8(cnt[RDMA_NLDEV_ATTR_STAT_HWCOUNTER_DYNAMIC]);
+               name = mnl_attr_get_str(cnt[RDMA_NLDEV_ATTR_STAT_HWCOUNTER_ENTRY_NAME]);
+               if (supported || enabled) {
+                       if (isfirst) {
+                               open_json_object(NULL);
+                               print_color_string(PRINT_ANY, COLOR_NONE,
+                                                  "ifname", "link %s/", dev);
+                               print_color_uint(PRINT_ANY, COLOR_NONE, "port",
+                                                "%u ", port);
+                               if (supported)
+                                       open_json_array(PRINT_ANY,
+                                               "supported optional-counters");
+                               else
+                                       open_json_array(PRINT_ANY,
+                                                       "optional-counters");
+                               print_color_string(PRINT_FP, COLOR_NONE, NULL,
+                                                  " ", NULL);
+                               isfirst = false;
+                       } else {
+                               print_color_string(PRINT_FP, COLOR_NONE, NULL,
+                                                  ",", NULL);
+                       }
+                       if (rd->pretty_output && !rd->json_output)
+                               newline_indent(rd);
+
+                       print_color_string(PRINT_ANY, COLOR_NONE, NULL, "%s",
+                                          name);
+               }
+       }
+
+       if (!isfirst) {
+               close_json_array(PRINT_JSON, NULL);
+               newline(rd);
+       }
+
+       return 0;
+}
+
+static int stat_mode_parse_cb(const struct nlmsghdr *nlh, void *data)
+{
+       return do_stat_mode_parse_cb(nlh, data, false);
+}
+
+static int stat_mode_parse_cb_supported(const struct nlmsghdr *nlh, void *data)
+{
+       return do_stat_mode_parse_cb(nlh, data, true);
+}
+
+static int stat_one_link_get_status_req(struct rd *rd, uint32_t *seq)
+{
+       int flags = NLM_F_REQUEST | NLM_F_ACK;
+
+       rd_prepare_msg(rd, RDMA_NLDEV_CMD_STAT_GET_STATUS, seq,  flags);
+       mnl_attr_put_u32(rd->nlh, RDMA_NLDEV_ATTR_DEV_INDEX, rd->dev_idx);
+       mnl_attr_put_u32(rd->nlh, RDMA_NLDEV_ATTR_PORT_INDEX, rd->port_idx);
+
+       return rd_send_msg(rd);
+}
+
+static int stat_one_link_get_mode(struct rd *rd)
+{
+       uint32_t seq;
+       int err;
+
+       if (!rd->port_idx)
+               return 0;
+
+       err = stat_one_link_get_status_req(rd, &seq);
+       if (err)
+               return err;
+
+       return rd_recv_msg(rd, stat_mode_parse_cb, rd, seq);
+}
+
+static int stat_one_link_get_mode_supported(struct rd *rd)
+{
+       uint32_t seq;
+       int err;
+
+       if (!rd->port_idx)
+               return 0;
+
+       err = stat_one_link_get_status_req(rd, &seq);
+       if (err)
+               return err;
+
+       return rd_recv_msg(rd, stat_mode_parse_cb_supported, rd, seq);
+}
+
+static int stat_link_get_mode(struct rd *rd)
+{
+       return rd_exec_link(rd, stat_one_link_get_mode, false);
+}
+
+static int stat_link_get_mode_supported(struct rd *rd)
+{
+       return rd_exec_link(rd, stat_one_link_get_mode_supported, false);
+}
+
+static int stat_mode_supported(struct rd *rd)
+{
+       const struct rd_cmd cmds[] = {
+               { NULL,         stat_link_get_mode_supported },
+               { "link",       stat_link_get_mode_supported },
+               { "help",       stat_help },
+               { 0 },
+       };
+       return rd_exec_cmd(rd, cmds, "parameter");
+}
+
+static int stat_mode(struct rd *rd)
+{
+       const struct rd_cmd cmds[] = {
+               { NULL,         stat_link_get_mode },
+               { "link",       stat_link_get_mode },
+               { "show",       stat_link_get_mode },
+               { "supported",  stat_mode_supported },
+               { "help",       stat_help },
+               { 0 },
+       };
+
+       return rd_exec_cmd(rd, cmds, "parameter");
+}
+
 static int stat_show_parse_cb(const struct nlmsghdr *nlh, void *data)
 {
        struct nlattr *tb[RDMA_NLDEV_ATTR_MAX] = {};
@@ -786,6 +948,7 @@ int cmd_stat(struct rd *rd)
                { "help",       stat_help },
                { "qp",         stat_qp },
                { "mr",         stat_mr },
+               { "mode",       stat_mode },
                { 0 }
        };