From patchwork Fri Mar 27 15:47:36 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Wang X-Patchwork-Id: 455483 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 8D1D71400A0 for ; Sat, 28 Mar 2015 02:48:06 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932130AbbC0Prq (ORCPT ); Fri, 27 Mar 2015 11:47:46 -0400 Received: from mail-wi0-f179.google.com ([209.85.212.179]:35931 "EHLO mail-wi0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932258AbbC0Prl (ORCPT ); Fri, 27 Mar 2015 11:47:41 -0400 Received: by wibg7 with SMTP id g7so31132571wib.1 for ; Fri, 27 Mar 2015 08:47:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:date:from:user-agent:mime-version:to :cc:subject:references:in-reply-to:content-type :content-transfer-encoding; bh=cKRCxh9u80mMz95uNdctjc9OhwDBNwqK4WZB1ouTfFA=; b=P4VCxTsIY2cpaUydMUY4Kax5+8YwJwPKCnIGGUOsIPLmSnmQBRgpc1zaNrqVuHFfAt CKp6kFEZhXH7hCmaQwa2q2KJUeSLRqcDZ9IQyg1DEZIZgp5FzzK0CZsctanKCg14krE5 J+I4HLRT/+96zjYQ1OJ00ER4nsbKSjrqOp0LoSUYH5aoccMTZAtNXnSdN7NNXAfWlzCN bd6zD8GPDSkwlVAl520BhmQzlfI3wAV1B/y7w3jV1m1llvxk+f0USvBtlO9zBEtfqbod EKKLAX/3H0VcpeyLN6rmTmneyMwna5LzLfs7EzFRcXOgaZj23vYudNfLZMxa39odPu40 Zoyg== X-Gm-Message-State: ALoCoQn/E6o6GD5CRhm2BSvDUvXV0rMDlzdyawQh/Wptp0rjto8SW+x30rZjdNd8jNDnuwOub0hL X-Received: by 10.180.24.233 with SMTP id x9mr12972896wif.9.1427471259676; Fri, 27 Mar 2015 08:47:39 -0700 (PDT) Received: from [192.168.71.52] ([62.217.45.26]) by mx.google.com with ESMTPSA id g5sm3368953wjr.19.2015.03.27.08.47.37 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 27 Mar 2015 08:47:38 -0700 (PDT) Message-ID: <55157B98.1060103@profitbricks.com> Date: Fri, 27 Mar 2015 16:47:36 +0100 From: Michael Wang User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.5.0 MIME-Version: 1.0 To: Roland Dreier , Sean Hefty , Hal Rosenstock , Ira Weiny , linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org, linux-nfs@vger.kernel.org, netdev@vger.kernel.org CC: "J. Bruce Fields" , Trond Myklebust , "David S. Miller" , Or Gerlitz , Moni Shoua , PJ Waskiewicz , Tatyana Nikolova , Yan Burman , Jack Morgenstein , Bart Van Assche , Yann Droneaud , Colin Ian King , Majd Dibbiny , Jiri Kosina , Matan Barak , Alex Estrin , Doug Ledford , Eric Dumazet , Erez Shitrit , Sagi Grimberg , Haggai Eran , Shachar Raindel , Mike Marciniszyn , Steve Wise , Tom Tucker , Chuck Lever , Michael Wang Subject: [RFC PATCH 08/11] IB/Verbs: Use management helper has_iwarp() for, iwarp-check References: <551579CA.4030901@profitbricks.com> In-Reply-To: <551579CA.4030901@profitbricks.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Introduce helper has_iwarp() to help us check if an IB device support IWARP protocol. Cc: Jason Gunthorpe Cc: Doug Ledford Cc: Ira Weiny Cc: Sean Hefty Signed-off-by: Michael Wang --- include/rdma/ib_verbs.h | 13 +++++++++++++ net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h index e796104..0ef9cd7 100644 --- a/include/rdma/ib_verbs.h +++ b/include/rdma/ib_verbs.h @@ -1836,6 +1836,19 @@ static inline int has_mcast(struct ib_device *device) } /** + * has_iwarp - Check if a device support IWARP protocol. + * + * @device: Device to be checked + * + * Return 0 when a device has none port to support + * IWARP protocol. + */ +static inline int has_iwarp(struct ib_device *device) +{ + return rdma_transport_is_iwarp(device); +} + +/** * cap_smi - Check if the port of device has the capability * Subnet Management Interface. * diff --git a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c index a7b5891..48aeb5e 100644 --- a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c +++ b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c @@ -118,7 +118,7 @@ static void rdma_build_arg_xdr(struct svc_rqst *rqstp, static int rdma_read_max_sge(struct svcxprt_rdma *xprt, int sge_count) { - if (rdma_transport_is_iwarp(xprt->sc_cm_id->device)) + if (has_iwarp(xprt->sc_cm_id->device)) return 1; else return min_t(int, sge_count, xprt->sc_max_sge);