rdma: Fix the logic to print unsigned int.

Use the corresponding function and fmt string to print unsigned int32
and int64.

Signed-off-by: Shangyan Zhou <sy.zhou@hotmail.com>
Reviewed-by: Leon Romanovsky <leonro@nvidia.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>

diff --git a/rdma/res-cmid.c b/rdma/res-cmid.c
index bfaa47b5ad89ebc56c7c607a634a07d03463646b..fd57dbb7978885f00eb2b9db1dc3e468a864ce3e 100644 (file)
--- a/rdma/res-cmid.c
+++ b/rdma/res-cmid.c
@@ -181,14 +181,14 @@ static int res_cm_id_line(struct rd *rd, const char *name, int idx,
 
        open_json_object(NULL);
        print_link(rd, idx, name, port, nla_line);
-       res_print_uint(rd, "cm-idn", cm_idn,
+       res_print_u32(rd, "cm-idn", cm_idn,
                       nla_line[RDMA_NLDEV_ATTR_RES_CM_IDN]);
-       res_print_uint(rd, "lqpn", lqpn, nla_line[RDMA_NLDEV_ATTR_RES_LQPN]);
+       res_print_u32(rd, "lqpn", lqpn, nla_line[RDMA_NLDEV_ATTR_RES_LQPN]);
        if (nla_line[RDMA_NLDEV_ATTR_RES_TYPE])
                print_qp_type(rd, type);
        print_cm_id_state(rd, state);
        print_ps(rd, ps);
-       res_print_uint(rd, "pid", pid, nla_line[RDMA_NLDEV_ATTR_RES_PID]);
+       res_print_u32(rd, "pid", pid, nla_line[RDMA_NLDEV_ATTR_RES_PID]);
        print_comm(rd, comm, nla_line);
 
        if (nla_line[RDMA_NLDEV_ATTR_RES_SRC_ADDR])

diff --git a/rdma/res-cq.c b/rdma/res-cq.c
index 9e7c4f512b720b3130cb23951be295fef62804c3..818e1d0c2dfb68cac71a275d0aa1c8317bf5cde6 100644 (file)
--- a/rdma/res-cq.c
+++ b/rdma/res-cq.c
@@ -110,14 +110,14 @@ static int res_cq_line(struct rd *rd, const char *name, int idx,
 
        open_json_object(NULL);
        print_dev(rd, idx, name);
-       res_print_uint(rd, "cqn", cqn, nla_line[RDMA_NLDEV_ATTR_RES_CQN]);
-       res_print_uint(rd, "cqe", cqe, nla_line[RDMA_NLDEV_ATTR_RES_CQE]);
-       res_print_uint(rd, "users", users,
+       res_print_u32(rd, "cqn", cqn, nla_line[RDMA_NLDEV_ATTR_RES_CQN]);
+       res_print_u32(rd, "cqe", cqe, nla_line[RDMA_NLDEV_ATTR_RES_CQE]);
+       res_print_u64(rd, "users", users,
                       nla_line[RDMA_NLDEV_ATTR_RES_USECNT]);
        print_poll_ctx(rd, poll_ctx, nla_line[RDMA_NLDEV_ATTR_RES_POLL_CTX]);
        print_cq_dim_setting(rd, nla_line[RDMA_NLDEV_ATTR_DEV_DIM]);
-       res_print_uint(rd, "ctxn", ctxn, nla_line[RDMA_NLDEV_ATTR_RES_CTXN]);
-       res_print_uint(rd, "pid", pid, nla_line[RDMA_NLDEV_ATTR_RES_PID]);
+       res_print_u32(rd, "ctxn", ctxn, nla_line[RDMA_NLDEV_ATTR_RES_CTXN]);
+       res_print_u32(rd, "pid", pid, nla_line[RDMA_NLDEV_ATTR_RES_PID]);
        print_comm(rd, comm, nla_line);
 
        print_driver_table(rd, nla_line[RDMA_NLDEV_ATTR_DRIVER]);

diff --git a/rdma/res-ctx.c b/rdma/res-ctx.c
index 30afe97ace737ff1d7e649e242b8c5279248c7c4..ea5faf18244d4580893fe0edeca9bcd213b907ba 100644 (file)
--- a/rdma/res-ctx.c
+++ b/rdma/res-ctx.c
@@ -40,8 +40,8 @@ static int res_ctx_line(struct rd *rd, const char *name, int idx,
 
        open_json_object(NULL);
        print_dev(rd, idx, name);
-       res_print_uint(rd, "ctxn", ctxn, nla_line[RDMA_NLDEV_ATTR_RES_CTXN]);
-       res_print_uint(rd, "pid", pid, nla_line[RDMA_NLDEV_ATTR_RES_PID]);
+       res_print_u32(rd, "ctxn", ctxn, nla_line[RDMA_NLDEV_ATTR_RES_CTXN]);
+       res_print_u32(rd, "pid", pid, nla_line[RDMA_NLDEV_ATTR_RES_PID]);
        print_comm(rd, comm, nla_line);
 
        print_driver_table(rd, nla_line[RDMA_NLDEV_ATTR_DRIVER]);

diff --git a/rdma/res-mr.c b/rdma/res-mr.c
index 1bf73f3a8112a7d1b1bd47ca0a292fc3c0de0136..25eaa0562d9a900b5adc670466981b259f979ddc 100644 (file)
--- a/rdma/res-mr.c
+++ b/rdma/res-mr.c
@@ -73,13 +73,13 @@ static int res_mr_line(struct rd *rd, const char *name, int idx,
                        nla_line[RDMA_NLDEV_ATTR_RES_KERN_NAME]);
        open_json_object(NULL);
        print_dev(rd, idx, name);
-       res_print_uint(rd, "mrn", mrn, nla_line[RDMA_NLDEV_ATTR_RES_MRN]);
+       res_print_u32(rd, "mrn", mrn, nla_line[RDMA_NLDEV_ATTR_RES_MRN]);
        print_key(rd, "rkey", rkey, nla_line[RDMA_NLDEV_ATTR_RES_RKEY]);
        print_key(rd, "lkey", lkey, nla_line[RDMA_NLDEV_ATTR_RES_LKEY]);
        print_key(rd, "iova", iova, nla_line[RDMA_NLDEV_ATTR_RES_IOVA]);
-       res_print_uint(rd, "mrlen", mrlen, nla_line[RDMA_NLDEV_ATTR_RES_MRLEN]);
-       res_print_uint(rd, "pdn", pdn, nla_line[RDMA_NLDEV_ATTR_RES_PDN]);
-       res_print_uint(rd, "pid", pid, nla_line[RDMA_NLDEV_ATTR_RES_PID]);
+       res_print_u64(rd, "mrlen", mrlen, nla_line[RDMA_NLDEV_ATTR_RES_MRLEN]);
+       res_print_u32(rd, "pdn", pdn, nla_line[RDMA_NLDEV_ATTR_RES_PDN]);
+       res_print_u32(rd, "pid", pid, nla_line[RDMA_NLDEV_ATTR_RES_PID]);
        print_comm(rd, comm, nla_line);
 
        print_driver_table(rd, nla_line[RDMA_NLDEV_ATTR_DRIVER]);

diff --git a/rdma/res-pd.c b/rdma/res-pd.c
index df538010347587d7200d6b9b8b7dbd169c14159a..2932eb9868776e4b1bd419ec9f5eef9b6003ccda 100644 (file)
--- a/rdma/res-pd.c
+++ b/rdma/res-pd.c
@@ -62,15 +62,15 @@ static int res_pd_line(struct rd *rd, const char *name, int idx,
 
        open_json_object(NULL);
        print_dev(rd, idx, name);
-       res_print_uint(rd, "pdn", pdn, nla_line[RDMA_NLDEV_ATTR_RES_PDN]);
+       res_print_u32(rd, "pdn", pdn, nla_line[RDMA_NLDEV_ATTR_RES_PDN]);
        print_key(rd, "local_dma_lkey", local_dma_lkey,
                  nla_line[RDMA_NLDEV_ATTR_RES_LOCAL_DMA_LKEY]);
-       res_print_uint(rd, "users", users,
+       res_print_u64(rd, "users", users,
                       nla_line[RDMA_NLDEV_ATTR_RES_USECNT]);
        print_key(rd, "unsafe_global_rkey", unsafe_global_rkey,
                  nla_line[RDMA_NLDEV_ATTR_RES_UNSAFE_GLOBAL_RKEY]);
-       res_print_uint(rd, "ctxn", ctxn, nla_line[RDMA_NLDEV_ATTR_RES_CTXN]);
-       res_print_uint(rd, "pid", pid, nla_line[RDMA_NLDEV_ATTR_RES_PID]);
+       res_print_u32(rd, "ctxn", ctxn, nla_line[RDMA_NLDEV_ATTR_RES_CTXN]);
+       res_print_u32(rd, "pid", pid, nla_line[RDMA_NLDEV_ATTR_RES_PID]);
        print_comm(rd, comm, nla_line);
 
        print_driver_table(rd, nla_line[RDMA_NLDEV_ATTR_DRIVER]);

diff --git a/rdma/res-qp.c b/rdma/res-qp.c
index a38be3995d1924c38faa6f8b1e3eb1f85623f294..9218804a8d5337d2aaafdfb1e317d65c3914e581 100644 (file)
--- a/rdma/res-qp.c
+++ b/rdma/res-qp.c
@@ -161,19 +161,19 @@ static int res_qp_line(struct rd *rd, const char *name, int idx,
 
        open_json_object(NULL);
        print_link(rd, idx, name, port, nla_line);
-       res_print_uint(rd, "lqpn", lqpn, nla_line[RDMA_NLDEV_ATTR_RES_LQPN]);
+       res_print_u32(rd, "lqpn", lqpn, nla_line[RDMA_NLDEV_ATTR_RES_LQPN]);
        print_rqpn(rd, rqpn, nla_line);
 
        print_type(rd, type);
        print_state(rd, state);
 
        print_rqpsn(rd, rq_psn, nla_line);
-       res_print_uint(rd, "sq-psn", sq_psn,
+       res_print_u32(rd, "sq-psn", sq_psn,
                       nla_line[RDMA_NLDEV_ATTR_RES_SQ_PSN]);
 
        print_pathmig(rd, path_mig_state, nla_line);
-       res_print_uint(rd, "pdn", pdn, nla_line[RDMA_NLDEV_ATTR_RES_PDN]);
-       res_print_uint(rd, "pid", pid, nla_line[RDMA_NLDEV_ATTR_RES_PID]);
+       res_print_u32(rd, "pdn", pdn, nla_line[RDMA_NLDEV_ATTR_RES_PDN]);
+       res_print_u32(rd, "pid", pid, nla_line[RDMA_NLDEV_ATTR_RES_PID]);
        print_comm(rd, comm, nla_line);
 
        print_driver_table(rd, nla_line[RDMA_NLDEV_ATTR_DRIVER]);

diff --git a/rdma/res-srq.c b/rdma/res-srq.c
index 3038c3522671fbcf4a29784c2e7f5cfcca572d31..c6df454a23ceb27ee0b3c430f9babab7d116c059 100644 (file)
--- a/rdma/res-srq.c
+++ b/rdma/res-srq.c
@@ -216,12 +216,12 @@ static int res_srq_line(struct rd *rd, const char *name, int idx,
 
        open_json_object(NULL);
        print_dev(rd, idx, name);
-       res_print_uint(rd, "srqn", srqn, nla_line[RDMA_NLDEV_ATTR_RES_SRQN]);
+       res_print_u32(rd, "srqn", srqn, nla_line[RDMA_NLDEV_ATTR_RES_SRQN]);
        print_type(rd, type);
        print_qps(qp_str);
-       res_print_uint(rd, "pdn", pdn, nla_line[RDMA_NLDEV_ATTR_RES_PDN]);
-       res_print_uint(rd, "cqn", cqn, nla_line[RDMA_NLDEV_ATTR_RES_CQN]);
-       res_print_uint(rd, "pid", pid, nla_line[RDMA_NLDEV_ATTR_RES_PID]);
+       res_print_u32(rd, "pdn", pdn, nla_line[RDMA_NLDEV_ATTR_RES_PDN]);
+       res_print_u32(rd, "cqn", cqn, nla_line[RDMA_NLDEV_ATTR_RES_CQN]);
+       res_print_u32(rd, "pid", pid, nla_line[RDMA_NLDEV_ATTR_RES_PID]);
        print_comm(rd, comm, nla_line);
 
        print_driver_table(rd, nla_line[RDMA_NLDEV_ATTR_DRIVER]);

diff --git a/rdma/res.c b/rdma/res.c
index 21fef9bdd11355a21872cd4014181445221d96e2..854f21c7c20e33b63b66a5ea3a31bc490d398bc0 100644 (file)
--- a/rdma/res.c
+++ b/rdma/res.c
@@ -51,7 +51,7 @@ 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]);
-               res_print_uint(
+               res_print_u64(
                        rd, name, curr,
                        nla_line[RDMA_NLDEV_ATTR_RES_SUMMARY_ENTRY_CURR]);
        }
@@ -208,13 +208,22 @@ void print_key(struct rd *rd, const char *name, uint64_t val,
        print_color_hex(PRINT_ANY, COLOR_NONE, name, " 0x%" PRIx64 " ", val);
 }
 
-void res_print_uint(struct rd *rd, const char *name, uint64_t val,
+void res_print_u32(struct rd *rd, const char *name, uint32_t val,
                    struct nlattr *nlattr)
 {
        if (!nlattr)
                return;
        print_color_uint(PRINT_ANY, COLOR_NONE, name, name, val);
-       print_color_uint(PRINT_FP, COLOR_NONE, NULL, " %d ", val);
+       print_color_uint(PRINT_FP, COLOR_NONE, NULL, " %" PRIu32 " ", val);
+}
+
+void res_print_u64(struct rd *rd, const char *name, uint64_t val,
+                   struct nlattr *nlattr)
+{
+       if (!nlattr)
+               return;
+       print_color_u64(PRINT_ANY, COLOR_NONE, name, name, val);
+       print_color_u64(PRINT_FP, COLOR_NONE, NULL, " %" PRIu64 " ", val);
 }
 
 RES_FUNC(res_no_args,  RDMA_NLDEV_CMD_RES_GET, NULL, true, 0);

diff --git a/rdma/res.h b/rdma/res.h
index 58fa6ad1c9bdfd66cc10fdebc4e8922a09019489..70e51acd01539192b6d21d167845c2432e8b3b46 100644 (file)
--- a/rdma/res.h
+++ b/rdma/res.h
@@ -188,7 +188,9 @@ void print_link(struct rd *rd, uint32_t idx, const char *name, uint32_t port,
                struct nlattr **nla_line);
 void print_key(struct rd *rd, const char *name, uint64_t val,
               struct nlattr *nlattr);
-void res_print_uint(struct rd *rd, const char *name, uint64_t val,
+void res_print_u32(struct rd *rd, const char *name, uint32_t val,
+                   struct nlattr *nlattr);
+void res_print_u64(struct rd *rd, const char *name, uint64_t val,
                    struct nlattr *nlattr);
 void print_comm(struct rd *rd, const char *str, struct nlattr **nla_line);
 const char *qp_types_to_str(uint8_t idx);

diff --git a/rdma/stat-mr.c b/rdma/stat-mr.c
index f39526b48b01f77f64c8556d9b36bcd018847fe3..2ba6cb07693e0ee0f21c28366604c7f891343b72 100644 (file)
--- a/rdma/stat-mr.c
+++ b/rdma/stat-mr.c
@@ -22,7 +22,7 @@ static int stat_mr_line(struct rd *rd, const char *name, int idx,
 
        open_json_object(NULL);
        print_dev(rd, idx, name);
-       res_print_uint(rd, "mrn", mrn, nla_line[RDMA_NLDEV_ATTR_RES_MRN]);
+       res_print_u32(rd, "mrn", mrn, nla_line[RDMA_NLDEV_ATTR_RES_MRN]);
 
        if (nla_line[RDMA_NLDEV_ATTR_STAT_HWCOUNTERS]) {
                ret = res_get_hwcounters(

diff --git a/rdma/stat.c b/rdma/stat.c
index adfcd34afa856ca4deb73aa53d5a7fd3061fd9e4..c7da2922563e2b07d1a632c3277f9b9851896e84 100644 (file)
--- a/rdma/stat.c
+++ b/rdma/stat.c
@@ -210,7 +210,7 @@ int res_get_hwcounters(struct rd *rd, struct nlattr *hwc_table, bool print)
                v = mnl_attr_get_u64(hw_line[RDMA_NLDEV_ATTR_STAT_HWCOUNTER_ENTRY_VALUE]);
                if (rd->pretty_output && !rd->json_output)
                        newline_indent(rd);
-               res_print_uint(rd, nm, v, hw_line[RDMA_NLDEV_ATTR_STAT_HWCOUNTER_ENTRY_NAME]);
+               res_print_u64(rd, nm, v, hw_line[RDMA_NLDEV_ATTR_STAT_HWCOUNTER_ENTRY_NAME]);
        }
 
        return MNL_CB_OK;
@@ -283,7 +283,7 @@ static int res_counter_line(struct rd *rd, const char *name, int index,
        print_color_uint(PRINT_ANY, COLOR_NONE, "cntn", "cntn %u ", cntn);
        if (nla_line[RDMA_NLDEV_ATTR_RES_TYPE])
                print_qp_type(rd, qp_type);
-       res_print_uint(rd, "pid", pid, nla_line[RDMA_NLDEV_ATTR_RES_PID]);
+       res_print_u64(rd, "pid", pid, nla_line[RDMA_NLDEV_ATTR_RES_PID]);
        print_comm(rd, comm, nla_line);
        res_get_hwcounters(rd, hwc_table, true);
        isfirst = true;