Skip to content

Commit

Permalink
Update kernel headers
Browse files Browse the repository at this point in the history
To commit 6c01e6b218ae ("IB/uverbs: Expose UAPI to query MR")

Signed-off-by: Yishai Hadas <yishaih@mellanox.com>
  • Loading branch information
yishaih committed Jul 9, 2020
1 parent 53d8464 commit 50937d0
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 1 deletion.
15 changes: 15 additions & 0 deletions kernel-headers/rdma/ib_user_ioctl_cmds.h
Expand Up @@ -69,6 +69,7 @@ enum uverbs_methods_device {
UVERBS_METHOD_INFO_HANDLES,
UVERBS_METHOD_QUERY_PORT,
UVERBS_METHOD_GET_CONTEXT,
UVERBS_METHOD_QUERY_CONTEXT,
};

enum uverbs_attrs_invoke_write_cmd_attr_ids {
Expand All @@ -87,6 +88,11 @@ enum uverbs_attrs_get_context_attr_ids {
UVERBS_ATTR_GET_CONTEXT_CORE_SUPPORT,
};

enum uverbs_attrs_query_context_attr_ids {
UVERBS_ATTR_QUERY_CONTEXT_NUM_COMP_VECTORS,
UVERBS_ATTR_QUERY_CONTEXT_CORE_SUPPORT,
};

enum uverbs_attrs_create_cq_cmd_attr_ids {
UVERBS_ATTR_CREATE_CQ_HANDLE,
UVERBS_ATTR_CREATE_CQ_CQE,
Expand Down Expand Up @@ -242,6 +248,7 @@ enum uverbs_methods_mr {
UVERBS_METHOD_DM_MR_REG,
UVERBS_METHOD_MR_DESTROY,
UVERBS_METHOD_ADVISE_MR,
UVERBS_METHOD_QUERY_MR,
};

enum uverbs_attrs_mr_destroy_ids {
Expand All @@ -255,6 +262,14 @@ enum uverbs_attrs_advise_mr_cmd_attr_ids {
UVERBS_ATTR_ADVISE_MR_SGE_LIST,
};

enum uverbs_attrs_query_mr_cmd_attr_ids {
UVERBS_ATTR_QUERY_MR_HANDLE,
UVERBS_ATTR_QUERY_MR_RESP_LKEY,
UVERBS_ATTR_QUERY_MR_RESP_RKEY,
UVERBS_ATTR_QUERY_MR_RESP_LENGTH,
UVERBS_ATTR_QUERY_MR_RESP_IOVA,
};

enum uverbs_attrs_create_counters_cmd_attr_ids {
UVERBS_ATTR_CREATE_COUNTERS_HANDLE,
};
Expand Down
14 changes: 14 additions & 0 deletions kernel-headers/rdma/mlx5_user_ioctl_cmds.h
Expand Up @@ -228,6 +228,10 @@ enum mlx5_ib_flow_matcher_methods {
MLX5_IB_METHOD_FLOW_MATCHER_DESTROY,
};

enum mlx5_ib_device_query_context_attrs {
MLX5_IB_ATTR_QUERY_CONTEXT_RESP_UCTX = (1U << UVERBS_ID_NS_SHIFT),
};

#define MLX5_IB_DW_MATCH_PARAM 0x80

struct mlx5_ib_match_params {
Expand Down Expand Up @@ -286,4 +290,14 @@ enum mlx5_ib_create_flow_action_create_packet_reformat_attrs {
MLX5_IB_ATTR_CREATE_PACKET_REFORMAT_DATA_BUF,
};

enum mlx5_ib_query_pd_attrs {
MLX5_IB_ATTR_QUERY_PD_HANDLE = (1U << UVERBS_ID_NS_SHIFT),
MLX5_IB_ATTR_QUERY_PD_RESP_PDN,
};

enum mlx5_ib_pd_methods {
MLX5_IB_METHOD_PD_QUERY = (1U << UVERBS_ID_NS_SHIFT),

};

#endif
8 changes: 8 additions & 0 deletions kernel-headers/rdma/rdma_netlink.h
Expand Up @@ -287,6 +287,12 @@ enum rdma_nldev_command {

RDMA_NLDEV_CMD_STAT_DEL,

RDMA_NLDEV_CMD_RES_QP_GET_RAW,

RDMA_NLDEV_CMD_RES_CQ_GET_RAW,

RDMA_NLDEV_CMD_RES_MR_GET_RAW,

RDMA_NLDEV_NUM_OPS
};

Expand Down Expand Up @@ -525,6 +531,8 @@ enum rdma_nldev_attr {
*/
RDMA_NLDEV_ATTR_DEV_DIM, /* u8 */

RDMA_NLDEV_ATTR_RES_RAW, /* binary */

/*
* Always the end
*/
Expand Down
2 changes: 1 addition & 1 deletion kernel-headers/rdma/rdma_user_ioctl_cmds.h
Expand Up @@ -36,7 +36,7 @@
#include <linux/types.h>
#include <linux/ioctl.h>

/* Documentation/ioctl/ioctl-number.rst */
/* Documentation/userspace-api/ioctl/ioctl-number.rst */
#define RDMA_IOCTL_MAGIC 0x1b
#define RDMA_VERBS_IOCTL \
_IOWR(RDMA_IOCTL_MAGIC, 1, struct ib_uverbs_ioctl_hdr)
Expand Down

0 comments on commit 50937d0

Please sign in to comment.