Commit b1e678bf authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jason Gunthorpe
Browse files

RMDA/sw: Don't allow drivers using dma_virt_ops on highmem configs 

dma_virt_ops requires that all pages have a kernel virtual address.
Introduce a INFINIBAND_VIRT_DMA Kconfig symbol that depends on !HIGHMEM
and make all three drivers depend on the new symbol.

Also remove the ARCH_DMA_ADDR_T_64BIT dependency, which has been obsolete
since commit 4965a687 ("arch: define the ARCH_DMA_ADDR_T_64BIT config
symbol in lib/Kconfig")

Fixes: 551199ac ("lib/dma-virt: Add dma_virt_ops")
Link: https://lore.kernel.org/r/20201106181941.1878556-2-hch@lst.de


Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent d035c3f6

drivers/infiniband/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -73,6 +73,9 @@ config INFINIBAND_ADDR_TRANS_CONFIGFS 
	  This allows the user to config the default GID type that the CM

	  uses for each device, when initiaing new connections.



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"

drivers/infiniband/sw/rdmavt/Kconfig

+2 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

config INFINIBAND_RDMAVT

	tristate "RDMA verbs transport library"

	depends on X86_64 && ARCH_DMA_ADDR_T_64BIT

	depends on INFINIBAND_VIRT_DMA

	depends on X86_64

	depends on PCI

	select DMA_VIRT_OPS

	help

drivers/infiniband/sw/rxe/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
config RDMA_RXE

	tristate "Software RDMA over Ethernet (RoCE) driver"

	depends on INET && PCI && INFINIBAND

	depends on !64BIT || ARCH_DMA_ADDR_T_64BIT

	depends on INFINIBAND_VIRT_DMA

	select NET_UDP_TUNNEL

	select CRYPTO_CRC32

	select DMA_VIRT_OPS

drivers/infiniband/sw/siw/Kconfig

+1 −0
Original line number Diff line number Diff line 
config RDMA_SIW

	tristate "Software RDMA over TCP/IP (iWARP) driver"

	depends on INET && INFINIBAND && LIBCRC32C

	depends on INFINIBAND_VIRT_DMA

	select DMA_VIRT_OPS

	help

	This driver implements the iWARP RDMA transport over

CRA Git | Maintained and supported by SUSTech CRA and CCSE