Commit 3e93c0b8 authored by Jason Gunthorpe's avatar Jason Gunthorpe
Browse files

Merge branch 'erdma' into rdma.git for-next 



Cheng Xu says

====================
This v14 patch set introduces the Elastic RDMA Adapter (ERDMA) driver,
which released in Apsara Conference 2021 by Alibaba. The PR of ERDMA
userspace provider has already been created [1].

ERDMA enables large-scale RDMA acceleration capability in Alibaba ECS
environment, initially offered in g7re instance. It can improve the
efficiency of large-scale distributed computing and communication
significantly and expand dynamically with the cluster scale of Alibaba
Cloud.

ERDMA is a RDMA networking adapter based on the Alibaba MOC hardware. It
works in the VPC network environment (overlay network), and uses iWarp
transport protocol. ERDMA supports reliable connection (RC). ERDMA also
supports both kernel space and user space verbs. Now we have already
supported HPC/AI applications with libfabric, NoF and some other internal
verbs libraries, such as xrdma, epsl, etc,.

For the ECS instance with RDMA enabled, our MOC hardware generates two
kinds of PCI devices: one for ERDMA, and one for the original net device
(virtio-net). They are separated PCI devices.
====================

* branch 'erdma':
  RDMA/erdma: Add driver to kernel build environment
  RDMA/erdma: Add the ABI definitions
  RDMA/erdma: Add the erdma module
  RDMA/erdma: Add connection management (CM) support
  RDMA/erdma: Add verbs implementation
  RDMA/erdma: Add verbs header file
  RDMA/erdma: Add event queue implementation
  RDMA/erdma: Add cmdq implementation
  RDMA/erdma: Add main include file
  RDMA/erdma: Add the hardware related definitions
  RDMA: Add ERDMA to rdma_driver_id definition

Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parents 01137808 ca7fd6cf

MAINTAINERS

+8 −0
Original line number Diff line number Diff line
@@ -733,6 +733,14 @@ S: Maintained 
F:	Documentation/i2c/busses/i2c-ali1563.rst

F:	drivers/i2c/busses/i2c-ali1563.c









ALIBABA ELASTIC RDMA DRIVER









M:	Cheng Xu <chengyou@linux.alibaba.com>









M:	Kai Shen <kaishen@linux.alibaba.com>









L:	linux-rdma@vger.kernel.org









S:	Supported









F:	drivers/infiniband/hw/erdma









F:	include/uapi/rdma/erdma-abi.h

















ALIENWARE WMI DRIVER









L:	Dell.Client.Kernel@dell.com









S:	Maintained
































drivers/infiniband/Kconfig



+8
−7






























Original line number
Diff line number
Diff line







@@ -78,20 +78,21 @@ config INFINIBAND_VIRT_DMA







	def_bool !HIGHMEM



















if INFINIBAND_USER_ACCESS || !INFINIBAND_USER_ACCESS









source "drivers/infiniband/hw/mthca/Kconfig"









source "drivers/infiniband/hw/qib/Kconfig"









source "drivers/infiniband/hw/bnxt_re/Kconfig"









source "drivers/infiniband/hw/cxgb4/Kconfig"









source "drivers/infiniband/hw/efa/Kconfig"









source "drivers/infiniband/hw/erdma/Kconfig"









source "drivers/infiniband/hw/hfi1/Kconfig"









source "drivers/infiniband/hw/hns/Kconfig"









source "drivers/infiniband/hw/irdma/Kconfig"









source "drivers/infiniband/hw/mlx4/Kconfig"









source "drivers/infiniband/hw/mlx5/Kconfig"









source "drivers/infiniband/hw/mthca/Kconfig"









source "drivers/infiniband/hw/ocrdma/Kconfig"









source "drivers/infiniband/hw/vmw_pvrdma/Kconfig"









source "drivers/infiniband/hw/usnic/Kconfig"









source "drivers/infiniband/hw/hns/Kconfig"









source "drivers/infiniband/hw/bnxt_re/Kconfig"









source "drivers/infiniband/hw/hfi1/Kconfig"









source "drivers/infiniband/hw/qedr/Kconfig"









source "drivers/infiniband/hw/qib/Kconfig"









source "drivers/infiniband/hw/usnic/Kconfig"









source "drivers/infiniband/hw/vmw_pvrdma/Kconfig"









source "drivers/infiniband/sw/rdmavt/Kconfig"









source "drivers/infiniband/sw/rxe/Kconfig"









source "drivers/infiniband/sw/siw/Kconfig"
































drivers/infiniband/hw/Makefile



+1
−0






























Original line number
Diff line number
Diff line







@@ -13,3 +13,4 @@ obj-$(CONFIG_INFINIBAND_HFI1)		+= hfi1/







obj-$(CONFIG_INFINIBAND_HNS)		+= hns/









obj-$(CONFIG_INFINIBAND_QEDR)		+= qedr/









obj-$(CONFIG_INFINIBAND_BNXT_RE)	+= bnxt_re/









obj-$(CONFIG_INFINIBAND_ERDMA)		+= erdma/
























drivers/infiniband/hw/erdma/Kconfig
0 → 100644



+12
−0






























Original line number
Diff line number
Diff line









# SPDX-License-Identifier: GPL-2.0-only









config INFINIBAND_ERDMA









	tristate "Alibaba Elastic RDMA Adapter (ERDMA) support"









	depends on PCI_MSI && 64BIT









	depends on INFINIBAND_ADDR_TRANS









	depends on INFINIBAND_USER_ACCESS









	help









	  This is a RDMA/iWarp driver for Alibaba Elastic RDMA Adapter(ERDMA),









	  which supports RDMA features in Alibaba cloud environment.



















	  To compile this driver as module, choose M here. The module will be









	  called erdma.
























drivers/infiniband/hw/erdma/Makefile
0 → 100644



+4
−0






























Original line number
Diff line number
Diff line









# SPDX-License-Identifier: GPL-2.0









obj-$(CONFIG_INFINIBAND_ERDMA) := erdma.o



















erdma-y := erdma_cm.o erdma_main.o erdma_cmdq.o erdma_cq.o erdma_verbs.o erdma_qp.o erdma_eq.o