Commit e4a4b209 authored by wenglianfa's avatar wenglianfa Committed by Juan Zhou
Browse files

RDMA/core: Add support to dump SRQ resource in RAW format 

mainline inclusion
from mainline-v6.7-rc1
commit aebf8145e11a29a77dac15ee041a190676fac05f
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I8ZWK5
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=aebf8145e11a29a77dac15ee041a190676fac05f



----------------------------------------------------------------------

Add support to dump SRQ resource in raw format. It enable drivers to
return the entire device specific SRQ context without setting each
field separately.

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: default avatarwenglianfa <wenglianfa@huawei.com>
Link: https://lore.kernel.org/r/20230918131110.3987498-3-huangjunxian6@hisilicon.com


Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
Signed-off-by: default avatarJuan Zhou <zhoujuan51@h-partners.com>
parent 01d63c6a

drivers/infiniband/core/device.c

+1 −0
Original line number Diff line number Diff line
@@ -2652,6 +2652,7 @@ void ib_set_device_ops(struct ib_device *dev, const struct ib_device_ops *ops) 
	SET_DEVICE_OP(dev_ops, fill_res_qp_entry);

	SET_DEVICE_OP(dev_ops, fill_res_qp_entry_raw);

	SET_DEVICE_OP(dev_ops, fill_res_srq_entry);

	SET_DEVICE_OP(dev_ops, fill_res_srq_entry_raw);

	SET_DEVICE_OP(dev_ops, fill_stat_mr_entry);

	SET_DEVICE_OP(dev_ops, get_dev_fw_str);

	SET_DEVICE_OP(dev_ops, get_dma_mr);

drivers/infiniband/core/nldev.c

+17 −0
Original line number Diff line number Diff line
@@ -850,6 +850,17 @@ static int fill_res_srq_entry(struct sk_buff *msg, bool has_cap_net_admin, 
	return -EMSGSIZE;

}



static int fill_res_srq_raw_entry(struct sk_buff *msg, bool has_cap_net_admin,

				 struct rdma_restrack_entry *res, uint32_t port)

{

	struct ib_srq *srq = container_of(res, struct ib_srq, res);

	struct ib_device *dev = srq->device;



	if (!dev->ops.fill_res_srq_entry_raw)

		return -EINVAL;

	return dev->ops.fill_res_srq_entry_raw(msg, srq);

}



static int fill_stat_counter_mode(struct sk_buff *msg,

				  struct rdma_counter *counter)

{
@@ -1659,6 +1670,7 @@ RES_GET_FUNCS(mr_raw, RDMA_RESTRACK_MR); 
RES_GET_FUNCS(counter, RDMA_RESTRACK_COUNTER);

RES_GET_FUNCS(ctx, RDMA_RESTRACK_CTX);

RES_GET_FUNCS(srq, RDMA_RESTRACK_SRQ);

RES_GET_FUNCS(srq_raw, RDMA_RESTRACK_SRQ);



static LIST_HEAD(link_ops);

static DECLARE_RWSEM(link_ops_rwsem);
@@ -2565,6 +2577,11 @@ static const struct rdma_nl_cbs nldev_cb_table[RDMA_NLDEV_NUM_OPS] = { 
		.dump = nldev_res_get_mr_raw_dumpit,

		.flags = RDMA_NL_ADMIN_PERM,

	},

	[RDMA_NLDEV_CMD_RES_SRQ_GET_RAW] = {

		.doit = nldev_res_get_srq_raw_doit,

		.dump = nldev_res_get_srq_raw_dumpit,

		.flags = RDMA_NL_ADMIN_PERM,

	},

	[RDMA_NLDEV_CMD_STAT_GET_STATUS] = {

		.doit = nldev_stat_get_counter_status_doit,

	},

include/rdma/ib_verbs.h

+1 −0
Original line number Diff line number Diff line
@@ -2609,6 +2609,7 @@ struct ib_device_ops { 
	int (*fill_res_qp_entry_raw)(struct sk_buff *msg, struct ib_qp *ibqp);

	int (*fill_res_cm_id_entry)(struct sk_buff *msg, struct rdma_cm_id *id);

	int (*fill_res_srq_entry)(struct sk_buff *msg, struct ib_srq *ib_srq);

	int (*fill_res_srq_entry_raw)(struct sk_buff *msg, struct ib_srq *ib_srq);



	/* Device lifecycle callbacks */

	/*

include/uapi/rdma/rdma_netlink.h

+2 −0
Original line number Diff line number Diff line
@@ -299,6 +299,8 @@ enum rdma_nldev_command { 


	RDMA_NLDEV_CMD_STAT_GET_STATUS,



	RDMA_NLDEV_CMD_RES_SRQ_GET_RAW,



	RDMA_NLDEV_NUM_OPS

};