From patchwork Tue Mar 24 20:31:15 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 6085571 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id BAC6E9F318 for ; Tue, 24 Mar 2015 20:31:22 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EB50820251 for ; Tue, 24 Mar 2015 20:31:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 099AB20260 for ; Tue, 24 Mar 2015 20:31:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752076AbbCXUbS (ORCPT ); Tue, 24 Mar 2015 16:31:18 -0400 Received: from mail-ig0-f172.google.com ([209.85.213.172]:36964 "EHLO mail-ig0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752065AbbCXUbS (ORCPT ); Tue, 24 Mar 2015 16:31:18 -0400 Received: by igcxg11 with SMTP id xg11so8468079igc.0; Tue, 24 Mar 2015 13:31:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:from:to:date:message-id:in-reply-to:references :user-agent:mime-version:content-type:content-transfer-encoding; bh=O8MzAqoN6zbAB0ENiv9mMD//FQUgMGbvlIzsyey4lXQ=; b=twUi3KOmBXiLGdj3HkrEQwaPmEiqCUfZDW950iaia7BYVv5X4v+3LVD7qKGmrrr7Kd 81+TcjhDF+7Plf5P2C0Lft31i0H3lW6hlJvtzLMxkDxkMxzndartnuSYFnmI8COli3Ed u+XSpgYmsI0JhomKnZe2RKOVFTNUcwb8oHrL2m9dDEs9FFvlq+PEjFuuJsYtGhFshG/V h/arBMzlxcbpWAUzTbczeP3YK+hoFsGqAm4AoO1ItDAFXcUElg8qElsyE9761DaSs/a5 IpT3Qf8BINdy9fhqjnfVHhFEykUN/7qScCeNMxZ6B6a4QuHY8VJPZEv/BmvCdWNj22Q2 kXfA== X-Received: by 10.50.18.49 with SMTP id t17mr24886123igd.3.1427229077681; Tue, 24 Mar 2015 13:31:17 -0700 (PDT) Received: from manet.1015granger.net ([2604:8800:100:81fc:82ee:73ff:fe43:d64f]) by mx.google.com with ESMTPSA id b17sm251542iob.31.2015.03.24.13.31.16 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Mar 2015 13:31:16 -0700 (PDT) Subject: [PATCH v2 05/15] xprtrdma: Prevent infinite loop in rpcrdma_ep_create() From: Chuck Lever To: linux-rdma@vger.kernel.org, linux-nfs@vger.kernel.org Date: Tue, 24 Mar 2015 16:31:15 -0400 Message-ID: <20150324203115.2311.38830.stgit@manet.1015granger.net> In-Reply-To: <20150324201849.2311.53599.stgit@manet.1015granger.net> References: <20150324201849.2311.53599.stgit@manet.1015granger.net> User-Agent: StGit/0.17.1-3-g7d0f MIME-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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: 0fc6c4e7bb28 ("xprtrdma: mind the device's max fast . . .") Reported-by: Devesh Sharma Signed-off-by: Chuck Lever --- net/sunrpc/xprtrdma/verbs.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c index 60f3317..99752b5 100644 --- a/net/sunrpc/xprtrdma/verbs.c +++ b/net/sunrpc/xprtrdma/verbs.c @@ -618,9 +618,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;