rdma: Make get_port_from_argv() returns valid port in strict port mode

[mirror_iproute2.git] / rdma / res.c

diff --git a/rdma/res.c b/rdma/res.c
index f621afa85aa29960ac38c4f0b14ec160b03d21f5..ef863f142eca1c8da9f63eacf1e4973ba0d60f73 100644 (file)
--- a/rdma/res.c
+++ b/rdma/res.c
@@ -35,7 +35,6 @@ static int res_print_summary(struct rd *rd, struct nlattr **tb)
 
        mnl_attr_for_each_nested(nla_entry, nla_table) {
                struct nlattr *nla_line[RDMA_NLDEV_ATTR_MAX] = {};
-               char json_name[32];
 
                err = mnl_attr_parse_nested(nla_entry, rd_attr_cb, nla_line);
                if (err != MNL_CB_OK)
@@ -48,16 +47,18 @@ static int res_print_summary(struct rd *rd, struct nlattr **tb)
 
                name = mnl_attr_get_str(nla_line[RDMA_NLDEV_ATTR_RES_SUMMARY_ENTRY_NAME]);
                curr = mnl_attr_get_u64(nla_line[RDMA_NLDEV_ATTR_RES_SUMMARY_ENTRY_CURR]);
-               if (rd->json_output) {
-                       snprintf(json_name, 32, "%s", name);
-                       jsonw_lluint_field(rd->jw, json_name, curr);
-               } else {
-                       pr_out("%s %"PRId64 " ", name, curr);
-               }
+               res_print_uint(
+                       rd, name, curr,
+                       nla_line[RDMA_NLDEV_ATTR_RES_SUMMARY_ENTRY_CURR]);
        }
        return 0;
 }
 
+static int res_no_args_idx_parse_cb(const struct nlmsghdr *nlh, void *data)
+{
+       return MNL_CB_OK;
+}
+
 static int res_no_args_parse_cb(const struct nlmsghdr *nlh, void *data)
 {
        struct nlattr *tb[RDMA_NLDEV_ATTR_MAX] = {};
@@ -87,6 +88,33 @@ static int res_no_args_parse_cb(const struct nlmsghdr *nlh, void *data)
        return MNL_CB_OK;
 }
 
+int _res_send_idx_msg(struct rd *rd, uint32_t command, mnl_cb_t callback,
+                     uint32_t idx, uint32_t id)
+{
+       uint32_t flags = NLM_F_REQUEST | NLM_F_ACK;
+       uint32_t seq;
+       int ret;
+
+       rd_prepare_msg(rd, command, &seq, flags);
+       mnl_attr_put_u32(rd->nlh, RDMA_NLDEV_ATTR_DEV_INDEX, rd->dev_idx);
+       if (rd->port_idx)
+               mnl_attr_put_u32(rd->nlh,
+                                RDMA_NLDEV_ATTR_PORT_INDEX, rd->port_idx);
+
+       mnl_attr_put_u32(rd->nlh, id, idx);
+
+       ret = rd_send_msg(rd);
+       if (ret)
+               return ret;
+
+       if (rd->json_output)
+               jsonw_start_object(rd->jw);
+       ret = rd_recv_msg(rd, callback, rd, seq);
+       if (rd->json_output)
+               jsonw_end_object(rd->jw);
+       return ret;
+}
+
 int _res_send_msg(struct rd *rd, uint32_t command, mnl_cb_t callback)
 {
        uint32_t flags = NLM_F_REQUEST | NLM_F_ACK;
@@ -127,22 +155,6 @@ const char *qp_types_to_str(uint8_t idx)
        return "UNKNOWN";
 }
 
-void print_lqpn(struct rd *rd, uint32_t val)
-{
-       if (rd->json_output)
-               jsonw_uint_field(rd->jw, "lqpn", val);
-       else
-               pr_out("lqpn %u ", val);
-}
-
-void print_pid(struct rd *rd, uint32_t val)
-{
-       if (rd->json_output)
-               jsonw_uint_field(rd->jw, "pid", val);
-       else
-               pr_out("pid %u ", val);
-}
-
 void print_comm(struct rd *rd, const char *str, struct nlattr **nla_line)
 {
        char tmp[18];
@@ -210,31 +222,31 @@ char *get_task_name(uint32_t pid)
        return comm;
 }
 
-void print_key(struct rd *rd, const char *name, uint64_t val)
+void print_key(struct rd *rd, const char *name, uint64_t val,
+              struct nlattr *nlattr)
 {
+       if (!nlattr)
+               return;
+
        if (rd->json_output)
                jsonw_xint_field(rd->jw, name, val);
        else
                pr_out("%s 0x%" PRIx64 " ", name, val);
 }
 
-void res_print_uint(struct rd *rd, const char *name, uint64_t val)
+void res_print_uint(struct rd *rd, const char *name, uint64_t val,
+                   struct nlattr *nlattr)
 {
-       if (rd->json_output)
-               jsonw_uint_field(rd->jw, name, val);
-       else
-               pr_out("%s %" PRIu64 " ", name, val);
-}
+       if (!nlattr)
+               return;
 
-void print_users(struct rd *rd, uint64_t val)
-{
        if (rd->json_output)
-               jsonw_uint_field(rd->jw, "users", val);
+               jsonw_u64_field(rd->jw, name, val);
        else
-               pr_out("users %" PRIu64 " ", val);
+               pr_out("%s %" PRIu64 " ", name, val);
 }
 
-RES_FUNC(res_no_args,  RDMA_NLDEV_CMD_RES_GET, NULL, true);
+RES_FUNC(res_no_args,  RDMA_NLDEV_CMD_RES_GET, NULL, true, 0);
 
 static int res_show(struct rd *rd)
 {