Skip to content

Commit 4b0b946

Browse files
committed
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma
Pull rdma updates from Jason Gunthorpe: "The usual collection of driver changes, more core infrastructure updates that typical this cycle: - Minor cleanups and kernel-doc fixes in bnxt_re, hns, rdmavt, efa, ocrdma, erdma, rtrs, hfi1, ionic, and pvrdma - New udata validation framework and driver updates - Modernize CQ creation interface in mlx4 and mlx5, manage CQ umem in core - Promote UMEM to a core component, split out DMA block iterator logic - Introduce FRMR pools with aging, statistics, pinned handles, and netlink control and use it in mlx5 - Add PCIe TLP emulation support in mlx5 - Extend umem to work with revocable pinned dmabuf's and use it in irdma - More net namespace improvements for rxe - GEN4 hardware support in irdma - First steps to MW and UC support in mana_ib - Support for CQ umem and doorbells in bnxt_re - Drop opa_vnic driver from hfi1 Fixes: - IB/core zero dmac neighbor resolution race - GID table memory free - rxe pad/ICRC validation and r_key async errors - mlx4 external umem for CQ - umem DMA attributes on unmap - mana_ib RX steering on RSS QP destroy" * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma: (116 commits) RDMA/core: Fix user CQ creation for drivers without create_cq RDMA/ionic: bound node_desc sysfs read with %.64s IB/core: Fix zero dmac race in neighbor resolution RDMA/mana_ib: Support memory windows RDMA/rxe: Validate pad and ICRC before payload_size() in rxe_rcv RDMA/core: Prefer NLA_NUL_STRING RDMA/core: Fix memory free for GID table RDMA/hns: Remove the duplicate calls to ib_copy_validate_udata_in() RDMA: Remove redundant = {} for udata req structs RDMA/irdma: Add missing comp_mask check in alloc_ucontext RDMA/hns: Add missing comp_mask check in create_qp RDMA/mlx5: Pull comp_mask validation into ib_copy_validate_udata_in_cm() RDMA: Use ib_copy_validate_udata_in_cm() for zero comp_mask RDMA/hns: Use ib_copy_validate_udata_in() RDMA/mlx4: Use ib_copy_validate_udata_in() for QP RDMA/mlx4: Use ib_copy_validate_udata_in() RDMA/mlx5: Use ib_copy_validate_udata_in() for MW RDMA/mlx5: Use ib_copy_validate_udata_in() for SRQ RDMA/pvrdma: Use ib_copy_validate_udata_in() for srq RDMA: Use ib_copy_validate_udata_in() for implicit full structs ...
2 parents a5d1079 + 9091e3b commit 4b0b946

186 files changed

Lines changed: 4726 additions & 8149 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Documentation/driver-api/infiniband.rst

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -92,21 +92,6 @@ iSCSI Extensions for RDMA (iSER)
9292
.. kernel-doc:: drivers/infiniband/ulp/iser/iser_verbs.c
9393
:internal:
9494

95-
Omni-Path (OPA) Virtual NIC support
96-
-----------------------------------
97-
98-
.. kernel-doc:: drivers/infiniband/ulp/opa_vnic/opa_vnic_internal.h
99-
:internal:
100-
101-
.. kernel-doc:: drivers/infiniband/ulp/opa_vnic/opa_vnic_encap.h
102-
:internal:
103-
104-
.. kernel-doc:: drivers/infiniband/ulp/opa_vnic/opa_vnic_vema_iface.c
105-
:internal:
106-
107-
.. kernel-doc:: drivers/infiniband/ulp/opa_vnic/opa_vnic_vema.c
108-
:internal:
109-
11095
InfiniBand SCSI RDMA protocol target support
11196
--------------------------------------------
11297

Documentation/infiniband/index.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ InfiniBand
99

1010
core_locking
1111
ipoib
12-
opa_vnic
1312
sysfs
1413
tag_matching
1514
ucaps

Documentation/infiniband/opa_vnic.rst

Lines changed: 0 additions & 159 deletions
This file was deleted.

Documentation/translations/zh_CN/infiniband/index.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ infiniband
2424

2525
core_locking
2626
ipoib
27-
opa_vnic
2827
sysfs
2928
tag_matching
3029
user_mad

Documentation/translations/zh_CN/infiniband/opa_vnic.rst

Lines changed: 0 additions & 156 deletions
This file was deleted.

MAINTAINERS

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12619,6 +12619,7 @@ F: include/uapi/linux/if_infiniband.h
1261912619
F: include/uapi/rdma/
1262012620
F: samples/bpf/ibumad_kern.c
1262112621
F: samples/bpf/ibumad_user.c
12622+
F: tools/testing/selftests/rdma/
1262212623

1262312624
INGENIC JZ4780 NAND DRIVER
1262412625
M: Harvey Hunt <[email protected]>
@@ -19932,12 +19933,6 @@ L: [email protected]
1993219933
S: Maintained
1993319934
F: drivers/rtc/rtc-optee.c
1993419935

19935-
OPA-VNIC DRIVER
19936-
M: Dennis Dalessandro <[email protected]>
19937-
19938-
S: Supported
19939-
F: drivers/infiniband/ulp/opa_vnic
19940-
1994119936
OPEN ALLIANCE 10BASE-T1S MACPHY SERIAL INTERFACE FRAMEWORK
1994219937
M: Parthiban Veerasooran <[email protected]>
1994319938
@@ -24746,6 +24741,7 @@ L: [email protected]
2474624741
S: Supported
2474724742
F: drivers/infiniband/sw/rxe/
2474824743
F: include/uapi/rdma/rdma_user_rxe.h
24744+
F: tools/testing/selftests/rdma/rxe*
2474924745

2475024746
SOFTLOGIC 6x10 MPEG CODEC
2475124747
M: Bluecherry Maintainers <[email protected]>

drivers/infiniband/Kconfig

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,4 @@ source "drivers/infiniband/ulp/iser/Kconfig"
111111
source "drivers/infiniband/ulp/isert/Kconfig"
112112
source "drivers/infiniband/ulp/rtrs/Kconfig"
113113

114-
source "drivers/infiniband/ulp/opa_vnic/Kconfig"
115-
116114
endif # INFINIBAND

0 commit comments

Comments
 (0)