Commit 20cf09ef authored Mar 30, 2015 by Chuck Lever Committed by Sasha Levin Jun 28, 2015

xprtrdma: Prevent infinite loop in rpcrdma_ep_create()



[ Upstream commit 41f97028969e4c88efa5fcf58bc6125210413a6d ]

If a provider advertizes a zero max_fast_reg_page_list_len, FRWR
depth detection loops forever. Instead of just failing the mount,
try other memory registration modes.

Fixes: 0fc6c4e7 ("xprtrdma: mind the device's max fast . . .")
Reported-by: Devesh Sharma <Devesh.Sharma@Emulex.Com>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Tested-by: Devesh Sharma <Devesh.Sharma@Emulex.Com>
Tested-by: Meghana Cheripady <Meghana.Cheripady@Emulex.Com>
Tested-by: Veeresh U. Kokatnur <veereshuk@chelsio.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>

parent 1b681a5e

net/sunrpc/xprtrdma/verbs.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -542,9 +542,10 @@ rpcrdma_ia_open(struct rpcrdma_xprt xprt, struct sockaddr addr, int memreg)

		if (memreg == RPCRDMA_FRMR) {
		/* Requires both frmr reg and local dma lkey */
		if ((devattr->device_cap_flags &
		if (((devattr->device_cap_flags &
		(IB_DEVICE_MEM_MGT_EXTENSIONS\|IB_DEVICE_LOCAL_DMA_LKEY)) !=
		(IB_DEVICE_MEM_MGT_EXTENSIONS\|IB_DEVICE_LOCAL_DMA_LKEY)) {
		(IB_DEVICE_MEM_MGT_EXTENSIONS\|IB_DEVICE_LOCAL_DMA_LKEY)) \|\|
		(devattr->max_fast_reg_page_list_len == 0)) {
		dprintk("RPC: %s: FRMR registration "
		"not supported by HCA\n", __func__);
		memreg = RPCRDMA_MTHCAFMR;