| Message ID | 20231010075526.3860869-3-huangjunxian6@hisilicon.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | rdma: Support dumping SRQ resource in raw format | expand |
On Tue, Oct 10, 2023 at 03:55:26PM +0800, Junxian Huang wrote: > From: wenglianfa <wenglianfa@huawei.com> > > Add support to dump SRQ resource in raw format. > > This patch relies on the corresponding kernel commit aebf8145e11a > ("RDMA/core: Add support to dump SRQ resource in RAW format") > > Example: > $ rdma res show srq -r > dev hns3 149000... > > $ rdma res show srq -j -r > [{"ifindex":0,"ifname":"hns3","data":[149,0,0,...]}] > > Signed-off-by: wenglianfa <wenglianfa@huawei.com> > --- > rdma/res-srq.c | 20 ++++++++++++++++++-- > rdma/res.h | 2 ++ > 2 files changed, 20 insertions(+), 2 deletions(-) > Thanks, Reviewed-by: Leon Romanovsky <leonro@nvidia.com>
On 10/10/23 1:55 AM, Junxian Huang wrote: > @@ -162,6 +162,20 @@ out: > return -EINVAL; > } > > +static int res_srq_line_raw(struct rd *rd, const char *name, int idx, > + struct nlattr **nla_line) > +{ > + if (!nla_line[RDMA_NLDEV_ATTR_RES_RAW]) > + return MNL_CB_ERROR; > + > + open_json_object(NULL); open_json_object with no corresponding close. > + print_dev(rd, idx, name); > + print_raw_data(rd, nla_line); > + newline(rd); > + > + return MNL_CB_OK; > +} > + > static int res_srq_line(struct rd *rd, const char *name, int idx, > struct nlattr **nla_line) > {
On Sun, Oct 15, 2023 at 09:54:14PM -0600, David Ahern wrote: > On 10/10/23 1:55 AM, Junxian Huang wrote: > > @@ -162,6 +162,20 @@ out: > > return -EINVAL; > > } > > > > +static int res_srq_line_raw(struct rd *rd, const char *name, int idx, > > + struct nlattr **nla_line) > > +{ > > + if (!nla_line[RDMA_NLDEV_ATTR_RES_RAW]) > > + return MNL_CB_ERROR; > > + > > + open_json_object(NULL); > > open_json_object with no corresponding close. > > > + print_dev(rd, idx, name); > > + print_raw_data(rd, nla_line); > > + newline(rd); It is here ^^^^. 773 void newline(struct rd *rd) 774 { 775 close_json_object(); 776 print_color_string(PRINT_FP, COLOR_NONE, NULL, "\n", NULL); 777 } 778 > > + > > + return MNL_CB_OK; > > +} > > + > > static int res_srq_line(struct rd *rd, const char *name, int idx, > > struct nlattr **nla_line) > > { > >
diff --git a/rdma/res-srq.c b/rdma/res-srq.c index 186ae281..cf9209d7 100644 --- a/rdma/res-srq.c +++ b/rdma/res-srq.c @@ -162,6 +162,20 @@ out: return -EINVAL; } +static int res_srq_line_raw(struct rd *rd, const char *name, int idx, + struct nlattr **nla_line) +{ + if (!nla_line[RDMA_NLDEV_ATTR_RES_RAW]) + return MNL_CB_ERROR; + + open_json_object(NULL); + print_dev(rd, idx, name); + print_raw_data(rd, nla_line); + newline(rd); + + return MNL_CB_OK; +} + static int res_srq_line(struct rd *rd, const char *name, int idx, struct nlattr **nla_line) { @@ -248,7 +262,8 @@ int res_srq_idx_parse_cb(const struct nlmsghdr *nlh, void *data) name = mnl_attr_get_str(tb[RDMA_NLDEV_ATTR_DEV_NAME]); idx = mnl_attr_get_u32(tb[RDMA_NLDEV_ATTR_DEV_INDEX]); - return res_srq_line(rd, name, idx, tb); + return (rd->show_raw) ? res_srq_line_raw(rd, name, idx, tb) : + res_srq_line(rd, name, idx, tb); } int res_srq_parse_cb(const struct nlmsghdr *nlh, void *data) @@ -276,7 +291,8 @@ int res_srq_parse_cb(const struct nlmsghdr *nlh, void *data) if (ret != MNL_CB_OK) break; - ret = res_srq_line(rd, name, idx, nla_line); + ret = (rd->show_raw) ? res_srq_line_raw(rd, name, idx, nla_line) : + res_srq_line(rd, name, idx, nla_line); if (ret != MNL_CB_OK) break; } diff --git a/rdma/res.h b/rdma/res.h index 70e51acd..e880c28b 100644 --- a/rdma/res.h +++ b/rdma/res.h @@ -39,6 +39,8 @@ static inline uint32_t res_get_command(uint32_t command, struct rd *rd) return RDMA_NLDEV_CMD_RES_CQ_GET_RAW; case RDMA_NLDEV_CMD_RES_MR_GET: return RDMA_NLDEV_CMD_RES_MR_GET_RAW; + case RDMA_NLDEV_CMD_RES_SRQ_GET: + return RDMA_NLDEV_CMD_RES_SRQ_GET_RAW; default: return command; }