From patchwork Mon Apr 13 12:34:14 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Wang X-Patchwork-Id: 6208191 Return-Path: X-Original-To: patchwork-linux-rdma@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 262B49F2EC for ; Mon, 13 Apr 2015 12:34:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 20B94202F8 for ; Mon, 13 Apr 2015 12:34:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2D65D202E9 for ; Mon, 13 Apr 2015 12:34:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932374AbbDMMe2 (ORCPT ); Mon, 13 Apr 2015 08:34:28 -0400 Received: from mail-wi0-f176.google.com ([209.85.212.176]:38451 "EHLO mail-wi0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932404AbbDMMeX (ORCPT ); Mon, 13 Apr 2015 08:34:23 -0400 Received: by wiun10 with SMTP id n10so64643409wiu.1 for ; Mon, 13 Apr 2015 05:34:17 -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=l4rGFkULn7KWYk8dDcTEbPsjxYgZst/7WcA1MH9QMW0=; b=YSF/VBEe+/fRYqZf4/zguqzmUTC8KIezpYoVWrDnphodfXAVkkBJMJiJtR9H3Ahar5 6ltQ4KkxEoWWr+OPv3XGERuexk3M5Fv7ujj92ASMALUlBmdloXQ8F660SgeWDx/1lIrF Ca2xlnbIjlpAoPO6XFdMsU+Rg2DcY553EaJybauxkfwUNDLMbrbLoGJkfoADUCoq6LnQ 5aCfJNsmQTO8Rc0ZFl/2ACdDvIO2hWifZ+MJZamQd1fsLd1drB3Dur/yINOvc41Sj3Ho /+XjlnVEK0kvO2rWvfXR2QD4w0glMqRre3Gw2pf62lpJF32x7iEqlVJwlBdx8KZDw+tl qq0w== X-Gm-Message-State: ALoCoQmSKBw2TCxN72mudxaY9+zVHYW4qans4XH3x0lDbJeNQTGu8/JKQDARn6jYbqkGYKp2qkFD X-Received: by 10.180.160.145 with SMTP id xk17mr21424522wib.85.1428928456975; Mon, 13 Apr 2015 05:34:16 -0700 (PDT) Received: from [192.168.71.52] ([62.217.45.26]) by mx.google.com with ESMTPSA id z12sm11334849wjq.12.2015.04.13.05.34.15 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 Apr 2015 05:34:16 -0700 (PDT) Message-ID: <552BB7C6.8010700@profitbricks.com> Date: Mon, 13 Apr 2015 14:34:14 +0200 From: Michael Wang User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.6.0 MIME-Version: 1.0 To: Roland Dreier , Sean Hefty , Hal Rosenstock , linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org CC: Tom Tucker , Steve Wise , Hoang-Nam Nguyen , Christoph Raisch , Mike Marciniszyn , Eli Cohen , Faisal Latif , Jack Morgenstein , Or Gerlitz , Haggai Eran , Ira Weiny , Tom Talpey , Jason Gunthorpe , Doug Ledford , Michael Wang Subject: [PATCH v3 23/28] IB/Verbs: Use management helper cap_read_multi_sge() References: <552BB470.4090407@profitbricks.com> In-Reply-To: <552BB470.4090407@profitbricks.com> Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Spam-Status: No, score=-5.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY, URIBL_BLACK 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 Introduce helper cap_read_multi_sge() to help us check if the port of an IB device support RDMA Read Multiple Scatter-Gather Entries. Cc: Steve Wise Cc: Tom Talpey Cc: Jason Gunthorpe Cc: Doug Ledford Cc: Ira Weiny Cc: Sean Hefty Signed-off-by: Michael Wang --- include/rdma/ib_verbs.h | 15 +++++++++++++++ net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 3 ++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h index ac62b3a..60f7efb 100644 --- a/include/rdma/ib_verbs.h +++ b/include/rdma/ib_verbs.h @@ -1878,6 +1878,21 @@ static inline int cap_ipoib(struct ib_device *device, u8 port_num) return rdma_tech_ib(device, port_num); } +/** + * cap_read_multi_sge - Check if the port of device has the capability + * RDMA Read Multiple Scatter-Gather Entries. + * + * @device: Device to be checked + * @port_num: Port number of the device + * + * Return 0 when port of the device don't support + * RDMA Read Multiple Scatter-Gather Entries. + */ +static inline int cap_read_multi_sge(struct ib_device *device, u8 port_num) +{ + return !rdma_tech_iwarp(device, port_num); +} + int ib_query_gid(struct ib_device *device, u8 port_num, int index, union ib_gid *gid); diff --git a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c index a5bed5b..7711b7a 100644 --- a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c +++ b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c @@ -117,7 +117,8 @@ 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_tech_iwarp(xprt->sc_cm_id->device, xprt->sc_cm_id->port_num)) + if (!cap_read_multi_sge(xprt->sc_cm_id->device, + xprt->sc_cm_id->port_num)) return 1; else return min_t(int, sge_count, xprt->sc_max_sge);