History

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma

Pull rdma updates from Jason Gunthorpe: "A very quiet cycle with few notable changes. Mostly the usual list of one or two patches to drivers changing something that isn't quite rc worthy. The subsystem seems to be seeing a larger number of rework and cleanup style patches right now, I feel that several vendors are prepping their drivers for new silicon. Summary: - Driver updates and cleanup for qedr, bnxt_re, hns, siw, mlx5, mlx4, rxe, i40iw - Larger series doing cleanup and rework for hns and hfi1. - Some general reworking of the CM code to make it a little more understandable - Unify the different code paths connected to the uverbs FD scheme - New UAPI ioctls conversions for get context and get async fd - Trace points for CQ and CM portions of the RDMA stack - mlx5 driver support for virtio-net formatted rings as RDMA raw ethernet QPs - verbs support for setting the PCI-E relaxed ordering bit on DMA traffic connected to a MR - A couple of bug fixes that came too late to make rc7" * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma: (108 commits) RDMA/core: Make the entire API tree static RDMA/efa: Mask access flags with the correct optional range RDMA/cma: Fix unbalanced cm_id reference count during address resolve RDMA/umem: Fix ib_umem_find_best_pgsz() IB/mlx4: Fix leak in id_map_find_del IB/opa_vnic: Spelling correction of 'erorr' to 'error' IB/hfi1: Fix logical condition in msix_request_irq RDMA/cm: Remove CM message structs RDMA/cm: Use IBA functions for complex structure members RDMA/cm: Use IBA functions for simple structure members RDMA/cm: Use IBA functions for swapping get/set acessors RDMA/cm: Use IBA functions for simple get/set acessors RDMA/cm: Add SET/GET implementations to hide IBA wire format RDMA/cm: Add accessors for CM_REQ transport_type IB/mlx5: Return the administrative GUID if exists RDMA/core: Ensure that rdma_user_mmap_entry_remove() is a fence IB/mlx4: Fix memory leak in add_gid error flow IB/mlx5: Expose RoCE accelerator counters RDMA/mlx5: Set relaxed ordering when requested RDMA/core: Add the core support field to METHOD_GET_CONTEXT ...

Linus Torvalds committed 6 years ago

Commit 8fdd4012 parents 68b62e5 8889f6f103 files · +4659 −3200Browse files

Showing the changes to include/uapi (4 of 103 files). Show all

Unified · Split

4 files
  1. include/uapi/rdma/ib_user_ioctl_cmds.h +15 −0
  2. include/uapi/rdma/ib_user_ioctl_verbs.h +12 −0
  3. include/uapi/rdma/mlx5_user_ioctl_cmds.h +17 −0
  4. include/uapi/rdma/qedr-abi.h +16 −2
include/uapi/rdma/ib_user_ioctl_cmds.h+15−0
@@ -56,6 +56,7 @@ enum uverbs_default_objects { · 55 unmodified lines
56 UVERBS_OBJECT_FLOW_ACTION,56 UVERBS_OBJECT_FLOW_ACTION,
57 UVERBS_OBJECT_DM,57 UVERBS_OBJECT_DM,
58 UVERBS_OBJECT_COUNTERS,58 UVERBS_OBJECT_COUNTERS,
59 UVERBS_OBJECT_ASYNC_EVENT,
59};60};
60 61
61enum {62enum {
@@ -67,6 +68,7 @@ enum uverbs_methods_device { · 5 unmodified lines
67 UVERBS_METHOD_INVOKE_WRITE,68 UVERBS_METHOD_INVOKE_WRITE,
68 UVERBS_METHOD_INFO_HANDLES,69 UVERBS_METHOD_INFO_HANDLES,
69 UVERBS_METHOD_QUERY_PORT,70 UVERBS_METHOD_QUERY_PORT,
71 UVERBS_METHOD_GET_CONTEXT,
70};72};
71 73
72enum uverbs_attrs_invoke_write_cmd_attr_ids {74enum uverbs_attrs_invoke_write_cmd_attr_ids {
@@ -80,6 +82,11 @@ enum uverbs_attrs_query_port_cmd_attr_ids { · 7 unmodified lines
80 UVERBS_ATTR_QUERY_PORT_RESP,82 UVERBS_ATTR_QUERY_PORT_RESP,
81};83};
82 84
85enum uverbs_attrs_get_context_attr_ids {
86 UVERBS_ATTR_GET_CONTEXT_NUM_COMP_VECTORS,
87 UVERBS_ATTR_GET_CONTEXT_CORE_SUPPORT,
88};
89
83enum uverbs_attrs_create_cq_cmd_attr_ids {90enum uverbs_attrs_create_cq_cmd_attr_ids {
84 UVERBS_ATTR_CREATE_CQ_HANDLE,91 UVERBS_ATTR_CREATE_CQ_HANDLE,
85 UVERBS_ATTR_CREATE_CQ_CQE,92 UVERBS_ATTR_CREATE_CQ_CQE,
@@ -241,4 +248,12 @@ enum uverbs_attrs_flow_destroy_ids { · 155 unmodified lines
241 UVERBS_ATTR_DESTROY_FLOW_HANDLE,248 UVERBS_ATTR_DESTROY_FLOW_HANDLE,
242};249};
243 250
251enum uverbs_method_async_event {
252 UVERBS_METHOD_ASYNC_EVENT_ALLOC,
253};
254
255enum uverbs_attrs_async_event_create {
256 UVERBS_ATTR_ASYNC_EVENT_ALLOC_FD_HANDLE,
257};
258
244#endif259#endif
include/uapi/rdma/ib_user_ioctl_verbs.h+12−0
@@ -41,6 +41,13 @@ · 40 unmodified lines
41#define RDMA_UAPI_PTR(_type, _name) __aligned_u64 _name41#define RDMA_UAPI_PTR(_type, _name) __aligned_u64 _name
42#endif42#endif
43 43
44#define IB_UVERBS_ACCESS_OPTIONAL_FIRST (1 << 20)
45#define IB_UVERBS_ACCESS_OPTIONAL_LAST (1 << 29)
46
47enum ib_uverbs_core_support {
48 IB_UVERBS_CORE_SUPPORT_OPTIONAL_MR_ACCESS = 1 << 0,
49};
50
44enum ib_uverbs_access_flags {51enum ib_uverbs_access_flags {
45 IB_UVERBS_ACCESS_LOCAL_WRITE = 1 << 0,52 IB_UVERBS_ACCESS_LOCAL_WRITE = 1 << 0,
46 IB_UVERBS_ACCESS_REMOTE_WRITE = 1 << 1,53 IB_UVERBS_ACCESS_REMOTE_WRITE = 1 << 1,
@@ -50,6 +57,11 @@ enum ib_uverbs_access_flags { · 3 unmodified lines
50 IB_UVERBS_ACCESS_ZERO_BASED = 1 << 5,57 IB_UVERBS_ACCESS_ZERO_BASED = 1 << 5,
51 IB_UVERBS_ACCESS_ON_DEMAND = 1 << 6,58 IB_UVERBS_ACCESS_ON_DEMAND = 1 << 6,
52 IB_UVERBS_ACCESS_HUGETLB = 1 << 7,59 IB_UVERBS_ACCESS_HUGETLB = 1 << 7,
60
61 IB_UVERBS_ACCESS_RELAXED_ORDERING = IB_UVERBS_ACCESS_OPTIONAL_FIRST,
62 IB_UVERBS_ACCESS_OPTIONAL_RANGE =
63 ((IB_UVERBS_ACCESS_OPTIONAL_LAST << 1) - 1) &
64 ~(IB_UVERBS_ACCESS_OPTIONAL_FIRST - 1)
53};65};
54 66
55enum ib_uverbs_query_port_cap_flags {67enum ib_uverbs_query_port_cap_flags {
include/uapi/rdma/mlx5_user_ioctl_cmds.h+17−0
@@ -115,6 +115,22 @@ enum mlx5_ib_devx_obj_methods { · 114 unmodified lines
115 MLX5_IB_METHOD_DEVX_OBJ_ASYNC_QUERY,115 MLX5_IB_METHOD_DEVX_OBJ_ASYNC_QUERY,
116};116};
117 117
118enum mlx5_ib_var_alloc_attrs {
119 MLX5_IB_ATTR_VAR_OBJ_ALLOC_HANDLE = (1U << UVERBS_ID_NS_SHIFT),
120 MLX5_IB_ATTR_VAR_OBJ_ALLOC_MMAP_OFFSET,
121 MLX5_IB_ATTR_VAR_OBJ_ALLOC_MMAP_LENGTH,
122 MLX5_IB_ATTR_VAR_OBJ_ALLOC_PAGE_ID,
123};
124
125enum mlx5_ib_var_obj_destroy_attrs {
126 MLX5_IB_ATTR_VAR_OBJ_DESTROY_HANDLE = (1U << UVERBS_ID_NS_SHIFT),
127};
128
129enum mlx5_ib_var_obj_methods {
130 MLX5_IB_METHOD_VAR_OBJ_ALLOC = (1U << UVERBS_ID_NS_SHIFT),
131 MLX5_IB_METHOD_VAR_OBJ_DESTROY,
132};
133
118enum mlx5_ib_devx_umem_reg_attrs {134enum mlx5_ib_devx_umem_reg_attrs {
119 MLX5_IB_ATTR_DEVX_UMEM_REG_HANDLE = (1U << UVERBS_ID_NS_SHIFT),135 MLX5_IB_ATTR_DEVX_UMEM_REG_HANDLE = (1U << UVERBS_ID_NS_SHIFT),
120 MLX5_IB_ATTR_DEVX_UMEM_REG_ADDR,136 MLX5_IB_ATTR_DEVX_UMEM_REG_ADDR,
@@ -156,6 +172,7 @@ enum mlx5_ib_objects { · 35 unmodified lines
156 MLX5_IB_OBJECT_FLOW_MATCHER,172 MLX5_IB_OBJECT_FLOW_MATCHER,
157 MLX5_IB_OBJECT_DEVX_ASYNC_CMD_FD,173 MLX5_IB_OBJECT_DEVX_ASYNC_CMD_FD,
158 MLX5_IB_OBJECT_DEVX_ASYNC_EVENT_FD,174 MLX5_IB_OBJECT_DEVX_ASYNC_EVENT_FD,
175 MLX5_IB_OBJECT_VAR,
159};176};
160 177
161enum mlx5_ib_flow_matcher_create_attrs {178enum mlx5_ib_flow_matcher_create_attrs {
include/uapi/rdma/qedr-abi.h+16−2
@@ -48,6 +48,18 @@ struct qedr_alloc_ucontext_req { · 47 unmodified lines
48 __u32 reserved;48 __u32 reserved;
49};49};
50 50
51#define QEDR_LDPM_MAX_SIZE (8192)
52#define QEDR_EDPM_TRANS_SIZE (64)
53
54enum qedr_rdma_dpm_type {
55 QEDR_DPM_TYPE_NONE = 0,
56 QEDR_DPM_TYPE_ROCE_ENHANCED = 1 << 0,
57 QEDR_DPM_TYPE_ROCE_LEGACY = 1 << 1,
58 QEDR_DPM_TYPE_IWARP_LEGACY = 1 << 2,
59 QEDR_DPM_TYPE_RESERVED = 1 << 3,
60 QEDR_DPM_SIZES_SET = 1 << 4,
61};
62
51struct qedr_alloc_ucontext_resp {63struct qedr_alloc_ucontext_resp {
52 __aligned_u64 db_pa;64 __aligned_u64 db_pa;
53 __u32 db_size;65 __u32 db_size;
@@ -59,10 +71,12 @@ struct qedr_alloc_ucontext_resp { · 5 unmodified lines
59 __u32 sges_per_recv_wr;71 __u32 sges_per_recv_wr;
60 __u32 sges_per_srq_wr;72 __u32 sges_per_srq_wr;
61 __u32 max_cqes;73 __u32 max_cqes;
62 __u8 dpm_enabled;74 __u8 dpm_flags;
63 __u8 wids_enabled;75 __u8 wids_enabled;
64 __u16 wid_count;76 __u16 wid_count;
65 __u32 reserved;77 __u16 ldpm_limit_size;
78 __u8 edpm_trans_size;
79 __u8 reserved;
66};80};
67 81
68struct qedr_alloc_pd_ureq {82struct qedr_alloc_pd_ureq {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t