From patchwork Mon Apr 13 12:34:40 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Wang X-Patchwork-Id: 6208201 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 7A0F59F1AC for ; Mon, 13 Apr 2015 12:34:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 78DDE202F8 for ; Mon, 13 Apr 2015 12:34:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 754BA2026F for ; Mon, 13 Apr 2015 12:34:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932118AbbDMMeq (ORCPT ); Mon, 13 Apr 2015 08:34:46 -0400 Received: from mail-wi0-f175.google.com ([209.85.212.175]:33597 "EHLO mail-wi0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754146AbbDMMen (ORCPT ); Mon, 13 Apr 2015 08:34:43 -0400 Received: by wiax7 with SMTP id x7so63575955wia.0 for ; Mon, 13 Apr 2015 05:34:42 -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=0ZFBp2q3elV7Bj3nm2FtEyvY4cduJ2axvvdZOZVMYJg=; b=YlMas+eOZ7PktLBm7ESfk2p9fHK17Ak0heR26CcJgaGtKkDWe4D2UHDOUzBdPbRg/D /rSa2c6WX9QPK8vmURN2TAXy9jI5FucOiHacKiqzaOX2EmfTN8bxegytECgh7u2U2vmZ joKKz+7V3mgLzwDARhDnhNC0ZrT6utIV6/FB8qDs+L+AJeud8j1uabJ71cWxM24sGUOM /dDvaE56kanKsh1QnduktPyrmnGFSYrN/6wMBcqhv5EKwGEQ5d+hqlC6KWpUIr5rlgS0 HIqyGNLH3sQQis41H6usLf+D0zEbrjeclQ8S+WLHU3LN8qnsT51QoGMYelms9/wYZgmx PVRQ== X-Gm-Message-State: ALoCoQlhT/ccYQZ8muxqX66NcCTyR6iG7s9liaerdXOF1IIpuRMKcjCdtTWqgE5OIYZx+v6+YqcV X-Received: by 10.180.74.144 with SMTP id t16mr20951053wiv.33.1428928482365; Mon, 13 Apr 2015 05:34:42 -0700 (PDT) Received: from [192.168.71.52] ([62.217.45.26]) by mx.google.com with ESMTPSA id 16sm11309616wjs.41.2015.04.13.05.34.40 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 Apr 2015 05:34:41 -0700 (PDT) Message-ID: <552BB7E0.70408@profitbricks.com> Date: Mon, 13 Apr 2015 14:34:40 +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 24/28] IB/Verbs: Use management helper cap_ib_cm_dev() 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=ham 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_ib_cm_dev() to help us check if any port of an IB device has the capability Infiniband Communication Manager. Cc: Steve Wise Cc: Tom Talpey Cc: Jason Gunthorpe Cc: Doug Ledford Cc: Ira Weiny Cc: Sean Hefty Signed-off-by: Michael Wang --- drivers/infiniband/core/cma.c | 5 ++--- drivers/infiniband/core/ucm.c | 3 +-- include/rdma/ib_verbs.h | 20 ++++++++++++++++++++ 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c index 4ed582e..65e41f4 100644 --- a/drivers/infiniband/core/cma.c +++ b/drivers/infiniband/core/cma.c @@ -1639,8 +1639,7 @@ static void cma_listen_on_dev(struct rdma_id_private *id_priv, struct rdma_cm_id *id; int ret; - if (cma_family(id_priv) == AF_IB && - rdma_node_get_transport(cma_dev->device->node_type) != RDMA_TRANSPORT_IB) + if (cma_family(id_priv) == AF_IB && !cap_ib_cm_dev(cma_dev->device)) return; id = rdma_create_id(cma_listen_handler, id_priv, id_priv->id.ps, @@ -2031,7 +2030,7 @@ static int cma_bind_loopback(struct rdma_id_private *id_priv) mutex_lock(&lock); list_for_each_entry(cur_dev, &dev_list, list) { if (cma_family(id_priv) == AF_IB && - rdma_node_get_transport(cur_dev->device->node_type) != RDMA_TRANSPORT_IB) + !cap_ib_cm_dev(cur_dev->device)) continue; if (!cma_dev) diff --git a/drivers/infiniband/core/ucm.c b/drivers/infiniband/core/ucm.c index f2f6393..065405e 100644 --- a/drivers/infiniband/core/ucm.c +++ b/drivers/infiniband/core/ucm.c @@ -1253,8 +1253,7 @@ static void ib_ucm_add_one(struct ib_device *device) dev_t base; struct ib_ucm_device *ucm_dev; - if (!device->alloc_ucontext || - rdma_node_get_transport(device->node_type) != RDMA_TRANSPORT_IB) + if (!device->alloc_ucontext || !cap_ib_cm_dev(device)) return; ucm_dev = kzalloc(sizeof *ucm_dev, GFP_KERNEL); diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h index 60f7efb..29ddd14 100644 --- a/include/rdma/ib_verbs.h +++ b/include/rdma/ib_verbs.h @@ -1893,6 +1893,26 @@ static inline int cap_read_multi_sge(struct ib_device *device, u8 port_num) return !rdma_tech_iwarp(device, port_num); } +/** + * cap_ib_cm_dev - Check if any port of device has the capability Infiniband + * Communication Manager. + * + * @device: Device to be checked + * + * Return 0 when all port of the device don't support Infiniband + * Communication Manager. + */ +static inline int cap_ib_cm_dev(struct ib_device *device) +{ + int i; + + for (i = 1; i <= device->phys_port_cnt; i++) { + if (cap_ib_cm(device, i)) + return 1; + } + return 0; +} + int ib_query_gid(struct ib_device *device, u8 port_num, int index, union ib_gid *gid);