Introduce Completion Counters
Subsystems (2)
v3 cover Introduce Completion Counters
Add core infrastructure for Completion Counters, a light-weight alternative to polling CQ for tracking operation completions. The related rdma-core interface proposal is linked in [1].
Define the UVERBS_OBJECT_COMP_CNTR ioctl object with create, destroy, modify and read methods for both success and error counters. Add a QP attach method on the QP object to associate a completion counter with a queue pair.
Add EFA Completion Counters support as first implementer.
[1] https://github.com/linux-rdma/rdma-core/pull/1701
---
Changes in v3:
- Replaced inc and set commands by a single modify command
- Changed to passing buffers as EFA specific attributes using desc struct aligned with the suggested common method of passing and consuming umem in RDMA drivers
- Link to v2: https://lore.kernel.org/all/[email protected]/
Changes in v2:
- United set, inc and read flows for successful and error completions counters
- Added comp_cntr usage count
- Minor cleanups
- Link to v1: https://lore.kernel.org/all/[email protected]/
Michael Margolin (5):
RDMA/core: Add Completion Counters support RDMA/core: Prevent destroying in-use completion counters RDMA/core: Add Completion Counters to resource tracking RDMA/efa: Update device interface
RDMA/efa: Add Completion Counters support
drivers/infiniband/core/Makefile | 1 + drivers/infiniband/core/device.c | 6 + drivers/infiniband/core/nldev.c | 1 + drivers/infiniband/core/rdma_core.h | 1 + drivers/infiniband/core/restrack.c | 2 + drivers/infiniband/core/uverbs_cmd.c | 1 + .../core/uverbs_std_types_comp_cntr.c | 183 ++++++++++++++ drivers/infiniband/core/uverbs_std_types_qp.c | 65 ++++- drivers/infiniband/core/uverbs_uapi.c | 1 + drivers/infiniband/core/verbs.c | 1 + drivers/infiniband/hw/efa/efa.h | 17 +- .../infiniband/hw/efa/efa_admin_cmds_defs.h | 187 +++++++++++++- drivers/infiniband/hw/efa/efa_com_cmd.c | 106 ++++++++ drivers/infiniband/hw/efa/efa_com_cmd.h | 36 +++ drivers/infiniband/hw/efa/efa_io_defs.h | 64 ++++- drivers/infiniband/hw/efa/efa_main.c | 7 +- drivers/infiniband/hw/efa/efa_verbs.c | 229 ++++++++++++++++++ include/rdma/ib_verbs.h | 44 ++++ include/rdma/restrack.h | 4 + include/uapi/rdma/efa-abi.h | 19 ++ include/uapi/rdma/ib_user_ioctl_cmds.h | 38 +++ include/uapi/rdma/ib_user_ioctl_verbs.h | 19 ++ include/uapi/rdma/ib_user_verbs.h | 2 +- 23 files changed, 1024 insertions(+), 10 deletions(-) create mode 100644 drivers/infiniband/core/uverbs_std_types_comp_cntr.c
Signature · 1 line
2.47.3
PATCH v3 1/5 Linux 7.1-rc1
From: Linus Torvalds <[email protected]>
--- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Makefile +2 -2
@@ -1,8 +1,8 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 7 -PATCHLEVEL = 0 +PATCHLEVEL = 1 SUBLEVEL = 0 -EXTRAVERSION = +EXTRAVERSION = -rc1 NAME = Baby Opossum Posse # *DOCUMENTATION*
Signature · 1 line
2.47.3
PATCH v3 1/5 RDMA/core: Add Completion Counters support
In reply to Michael MargolinAdd core infrastructure for Completion Counters, a light-weight alternative to polling CQ for tracking operation completions.
Define the UVERBS_OBJECT_COMP_CNTR ioctl object with create, destroy, modify and read methods for both success and error counters. Add a QP attach method on the QP object to associate a completion counter with a queue pair.
Add ib_comp_cntr struct, ib_comp_cntr_attach_attr, device ops, and DECLARE_RDMA_OBJ_SIZE for driver object allocation.
Only userspace Completion Counters are supported at this stage.
--- drivers/infiniband/core/Makefile | 1 + drivers/infiniband/core/device.c | 6 + drivers/infiniband/core/rdma_core.h | 1 + drivers/infiniband/core/uverbs_cmd.c | 1 + .../core/uverbs_std_types_comp_cntr.c | 174 ++++++++++++++++++ drivers/infiniband/core/uverbs_std_types_qp.c | 45 ++++- drivers/infiniband/core/uverbs_uapi.c | 1 + include/rdma/ib_verbs.h | 40 ++++ include/uapi/rdma/ib_user_ioctl_cmds.h | 38 ++++ include/uapi/rdma/ib_user_ioctl_verbs.h | 19 ++ include/uapi/rdma/ib_user_verbs.h | 2 +- 11 files changed, 326 insertions(+), 2 deletions(-) create mode 100644 drivers/infiniband/core/uverbs_std_types_comp_cntr.c
drivers/infiniband/core/Makefile +1 -0
@@ -35,6 +35,7 @@ ib_umad-y := user_mad.o ib_uverbs-y := uverbs_main.o uverbs_cmd.o uverbs_marshall.o \ rdma_core.o uverbs_std_types.o uverbs_ioctl.o \ uverbs_std_types_cq.o \ + uverbs_std_types_comp_cntr.o \ uverbs_std_types_dmabuf.o \ uverbs_std_types_dmah.o \ uverbs_std_types_flow_action.o uverbs_std_types_dm.o \
drivers/infiniband/core/device.c +6 -0
@@ -2734,6 +2734,7 @@ void ib_set_device_ops(struct ib_device *dev, const struct ib_device_ops *ops)SET_DEVICE_OP (dev_ops, create_ah);SET_DEVICE_OP (dev_ops, create_counters);SET_DEVICE_OP (dev_ops, create_cq); +SET_DEVICE_OP (dev_ops, create_comp_cntr);SET_DEVICE_OP (dev_ops, create_user_cq);SET_DEVICE_OP (dev_ops, create_flow);SET_DEVICE_OP (dev_ops, create_qp);
@@ -2754,6 +2755,7 @@ void ib_set_device_ops(struct ib_device *dev, const struct ib_device_ops *ops)SET_DEVICE_OP (dev_ops, destroy_ah);SET_DEVICE_OP (dev_ops, destroy_counters);SET_DEVICE_OP (dev_ops, destroy_cq); +SET_DEVICE_OP (dev_ops, destroy_comp_cntr);SET_DEVICE_OP (dev_ops, destroy_flow);SET_DEVICE_OP (dev_ops, destroy_flow_action);SET_DEVICE_OP (dev_ops, destroy_qp);
@@ -2805,6 +2807,7 @@ void ib_set_device_ops(struct ib_device *dev, const struct ib_device_ops *ops)SET_DEVICE_OP (dev_ops, modify_hw_stat);SET_DEVICE_OP (dev_ops, modify_port);SET_DEVICE_OP (dev_ops, modify_qp); +SET_DEVICE_OP (dev_ops, qp_attach_comp_cntr);SET_DEVICE_OP (dev_ops, modify_srq);SET_DEVICE_OP (dev_ops, modify_wq);SET_DEVICE_OP (dev_ops, peek_cq);
@@ -2828,12 +2831,14 @@ void ib_set_device_ops(struct ib_device *dev, const struct ib_device_ops *ops)SET_DEVICE_OP (dev_ops, query_ucontext);SET_DEVICE_OP (dev_ops, rdma_netdev_get_params);SET_DEVICE_OP (dev_ops, read_counters); +SET_DEVICE_OP (dev_ops, read_comp_cntr);SET_DEVICE_OP (dev_ops, reg_dm_mr);SET_DEVICE_OP (dev_ops, reg_user_mr);SET_DEVICE_OP (dev_ops, reg_user_mr_dmabuf);SET_DEVICE_OP (dev_ops, req_notify_cq);SET_DEVICE_OP (dev_ops, rereg_user_mr);SET_DEVICE_OP (dev_ops, resize_user_cq); +SET_DEVICE_OP (dev_ops, modify_comp_cntr);SET_DEVICE_OP (dev_ops, set_vf_guid);SET_DEVICE_OP (dev_ops, set_vf_link_state);SET_DEVICE_OP (dev_ops, ufile_hw_cleanup);
@@ -2842,6 +2847,7 @@ void ib_set_device_ops(struct ib_device *dev, const struct ib_device_ops *ops)SET_OBJ_SIZE (dev_ops, ib_ah);SET_OBJ_SIZE (dev_ops, ib_counters);SET_OBJ_SIZE (dev_ops, ib_cq); +SET_OBJ_SIZE (dev_ops, ib_comp_cntr);SET_OBJ_SIZE (dev_ops, ib_dmah);SET_OBJ_SIZE (dev_ops, ib_mw);SET_OBJ_SIZE (dev_ops, ib_pd);
drivers/infiniband/core/rdma_core.h +1 -0
@@ -156,6 +156,7 @@ uverbs_api_ioctl_handler_fn uverbs_get_handler_fn(struct ib_udata *udata);extern const struct uapi_definition uverbs_def_obj_async_fd[];extern const struct uapi_definition uverbs_def_obj_counters[]; +extern const struct uapi_definition uverbs_def_obj_comp_cntr[];extern const struct uapi_definition uverbs_def_obj_cq[];extern const struct uapi_definition uverbs_def_obj_device[];extern const struct uapi_definition uverbs_def_obj_dm[];
drivers/infiniband/core/uverbs_cmd.c +1 -0
@@ -3673,6 +3673,7 @@ static int ib_uverbs_ex_query_device(struct uverbs_attr_bundle *attrs) resp.cq_moderation_caps.max_cq_moderation_period = attr.cq_caps.max_cq_moderation_period; resp.max_dm_size = attr.max_dm_size; + resp.max_comp_cntr = attr.max_comp_cntr; resp.response_length =uverbs_response_length (attrs,sizeof (resp));return uverbs_response (attrs, &resp,sizeof (resp));
drivers/infiniband/core/uverbs_std_types_comp_cntr.c new file +174 -0
174 lines not on this page · raw message
drivers/infiniband/core/uverbs_std_types_qp.c +44 -1
55 lines not on this page · raw message
drivers/infiniband/core/uverbs_uapi.c +1 -0
@@ -628,6 +628,7 @@ void uverbs_destroy_api(struct uverbs_api *uapi)static const struct uapi_definition uverbs_core_api[] = {UAPI_DEF_CHAIN (uverbs_def_obj_async_fd),UAPI_DEF_CHAIN (uverbs_def_obj_counters), +UAPI_DEF_CHAIN (uverbs_def_obj_comp_cntr),UAPI_DEF_CHAIN (uverbs_def_obj_cq),UAPI_DEF_CHAIN (uverbs_def_obj_device),UAPI_DEF_CHAIN (uverbs_def_obj_dm),
include/rdma/ib_verbs.h +40 -0
@@ -453,6 +453,7 @@ struct ib_device_attr {u64 max_dm_size;/* Max entries for sgl for optimized performance per READ */ u32 max_sgl_rd; +u32 max_comp_cntr; };enum ib_mtu {
@@ -1746,6 +1747,36 @@ struct ib_cq {struct rdma_restrack_entry res; }; +struct ib_comp_cntr { +struct ib_device *device; +struct ib_uobject *uobject; +u64 comp_count_max_value; +u64 err_count_max_value; +}; + +enum ib_comp_cntr_entry { +IB_COMP_CNTR_ENTRY_COMP =IB_UVERBS_COMP_CNTR_ENTRY_COMP , +IB_COMP_CNTR_ENTRY_ERR =IB_UVERBS_COMP_CNTR_ENTRY_ERR , +}; + +enum ib_comp_cntr_modify_op { +IB_COMP_CNTR_MODIFY_OP_SET =IB_UVERBS_COMP_CNTR_MODIFY_OP_SET , +IB_COMP_CNTR_MODIFY_OP_INC =IB_UVERBS_COMP_CNTR_MODIFY_OP_INC , +}; + +enum ib_comp_cntr_attach_op { +IB_COMP_CNTR_ATTACH_OP_SEND =IB_UVERBS_COMP_CNTR_ATTACH_OP_SEND , +IB_COMP_CNTR_ATTACH_OP_RECV =IB_UVERBS_COMP_CNTR_ATTACH_OP_RECV , +IB_COMP_CNTR_ATTACH_OP_RDMA_READ =IB_UVERBS_COMP_CNTR_ATTACH_OP_RDMA_READ , +IB_COMP_CNTR_ATTACH_OP_REMOTE_RDMA_READ =IB_UVERBS_COMP_CNTR_ATTACH_OP_REMOTE_RDMA_READ , +IB_COMP_CNTR_ATTACH_OP_RDMA_WRITE =IB_UVERBS_COMP_CNTR_ATTACH_OP_RDMA_WRITE , +IB_COMP_CNTR_ATTACH_OP_REMOTE_RDMA_WRITE =IB_UVERBS_COMP_CNTR_ATTACH_OP_REMOTE_RDMA_WRITE , +}; + +struct ib_comp_cntr_attach_attr { +u32 op_mask; +}; +struct ib_srq {struct ib_device *device;struct ib_pd *pd;
@@ -2624,6 +2655,8 @@ struct ib_device_ops { struct ib_udata *udata);int (*modify_qp)(struct ib_qp *qp,struct ib_qp_attr *qp_attr,int qp_attr_mask,struct ib_udata *udata); +int (*qp_attach_comp_cntr)(struct ib_qp *qp,struct ib_comp_cntr *cc, +struct ib_comp_cntr_attach_attr *attr);int (*query_qp)(struct ib_qp *qp,struct ib_qp_attr *qp_attr,int qp_attr_mask,struct ib_qp_init_attr *qp_init_attr);int (*destroy_qp)(struct ib_qp *qp,struct ib_udata *udata);
@@ -2645,6 +2678,12 @@ struct ib_device_ops {* post_destroy_cq - Free all kernel resources */ void (*post_destroy_cq)(struct ib_cq *cq); +int (*create_comp_cntr)(struct ib_comp_cntr *cc, +struct uverbs_attr_bundle *attrs); +int (*destroy_comp_cntr)(struct ib_comp_cntr *cc); +int (*modify_comp_cntr)(struct ib_comp_cntr *cc,enum ib_comp_cntr_entry entry, +enum ib_comp_cntr_modify_op op,u64 value); +int (*read_comp_cntr)(struct ib_comp_cntr *cc,enum ib_comp_cntr_entry entry,u64 *value);struct ib_mr *(*get_dma_mr)(struct ib_pd *pd,int mr_access_flags); struct ib_mr *(*reg_user_mr)(struct ib_pd *pd, u64 start, u64 length, u64 virt_addr, int mr_access_flags,
@@ -2878,6 +2917,7 @@ struct ib_device_ops {DECLARE_RDMA_OBJ_SIZE (ib_ah);DECLARE_RDMA_OBJ_SIZE (ib_counters);DECLARE_RDMA_OBJ_SIZE (ib_cq); +DECLARE_RDMA_OBJ_SIZE (ib_comp_cntr);DECLARE_RDMA_OBJ_SIZE (ib_dmah);DECLARE_RDMA_OBJ_SIZE (ib_mw);DECLARE_RDMA_OBJ_SIZE (ib_pd);
include/uapi/rdma/ib_user_ioctl_cmds.h +38 -0
@@ -57,6 +57,7 @@ enum uverbs_default_objects {UVERBS_OBJECT_ASYNC_EVENT ,UVERBS_OBJECT_DMAH ,UVERBS_OBJECT_DMABUF , + UVERBS_OBJECT_COMP_CNTR, }; enum {
@@ -165,9 +166,16 @@ enum uverbs_attrs_destroy_qp_cmd_attr_ids { UVERBS_ATTR_DESTROY_QP_RESP, }; +enum uverbs_attrs_qp_attach_comp_cntr_cmd_attr_ids { +UVERBS_ATTR_QP_ATTACH_COMP_CNTR_HANDLE , +UVERBS_ATTR_QP_ATTACH_COMP_CNTR_CNTR_HANDLE , +UVERBS_ATTR_QP_ATTACH_COMP_CNTR_OP_MASK , +}; +enum uverbs_methods_qp {UVERBS_METHOD_QP_CREATE ,UVERBS_METHOD_QP_DESTROY , +UVERBS_METHOD_QP_ATTACH_COMP_CNTR , };enum uverbs_attrs_create_srq_cmd_attr_ids {
@@ -434,4 +442,34 @@ enum uverbs_attrs_query_gid_entry_cmd_attr_ids { UVERBS_ATTR_QUERY_GID_ENTRY_RESP_ENTRY, }; +enum uverbs_methods_comp_cntr { +UVERBS_METHOD_COMP_CNTR_CREATE , +UVERBS_METHOD_COMP_CNTR_DESTROY , +UVERBS_METHOD_COMP_CNTR_MODIFY , +UVERBS_METHOD_COMP_CNTR_READ , +}; + +enum uverbs_attrs_create_comp_cntr_cmd_attr_ids { +UVERBS_ATTR_CREATE_COMP_CNTR_HANDLE , +UVERBS_ATTR_CREATE_COMP_CNTR_RESP_COUNT_MAX_VALUE , +UVERBS_ATTR_CREATE_COMP_CNTR_RESP_ERR_COUNT_MAX_VALUE , +}; + +enum uverbs_attrs_destroy_comp_cntr_cmd_attr_ids { +UVERBS_ATTR_DESTROY_COMP_CNTR_HANDLE , +}; + +enum uverbs_attrs_modify_comp_cntr_cmd_attr_ids { +UVERBS_ATTR_MODIFY_COMP_CNTR_HANDLE , +UVERBS_ATTR_MODIFY_COMP_CNTR_ENTRY , +UVERBS_ATTR_MODIFY_COMP_CNTR_OP , +UVERBS_ATTR_MODIFY_COMP_CNTR_VALUE , +}; + +enum uverbs_attrs_read_comp_cntr_cmd_attr_ids { +UVERBS_ATTR_READ_COMP_CNTR_HANDLE , +UVERBS_ATTR_READ_COMP_CNTR_ENTRY , +UVERBS_ATTR_READ_COMP_CNTR_RESP_VALUE , +}; +#endif
include/uapi/rdma/ib_user_ioctl_verbs.h +19 -0
@@ -273,4 +273,23 @@ struct ib_uverbs_gid_entry { __u32 netdev_ifindex; /* It is 0 if there is no netdev associated with it */ }; +enum ib_uverbs_comp_cntr_entry { +IB_UVERBS_COMP_CNTR_ENTRY_COMP , +IB_UVERBS_COMP_CNTR_ENTRY_ERR , +}; + +enum ib_uverbs_comp_cntr_modify_op { +IB_UVERBS_COMP_CNTR_MODIFY_OP_SET , +IB_UVERBS_COMP_CNTR_MODIFY_OP_INC , +}; + +enum ib_uverbs_comp_cntr_attach_op { +IB_UVERBS_COMP_CNTR_ATTACH_OP_SEND =1 <<0 , +IB_UVERBS_COMP_CNTR_ATTACH_OP_RECV =1 <<1 , +IB_UVERBS_COMP_CNTR_ATTACH_OP_RDMA_READ =1 <<2 , +IB_UVERBS_COMP_CNTR_ATTACH_OP_REMOTE_RDMA_READ =1 <<3 , +IB_UVERBS_COMP_CNTR_ATTACH_OP_RDMA_WRITE =1 <<4 , +IB_UVERBS_COMP_CNTR_ATTACH_OP_REMOTE_RDMA_WRITE =1 <<5 , +}; +#endif
include/uapi/rdma/ib_user_verbs.h +1 -1
@@ -299,7 +299,7 @@ struct ib_uverbs_ex_query_device_resp {struct ib_uverbs_cq_moderation_caps cq_moderation_caps;__aligned_u64 max_dm_size;__u32 xrc_odp_caps; -__u32 reserved; +__u32 max_comp_cntr; };struct ib_uverbs_query_port {
Signature · 1 line
2.47.3
PATCH v3 2/5 RDMA/core: Add Completion Counters support
In reply to Michael MargolinAdd core infrastructure for Completion Counters, a light-weight alternative to polling CQ for tracking operation completions.
Define the UVERBS_OBJECT_COMP_CNTR ioctl object with create, destroy, modify and read methods for both success and error counters. Add a QP attach method on the QP object to associate a completion counter with a queue pair.
Add ib_comp_cntr struct, ib_comp_cntr_attach_attr, device ops, and DECLARE_RDMA_OBJ_SIZE for driver object allocation.
Only userspace Completion Counters are supported at this stage.
--- drivers/infiniband/core/Makefile | 1 + drivers/infiniband/core/device.c | 6 + drivers/infiniband/core/rdma_core.h | 1 + drivers/infiniband/core/uverbs_cmd.c | 1 + .../core/uverbs_std_types_comp_cntr.c | 174 ++++++++++++++++++ drivers/infiniband/core/uverbs_std_types_qp.c | 45 ++++- drivers/infiniband/core/uverbs_uapi.c | 1 + include/rdma/ib_verbs.h | 40 ++++ include/uapi/rdma/ib_user_ioctl_cmds.h | 38 ++++ include/uapi/rdma/ib_user_ioctl_verbs.h | 19 ++ include/uapi/rdma/ib_user_verbs.h | 2 +- 11 files changed, 326 insertions(+), 2 deletions(-) create mode 100644 drivers/infiniband/core/uverbs_std_types_comp_cntr.c
drivers/infiniband/core/Makefile +1 -0
@@ -35,6 +35,7 @@ ib_umad-y := user_mad.o ib_uverbs-y := uverbs_main.o uverbs_cmd.o uverbs_marshall.o \ rdma_core.o uverbs_std_types.o uverbs_ioctl.o \ uverbs_std_types_cq.o \ + uverbs_std_types_comp_cntr.o \ uverbs_std_types_dmabuf.o \ uverbs_std_types_dmah.o \ uverbs_std_types_flow_action.o uverbs_std_types_dm.o \
drivers/infiniband/core/device.c +6 -0
@@ -2734,6 +2734,7 @@ void ib_set_device_ops(struct ib_device *dev, const struct ib_device_ops *ops)SET_DEVICE_OP (dev_ops, create_ah);SET_DEVICE_OP (dev_ops, create_counters);SET_DEVICE_OP (dev_ops, create_cq); +SET_DEVICE_OP (dev_ops, create_comp_cntr);SET_DEVICE_OP (dev_ops, create_user_cq);SET_DEVICE_OP (dev_ops, create_flow);SET_DEVICE_OP (dev_ops, create_qp);
@@ -2754,6 +2755,7 @@ void ib_set_device_ops(struct ib_device *dev, const struct ib_device_ops *ops)SET_DEVICE_OP (dev_ops, destroy_ah);SET_DEVICE_OP (dev_ops, destroy_counters);SET_DEVICE_OP (dev_ops, destroy_cq); +SET_DEVICE_OP (dev_ops, destroy_comp_cntr);SET_DEVICE_OP (dev_ops, destroy_flow);SET_DEVICE_OP (dev_ops, destroy_flow_action);SET_DEVICE_OP (dev_ops, destroy_qp);
@@ -2805,6 +2807,7 @@ void ib_set_device_ops(struct ib_device *dev, const struct ib_device_ops *ops)SET_DEVICE_OP (dev_ops, modify_hw_stat);SET_DEVICE_OP (dev_ops, modify_port);SET_DEVICE_OP (dev_ops, modify_qp); +SET_DEVICE_OP (dev_ops, qp_attach_comp_cntr);SET_DEVICE_OP (dev_ops, modify_srq);SET_DEVICE_OP (dev_ops, modify_wq);SET_DEVICE_OP (dev_ops, peek_cq);
@@ -2828,12 +2831,14 @@ void ib_set_device_ops(struct ib_device *dev, const struct ib_device_ops *ops)SET_DEVICE_OP (dev_ops, query_ucontext);SET_DEVICE_OP (dev_ops, rdma_netdev_get_params);SET_DEVICE_OP (dev_ops, read_counters); +SET_DEVICE_OP (dev_ops, read_comp_cntr);SET_DEVICE_OP (dev_ops, reg_dm_mr);SET_DEVICE_OP (dev_ops, reg_user_mr);SET_DEVICE_OP (dev_ops, reg_user_mr_dmabuf);SET_DEVICE_OP (dev_ops, req_notify_cq);SET_DEVICE_OP (dev_ops, rereg_user_mr);SET_DEVICE_OP (dev_ops, resize_user_cq); +SET_DEVICE_OP (dev_ops, modify_comp_cntr);SET_DEVICE_OP (dev_ops, set_vf_guid);SET_DEVICE_OP (dev_ops, set_vf_link_state);SET_DEVICE_OP (dev_ops, ufile_hw_cleanup);
@@ -2842,6 +2847,7 @@ void ib_set_device_ops(struct ib_device *dev, const struct ib_device_ops *ops)SET_OBJ_SIZE (dev_ops, ib_ah);SET_OBJ_SIZE (dev_ops, ib_counters);SET_OBJ_SIZE (dev_ops, ib_cq); +SET_OBJ_SIZE (dev_ops, ib_comp_cntr);SET_OBJ_SIZE (dev_ops, ib_dmah);SET_OBJ_SIZE (dev_ops, ib_mw);SET_OBJ_SIZE (dev_ops, ib_pd);
drivers/infiniband/core/rdma_core.h +1 -0
@@ -156,6 +156,7 @@ uverbs_api_ioctl_handler_fn uverbs_get_handler_fn(struct ib_udata *udata);extern const struct uapi_definition uverbs_def_obj_async_fd[];extern const struct uapi_definition uverbs_def_obj_counters[]; +extern const struct uapi_definition uverbs_def_obj_comp_cntr[];extern const struct uapi_definition uverbs_def_obj_cq[];extern const struct uapi_definition uverbs_def_obj_device[];extern const struct uapi_definition uverbs_def_obj_dm[];
drivers/infiniband/core/uverbs_cmd.c +1 -0
@@ -3673,6 +3673,7 @@ static int ib_uverbs_ex_query_device(struct uverbs_attr_bundle *attrs) resp.cq_moderation_caps.max_cq_moderation_period = attr.cq_caps.max_cq_moderation_period; resp.max_dm_size = attr.max_dm_size; + resp.max_comp_cntr = attr.max_comp_cntr; resp.response_length =uverbs_response_length (attrs,sizeof (resp));return uverbs_response (attrs, &resp,sizeof (resp));
drivers/infiniband/core/uverbs_std_types_comp_cntr.c new file +174 -0
174 lines not on this page · raw message
drivers/infiniband/core/uverbs_std_types_qp.c +44 -1
55 lines not on this page · raw message
drivers/infiniband/core/uverbs_uapi.c +1 -0
@@ -628,6 +628,7 @@ void uverbs_destroy_api(struct uverbs_api *uapi)static const struct uapi_definition uverbs_core_api[] = {UAPI_DEF_CHAIN (uverbs_def_obj_async_fd),UAPI_DEF_CHAIN (uverbs_def_obj_counters), +UAPI_DEF_CHAIN (uverbs_def_obj_comp_cntr),UAPI_DEF_CHAIN (uverbs_def_obj_cq),UAPI_DEF_CHAIN (uverbs_def_obj_device),UAPI_DEF_CHAIN (uverbs_def_obj_dm),
include/rdma/ib_verbs.h +40 -0
@@ -453,6 +453,7 @@ struct ib_device_attr {u64 max_dm_size;/* Max entries for sgl for optimized performance per READ */ u32 max_sgl_rd; +u32 max_comp_cntr; };enum ib_mtu {
@@ -1746,6 +1747,36 @@ struct ib_cq {struct rdma_restrack_entry res; }; +struct ib_comp_cntr { +struct ib_device *device; +struct ib_uobject *uobject; +u64 comp_count_max_value; +u64 err_count_max_value; +}; + +enum ib_comp_cntr_entry { +IB_COMP_CNTR_ENTRY_COMP =IB_UVERBS_COMP_CNTR_ENTRY_COMP , +IB_COMP_CNTR_ENTRY_ERR =IB_UVERBS_COMP_CNTR_ENTRY_ERR , +}; + +enum ib_comp_cntr_modify_op { +IB_COMP_CNTR_MODIFY_OP_SET =IB_UVERBS_COMP_CNTR_MODIFY_OP_SET , +IB_COMP_CNTR_MODIFY_OP_INC =IB_UVERBS_COMP_CNTR_MODIFY_OP_INC , +}; + +enum ib_comp_cntr_attach_op { +IB_COMP_CNTR_ATTACH_OP_SEND =IB_UVERBS_COMP_CNTR_ATTACH_OP_SEND , +IB_COMP_CNTR_ATTACH_OP_RECV =IB_UVERBS_COMP_CNTR_ATTACH_OP_RECV , +IB_COMP_CNTR_ATTACH_OP_RDMA_READ =IB_UVERBS_COMP_CNTR_ATTACH_OP_RDMA_READ , +IB_COMP_CNTR_ATTACH_OP_REMOTE_RDMA_READ =IB_UVERBS_COMP_CNTR_ATTACH_OP_REMOTE_RDMA_READ , +IB_COMP_CNTR_ATTACH_OP_RDMA_WRITE =IB_UVERBS_COMP_CNTR_ATTACH_OP_RDMA_WRITE , +IB_COMP_CNTR_ATTACH_OP_REMOTE_RDMA_WRITE =IB_UVERBS_COMP_CNTR_ATTACH_OP_REMOTE_RDMA_WRITE , +}; + +struct ib_comp_cntr_attach_attr { +u32 op_mask; +}; +struct ib_srq {struct ib_device *device;struct ib_pd *pd;
@@ -2624,6 +2655,8 @@ struct ib_device_ops { struct ib_udata *udata);int (*modify_qp)(struct ib_qp *qp,struct ib_qp_attr *qp_attr,int qp_attr_mask,struct ib_udata *udata); +int (*qp_attach_comp_cntr)(struct ib_qp *qp,struct ib_comp_cntr *cc, +struct ib_comp_cntr_attach_attr *attr);int (*query_qp)(struct ib_qp *qp,struct ib_qp_attr *qp_attr,int qp_attr_mask,struct ib_qp_init_attr *qp_init_attr);int (*destroy_qp)(struct ib_qp *qp,struct ib_udata *udata);
@@ -2645,6 +2678,12 @@ struct ib_device_ops {* post_destroy_cq - Free all kernel resources */ void (*post_destroy_cq)(struct ib_cq *cq); +int (*create_comp_cntr)(struct ib_comp_cntr *cc, +struct uverbs_attr_bundle *attrs); +int (*destroy_comp_cntr)(struct ib_comp_cntr *cc); +int (*modify_comp_cntr)(struct ib_comp_cntr *cc,enum ib_comp_cntr_entry entry, +enum ib_comp_cntr_modify_op op,u64 value); +int (*read_comp_cntr)(struct ib_comp_cntr *cc,enum ib_comp_cntr_entry entry,u64 *value);struct ib_mr *(*get_dma_mr)(struct ib_pd *pd,int mr_access_flags); struct ib_mr *(*reg_user_mr)(struct ib_pd *pd, u64 start, u64 length, u64 virt_addr, int mr_access_flags,
@@ -2878,6 +2917,7 @@ struct ib_device_ops {DECLARE_RDMA_OBJ_SIZE (ib_ah);DECLARE_RDMA_OBJ_SIZE (ib_counters);DECLARE_RDMA_OBJ_SIZE (ib_cq); +DECLARE_RDMA_OBJ_SIZE (ib_comp_cntr);DECLARE_RDMA_OBJ_SIZE (ib_dmah);DECLARE_RDMA_OBJ_SIZE (ib_mw);DECLARE_RDMA_OBJ_SIZE (ib_pd);
include/uapi/rdma/ib_user_ioctl_cmds.h +38 -0
@@ -57,6 +57,7 @@ enum uverbs_default_objects {UVERBS_OBJECT_ASYNC_EVENT ,UVERBS_OBJECT_DMAH ,UVERBS_OBJECT_DMABUF , + UVERBS_OBJECT_COMP_CNTR, }; enum {
@@ -165,9 +166,16 @@ enum uverbs_attrs_destroy_qp_cmd_attr_ids { UVERBS_ATTR_DESTROY_QP_RESP, }; +enum uverbs_attrs_qp_attach_comp_cntr_cmd_attr_ids { +UVERBS_ATTR_QP_ATTACH_COMP_CNTR_HANDLE , +UVERBS_ATTR_QP_ATTACH_COMP_CNTR_CNTR_HANDLE , +UVERBS_ATTR_QP_ATTACH_COMP_CNTR_OP_MASK , +}; +enum uverbs_methods_qp {UVERBS_METHOD_QP_CREATE ,UVERBS_METHOD_QP_DESTROY , +UVERBS_METHOD_QP_ATTACH_COMP_CNTR , };enum uverbs_attrs_create_srq_cmd_attr_ids {
@@ -434,4 +442,34 @@ enum uverbs_attrs_query_gid_entry_cmd_attr_ids { UVERBS_ATTR_QUERY_GID_ENTRY_RESP_ENTRY, }; +enum uverbs_methods_comp_cntr { +UVERBS_METHOD_COMP_CNTR_CREATE , +UVERBS_METHOD_COMP_CNTR_DESTROY , +UVERBS_METHOD_COMP_CNTR_MODIFY , +UVERBS_METHOD_COMP_CNTR_READ , +}; + +enum uverbs_attrs_create_comp_cntr_cmd_attr_ids { +UVERBS_ATTR_CREATE_COMP_CNTR_HANDLE , +UVERBS_ATTR_CREATE_COMP_CNTR_RESP_COUNT_MAX_VALUE , +UVERBS_ATTR_CREATE_COMP_CNTR_RESP_ERR_COUNT_MAX_VALUE , +}; + +enum uverbs_attrs_destroy_comp_cntr_cmd_attr_ids { +UVERBS_ATTR_DESTROY_COMP_CNTR_HANDLE , +}; + +enum uverbs_attrs_modify_comp_cntr_cmd_attr_ids { +UVERBS_ATTR_MODIFY_COMP_CNTR_HANDLE , +UVERBS_ATTR_MODIFY_COMP_CNTR_ENTRY , +UVERBS_ATTR_MODIFY_COMP_CNTR_OP , +UVERBS_ATTR_MODIFY_COMP_CNTR_VALUE , +}; + +enum uverbs_attrs_read_comp_cntr_cmd_attr_ids { +UVERBS_ATTR_READ_COMP_CNTR_HANDLE , +UVERBS_ATTR_READ_COMP_CNTR_ENTRY , +UVERBS_ATTR_READ_COMP_CNTR_RESP_VALUE , +}; +#endif
include/uapi/rdma/ib_user_ioctl_verbs.h +19 -0
@@ -273,4 +273,23 @@ struct ib_uverbs_gid_entry { __u32 netdev_ifindex; /* It is 0 if there is no netdev associated with it */ }; +enum ib_uverbs_comp_cntr_entry { +IB_UVERBS_COMP_CNTR_ENTRY_COMP , +IB_UVERBS_COMP_CNTR_ENTRY_ERR , +}; + +enum ib_uverbs_comp_cntr_modify_op { +IB_UVERBS_COMP_CNTR_MODIFY_OP_SET , +IB_UVERBS_COMP_CNTR_MODIFY_OP_INC , +}; + +enum ib_uverbs_comp_cntr_attach_op { +IB_UVERBS_COMP_CNTR_ATTACH_OP_SEND =1 <<0 , +IB_UVERBS_COMP_CNTR_ATTACH_OP_RECV =1 <<1 , +IB_UVERBS_COMP_CNTR_ATTACH_OP_RDMA_READ =1 <<2 , +IB_UVERBS_COMP_CNTR_ATTACH_OP_REMOTE_RDMA_READ =1 <<3 , +IB_UVERBS_COMP_CNTR_ATTACH_OP_RDMA_WRITE =1 <<4 , +IB_UVERBS_COMP_CNTR_ATTACH_OP_REMOTE_RDMA_WRITE =1 <<5 , +}; +#endif
include/uapi/rdma/ib_user_verbs.h +1 -1
@@ -299,7 +299,7 @@ struct ib_uverbs_ex_query_device_resp {struct ib_uverbs_cq_moderation_caps cq_moderation_caps;__aligned_u64 max_dm_size;__u32 xrc_odp_caps; -__u32 reserved; +__u32 max_comp_cntr; };struct ib_uverbs_query_port {
Signature · 1 line
2.47.3