History

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

Pull rdma updates from Jason Gunthorpe: - Various minor code cleanups and fixes for hns, iser, cxgb4, hfi1, rxe, erdma, mana_ib - Prefetch supprot for rxe ODP - Remove memory window support from hns as new device FW is no longer support it - Remove qib, it is very old and obsolete now, Cornelis wishes to restructure the hfi1/qib shared layer - Fix a race in destroying CQs where we can still end up with work running because the work is cancled before the driver stops triggering it - Improve interaction with namespaces: * Follow the devlink namespace for newly spawned RDMA devices * Create iopoib net devces in the parent IB device's namespace * Allow CAP_NET_RAW checks to pass in user namespaces - A new flow control scheme for IB MADs to try and avoid queue overflows in the network - Fix 2G message sizes in bnxt_re - Optimize mkey layout for mlx5 DMABUF - New "DMA Handle" concept to allow controlling PCI TPH and steering tags * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma: (71 commits) RDMA/siw: Change maintainer email address RDMA/mana_ib: add support of multiple ports RDMA/mlx5: Refactor optional counters steering code RDMA/mlx5: Add DMAH support for reg_user_mr/reg_user_dmabuf_mr IB: Extend UVERBS_METHOD_REG_MR to get DMAH RDMA/mlx5: Add DMAH object support RDMA/core: Introduce a DMAH object and its alloc/free APIs IB/core: Add UVERBS_METHOD_REG_MR on the MR object net/mlx5: Add support for device steering tag net/mlx5: Expose IFC bits for TPH PCI/TPH: Expose pcie_tph_get_st_table_size() RDMA/mlx5: Fix incorrect MKEY masking RDMA/mlx5: Fix returned type from _mlx5r_umr_zap_mkey() RDMA/mlx5: remove redundant check on err on return expression RDMA/mana_ib: add additional port counters RDMA/mana_ib: Fix DSCP value in modify QP RDMA/efa: Add CQ with external memory support RDMA/core: Add umem "is_contiguous" and "start_dma_addr" helpers RDMA/uverbs: Add a common way to create CQ with umem RDMA/mlx5: Optimize DMABUF mkey page size ...

Linus Torvalds committed 1 year ago

Commit 7ce4de12 parents 2c8c9aa ee23592153 files · +2869 −49167Browse files

Showing the changes to include/uapi (2 of 153 files). Show all

Unified · Split

2 files
  1. include/uapi/rdma/efa-abi.h +2 −1
  2. include/uapi/rdma/ib_user_ioctl_cmds.h +36 −0
include/uapi/rdma/efa-abi.h+2−1
@@ -1,6 +1,6 @@
1/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-2-Clause) */1/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-2-Clause) */
2/*2/*
3 * Copyright 2018-2024 Amazon.com, Inc. or its affiliates. All rights reserved.3 * Copyright 2018-2025 Amazon.com, Inc. or its affiliates. All rights reserved.
4 */4 */
5 5
6#ifndef EFA_ABI_USER_H6#ifndef EFA_ABI_USER_H
@@ -131,6 +131,7 @@ enum { · 124 unmodified lines
131 EFA_QUERY_DEVICE_CAPS_DATA_POLLING_128 = 1 << 4,131 EFA_QUERY_DEVICE_CAPS_DATA_POLLING_128 = 1 << 4,
132 EFA_QUERY_DEVICE_CAPS_RDMA_WRITE = 1 << 5,132 EFA_QUERY_DEVICE_CAPS_RDMA_WRITE = 1 << 5,
133 EFA_QUERY_DEVICE_CAPS_UNSOLICITED_WRITE_RECV = 1 << 6,133 EFA_QUERY_DEVICE_CAPS_UNSOLICITED_WRITE_RECV = 1 << 6,
134 EFA_QUERY_DEVICE_CAPS_CQ_WITH_EXT_MEM = 1 << 7,
134};135};
135 136
136struct efa_ibv_ex_query_device_resp {137struct efa_ibv_ex_query_device_resp {
include/uapi/rdma/ib_user_ioctl_cmds.h+36−0
@@ -55,6 +55,7 @@ enum uverbs_default_objects { · 54 unmodified lines
55 UVERBS_OBJECT_DM,55 UVERBS_OBJECT_DM,
56 UVERBS_OBJECT_COUNTERS,56 UVERBS_OBJECT_COUNTERS,
57 UVERBS_OBJECT_ASYNC_EVENT,57 UVERBS_OBJECT_ASYNC_EVENT,
58 UVERBS_OBJECT_DMAH,
58};59};
59 60
60enum {61enum {
@@ -105,6 +106,10 @@ enum uverbs_attrs_create_cq_cmd_attr_ids { · 44 unmodified lines
105 UVERBS_ATTR_CREATE_CQ_FLAGS,106 UVERBS_ATTR_CREATE_CQ_FLAGS,
106 UVERBS_ATTR_CREATE_CQ_RESP_CQE,107 UVERBS_ATTR_CREATE_CQ_RESP_CQE,
107 UVERBS_ATTR_CREATE_CQ_EVENT_FD,108 UVERBS_ATTR_CREATE_CQ_EVENT_FD,
109 UVERBS_ATTR_CREATE_CQ_BUFFER_VA,
110 UVERBS_ATTR_CREATE_CQ_BUFFER_LENGTH,
111 UVERBS_ATTR_CREATE_CQ_BUFFER_FD,
112 UVERBS_ATTR_CREATE_CQ_BUFFER_OFFSET,
108};113};
109 114
110enum uverbs_attrs_destroy_cq_cmd_attr_ids {115enum uverbs_attrs_destroy_cq_cmd_attr_ids {
@@ -236,6 +241,22 @@ enum uverbs_methods_dm { · 125 unmodified lines
236 UVERBS_METHOD_DM_FREE,241 UVERBS_METHOD_DM_FREE,
237};242};
238 243
244enum uverbs_attrs_alloc_dmah_cmd_attr_ids {
245 UVERBS_ATTR_ALLOC_DMAH_HANDLE,
246 UVERBS_ATTR_ALLOC_DMAH_CPU_ID,
247 UVERBS_ATTR_ALLOC_DMAH_TPH_MEM_TYPE,
248 UVERBS_ATTR_ALLOC_DMAH_PH,
249};
250
251enum uverbs_attrs_free_dmah_cmd_attr_ids {
252 UVERBS_ATTR_FREE_DMA_HANDLE,
253};
254
255enum uverbs_methods_dmah {
256 UVERBS_METHOD_DMAH_ALLOC,
257 UVERBS_METHOD_DMAH_FREE,
258};
259
239enum uverbs_attrs_reg_dm_mr_cmd_attr_ids {260enum uverbs_attrs_reg_dm_mr_cmd_attr_ids {
240 UVERBS_ATTR_REG_DM_MR_HANDLE,261 UVERBS_ATTR_REG_DM_MR_HANDLE,
241 UVERBS_ATTR_REG_DM_MR_OFFSET,262 UVERBS_ATTR_REG_DM_MR_OFFSET,
@@ -253,6 +274,7 @@ enum uverbs_methods_mr { · 11 unmodified lines
253 UVERBS_METHOD_ADVISE_MR,274 UVERBS_METHOD_ADVISE_MR,
254 UVERBS_METHOD_QUERY_MR,275 UVERBS_METHOD_QUERY_MR,
255 UVERBS_METHOD_REG_DMABUF_MR,276 UVERBS_METHOD_REG_DMABUF_MR,
277 UVERBS_METHOD_REG_MR,
256};278};
257 279
258enum uverbs_attrs_mr_destroy_ids {280enum uverbs_attrs_mr_destroy_ids {
@@ -286,6 +308,20 @@ enum uverbs_attrs_reg_dmabuf_mr_cmd_attr_ids { · 27 unmodified lines
286 UVERBS_ATTR_REG_DMABUF_MR_RESP_RKEY,308 UVERBS_ATTR_REG_DMABUF_MR_RESP_RKEY,
287};309};
288 310
311enum uverbs_attrs_reg_mr_cmd_attr_ids {
312 UVERBS_ATTR_REG_MR_HANDLE,
313 UVERBS_ATTR_REG_MR_PD_HANDLE,
314 UVERBS_ATTR_REG_MR_DMA_HANDLE,
315 UVERBS_ATTR_REG_MR_IOVA,
316 UVERBS_ATTR_REG_MR_ADDR,
317 UVERBS_ATTR_REG_MR_LENGTH,
318 UVERBS_ATTR_REG_MR_ACCESS_FLAGS,
319 UVERBS_ATTR_REG_MR_FD,
320 UVERBS_ATTR_REG_MR_FD_OFFSET,
321 UVERBS_ATTR_REG_MR_RESP_LKEY,
322 UVERBS_ATTR_REG_MR_RESP_RKEY,
323};
324
289enum uverbs_attrs_create_counters_cmd_attr_ids {325enum uverbs_attrs_create_counters_cmd_attr_ids {
290 UVERBS_ATTR_CREATE_COUNTERS_HANDLE,326 UVERBS_ATTR_CREATE_COUNTERS_HANDLE,
291};327};