From patchwork Wed Mar 25 15:14:29 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Wang X-Patchwork-Id: 6093211 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 A04FC9F318 for ; Wed, 25 Mar 2015 15:15:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CA66D2035B for ; Wed, 25 Mar 2015 15:14:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D6DA520374 for ; Wed, 25 Mar 2015 15:14:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964812AbbCYPOi (ORCPT ); Wed, 25 Mar 2015 11:14:38 -0400 Received: from mail-wi0-f179.google.com ([209.85.212.179]:37576 "EHLO mail-wi0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964809AbbCYPOe (ORCPT ); Wed, 25 Mar 2015 11:14:34 -0400 Received: by wixw10 with SMTP id w10so43237469wix.0 for ; Wed, 25 Mar 2015 08:14:32 -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=nhtpwtSkHm2tCe/7FkiKNeeEnJgT2LLyrNpYhtYzAx4=; b=V1bYFqJIPbshjDbHKEDw/PZ0SqVhf3uGcD2XYMJH4t7WgikUKCjIWLcRysCRTx/XaW 38/IxM/hgUVstG+S3N4HW5n3nTh6neMyVgvKsJ6sSJt8xsPCYSuS7C9JIo5PBB+/+5/m dKkYXgXCwwSlospM/TIfzPt9Vd66+nBfDka2/6wbm1f2BX5RkU4aa7CydSl3/wxG6LB9 /DhdjRbo2+VlFXecuQXczLEK3AZkKmGkm8aefS0vrlMUoo9mlBakL1bNIZl+eEJly0As FtDQOxv7dJNsucmsD4MLTsO8oq52nP/ciZ4Kc4yI/hALND1TU4xv9LXEIlMGC/mAgzn/ d6lg== X-Gm-Message-State: ALoCoQkTFOOaGdjc3ad5pYJdbxnvZqCBEn4Y208f5Ltnw1oej3Vswzes7GNsX61yI/TPIdnnSTOd X-Received: by 10.180.7.134 with SMTP id j6mr39469862wia.11.1427296472375; Wed, 25 Mar 2015 08:14:32 -0700 (PDT) Received: from [192.168.71.52] ([62.217.45.26]) by mx.google.com with ESMTPSA id ey10sm16276698wib.2.2015.03.25.08.14.30 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Mar 2015 08:14:31 -0700 (PDT) Message-ID: <5512D0D5.6010807@profitbricks.com> Date: Wed, 25 Mar 2015 16:14:29 +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: linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org, linux-nfs@vger.kernel.org, netdev@vger.kernel.org, Roland Dreier , Sean Hefty , Hal Rosenstock , Ira Weiny CC: Trond Myklebust , "J. Bruce Fields" , "David S. Miller" , Moni Shoua , Or Gerlitz , Tatyana Nikolova , Steve Wise , Yan Burman , Jack Morgenstein , Bart Van Assche , Yann Droneaud , Colin Ian King , Jiri Kosina , Matan Barak , Majd Dibbiny , Dan Carpenter , Mel Gorman , Alex Estrin , Doug Ledford , Eric Dumazet , Erez Shitrit , Sagi Grimberg , Haggai Eran , Shachar Raindel , Mike Marciniszyn , Tom Tucker , Chuck Lever , Michael Wang Subject: [PATCH 2/2 RESEND] IB/Verbs: Use helpers to check IBoE technology References: <5512CFB0.1050108@profitbricks.com> In-Reply-To: <5512CFB0.1050108@profitbricks.com> 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.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 This patch will introduce rdma_tech_is_iboe() and use it to save some code. Cc: Ira Weiny Cc: Sean Hefty Signed-off-by: Michael Wang --- drivers/infiniband/core/cma.c | 6 ++---- include/rdma/ib_verbs.h | 6 ++++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c index 668e955..d354857 100644 --- a/drivers/infiniband/core/cma.c +++ b/drivers/infiniband/core/cma.c @@ -375,8 +375,7 @@ static int cma_acquire_dev(struct rdma_id_private *id_priv, listen_id_priv->id.port_num) == dev_ll) { cma_dev = listen_id_priv->cma_dev; port = listen_id_priv->id.port_num; - if (rdma_transport_is_ib(cma_dev->device) && - rdma_port_ll_is_eth(cma_dev->device, port)) + if (rdma_tech_is_iboe(cma_dev->device, port)) ret = ib_find_cached_gid(cma_dev->device, &iboe_gid, &found_port, NULL); else @@ -395,8 +394,7 @@ static int cma_acquire_dev(struct rdma_id_private *id_priv, listen_id_priv->id.port_num == port) continue; if (rdma_port_get_link_layer(cma_dev->device, port) == dev_ll) { - if (rdma_transport_is_ib(cma_dev->device) && - rdma_port_ll_is_eth(cma_dev->device, port)) + if (rdma_tech_is_iboe(cma_dev->device, port)) ret = ib_find_cached_gid(cma_dev->device, &iboe_gid, &found_port, NULL); else ret = ib_find_cached_gid(cma_dev->device, &gid, &found_port, NULL); diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h index 2bf9094..9a811f8 100644 --- a/include/rdma/ib_verbs.h +++ b/include/rdma/ib_verbs.h @@ -1767,6 +1767,12 @@ static inline int rdma_port_ll_is_eth(struct ib_device *device, u8 port_num) == IB_LINK_LAYER_ETHERNET; } +static inline int rdma_tech_is_iboe(struct ib_device *device, u8 port_num) +{ + return rdma_transport_is_ib(device) && + rdma_port_ll_is_eth(device, port_num); +} + int ib_query_gid(struct ib_device *device, u8 port_num, int index, union ib_gid *gid);