Skip to content

Commit 18dc896

Browse files
committed
Update kernel headers
To commit: ?? ("RDMA/efa: Add Completion Counters support"). Signed-off-by: Michael Margolin <mrgolin@amazon.com>
1 parent d3516eb commit 18dc896

4 files changed

Lines changed: 77 additions & 1 deletion

File tree

kernel-headers/rdma/efa-abi.h

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ enum {
133133
EFA_QUERY_DEVICE_CAPS_RDMA_WRITE = 1 << 5,
134134
EFA_QUERY_DEVICE_CAPS_UNSOLICITED_WRITE_RECV = 1 << 6,
135135
EFA_QUERY_DEVICE_CAPS_CQ_WITH_EXT_MEM = 1 << 7,
136+
EFA_QUERY_DEVICE_CAPS_COMP_CNTR = 1 << 8,
136137
};
137138

138139
struct efa_ibv_ex_query_device_resp {
@@ -163,4 +164,22 @@ enum efa_mr_methods {
163164
EFA_IB_METHOD_MR_QUERY = (1U << UVERBS_ID_NS_SHIFT),
164165
};
165166

167+
enum efa_uverbs_buffer_type {
168+
EFA_UVERBS_BUFFER_TYPE_DMABUF = 0,
169+
EFA_UVERBS_BUFFER_TYPE_VA = 1,
170+
};
171+
172+
struct efa_uverbs_buffer_desc {
173+
__s32 fd;
174+
__u32 type;
175+
__u32 reserved[2];
176+
__aligned_u64 addr;
177+
__aligned_u64 length;
178+
};
179+
180+
enum efa_comp_cntr_create_attrs {
181+
EFA_IB_ATTR_CREATE_COMP_CNTR_COMP_BUFFER = (1U << UVERBS_ID_NS_SHIFT),
182+
EFA_IB_ATTR_CREATE_COMP_CNTR_ERR_BUFFER,
183+
};
184+
166185
#endif /* EFA_ABI_USER_H */

kernel-headers/rdma/ib_user_ioctl_cmds.h

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ enum uverbs_default_objects {
5757
UVERBS_OBJECT_ASYNC_EVENT,
5858
UVERBS_OBJECT_DMAH,
5959
UVERBS_OBJECT_DMABUF,
60+
UVERBS_OBJECT_COMP_CNTR,
6061
};
6162

6263
enum {
@@ -165,9 +166,16 @@ enum uverbs_attrs_destroy_qp_cmd_attr_ids {
165166
UVERBS_ATTR_DESTROY_QP_RESP,
166167
};
167168

169+
enum uverbs_attrs_qp_attach_comp_cntr_cmd_attr_ids {
170+
UVERBS_ATTR_QP_ATTACH_COMP_CNTR_HANDLE,
171+
UVERBS_ATTR_QP_ATTACH_COMP_CNTR_CNTR_HANDLE,
172+
UVERBS_ATTR_QP_ATTACH_COMP_CNTR_OP_MASK,
173+
};
174+
168175
enum uverbs_methods_qp {
169176
UVERBS_METHOD_QP_CREATE,
170177
UVERBS_METHOD_QP_DESTROY,
178+
UVERBS_METHOD_QP_ATTACH_COMP_CNTR,
171179
};
172180

173181
enum uverbs_attrs_create_srq_cmd_attr_ids {
@@ -434,4 +442,34 @@ enum uverbs_attrs_query_gid_entry_cmd_attr_ids {
434442
UVERBS_ATTR_QUERY_GID_ENTRY_RESP_ENTRY,
435443
};
436444

445+
enum uverbs_methods_comp_cntr {
446+
UVERBS_METHOD_COMP_CNTR_CREATE,
447+
UVERBS_METHOD_COMP_CNTR_DESTROY,
448+
UVERBS_METHOD_COMP_CNTR_MODIFY,
449+
UVERBS_METHOD_COMP_CNTR_READ,
450+
};
451+
452+
enum uverbs_attrs_create_comp_cntr_cmd_attr_ids {
453+
UVERBS_ATTR_CREATE_COMP_CNTR_HANDLE,
454+
UVERBS_ATTR_CREATE_COMP_CNTR_RESP_COUNT_MAX_VALUE,
455+
UVERBS_ATTR_CREATE_COMP_CNTR_RESP_ERR_COUNT_MAX_VALUE,
456+
};
457+
458+
enum uverbs_attrs_destroy_comp_cntr_cmd_attr_ids {
459+
UVERBS_ATTR_DESTROY_COMP_CNTR_HANDLE,
460+
};
461+
462+
enum uverbs_attrs_modify_comp_cntr_cmd_attr_ids {
463+
UVERBS_ATTR_MODIFY_COMP_CNTR_HANDLE,
464+
UVERBS_ATTR_MODIFY_COMP_CNTR_ENTRY,
465+
UVERBS_ATTR_MODIFY_COMP_CNTR_OP,
466+
UVERBS_ATTR_MODIFY_COMP_CNTR_VALUE,
467+
};
468+
469+
enum uverbs_attrs_read_comp_cntr_cmd_attr_ids {
470+
UVERBS_ATTR_READ_COMP_CNTR_HANDLE,
471+
UVERBS_ATTR_READ_COMP_CNTR_ENTRY,
472+
UVERBS_ATTR_READ_COMP_CNTR_RESP_VALUE,
473+
};
474+
437475
#endif

kernel-headers/rdma/ib_user_ioctl_verbs.h

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,4 +273,23 @@ struct ib_uverbs_gid_entry {
273273
__u32 netdev_ifindex; /* It is 0 if there is no netdev associated with it */
274274
};
275275

276+
enum ib_uverbs_comp_cntr_entry {
277+
IB_UVERBS_COMP_CNTR_ENTRY_COMP,
278+
IB_UVERBS_COMP_CNTR_ENTRY_ERR,
279+
};
280+
281+
enum ib_uverbs_comp_cntr_modify_op {
282+
IB_UVERBS_COMP_CNTR_MODIFY_OP_SET,
283+
IB_UVERBS_COMP_CNTR_MODIFY_OP_INC,
284+
};
285+
286+
enum ib_uverbs_qp_attach_comp_cntr_op {
287+
IB_UVERBS_QP_ATTACH_COMP_CNTR_OP_SEND = 1 << 0,
288+
IB_UVERBS_QP_ATTACH_COMP_CNTR_OP_RECV = 1 << 1,
289+
IB_UVERBS_QP_ATTACH_COMP_CNTR_OP_RDMA_READ = 1 << 2,
290+
IB_UVERBS_QP_ATTACH_COMP_CNTR_OP_REMOTE_RDMA_READ = 1 << 3,
291+
IB_UVERBS_QP_ATTACH_COMP_CNTR_OP_RDMA_WRITE = 1 << 4,
292+
IB_UVERBS_QP_ATTACH_COMP_CNTR_OP_REMOTE_RDMA_WRITE = 1 << 5,
293+
};
294+
276295
#endif

kernel-headers/rdma/ib_user_verbs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ struct ib_uverbs_ex_query_device_resp {
299299
struct ib_uverbs_cq_moderation_caps cq_moderation_caps;
300300
__aligned_u64 max_dm_size;
301301
__u32 xrc_odp_caps;
302-
__u32 reserved;
302+
__u32 max_comp_cntr;
303303
};
304304

305305
struct ib_uverbs_query_port {

0 commit comments

Comments
 (0)