From patchwork Fri Mar 27 15:49:05 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Wang X-Patchwork-Id: 6108971 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id CA02BBF90F for ; Fri, 27 Mar 2015 15:49:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C0BA220155 for ; Fri, 27 Mar 2015 15:49:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AF3852041F for ; Fri, 27 Mar 2015 15:49:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030185AbbC0PtN (ORCPT ); Fri, 27 Mar 2015 11:49:13 -0400 Received: from mail-wg0-f45.google.com ([74.125.82.45]:34596 "EHLO mail-wg0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753639AbbC0PtJ (ORCPT ); Fri, 27 Mar 2015 11:49:09 -0400 Received: by wgs2 with SMTP id 2so103934397wgs.1 for ; Fri, 27 Mar 2015 08:49:08 -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=q45pzA9f0sIqC7g7iYwfpXDxf2rkRp9n6GvLx/xU5z8=; b=VkGj9iyJxvcbblwmE6LAES8rc/Sf+i8LTYuDVD3o0SMlP5muMIqXcbeTmAotgvxrdE LJBz8SqnuMSy/wjSS1w7DHnk0gI+UMh3gRiPTBT7aRNcgOupiQdQNNZFbc0I1IIMM4wr WA50Oq207oam5Ra7ugB/V75dJH1EJgZZqUUI+QrKH2MnhsLtjFcDRCoQxLT8R7clijoM 55ck0biAFmN9U2VWRFra4Qb/8qIQoWGVPAB29o/Mb2kxPO6W9I/dkyOdf1T6ys82hiCc Hw+zDOoJP6jwrNHo6D9tTHd/Mjh+/pw0BUJ8+3D/oJqYP0IZOsC1dR5s4I05Ff9k+CmM ISLw== X-Gm-Message-State: ALoCoQnNJuEEExcIXsHT5oNnP1SVKGCuiZhTRvBEk7FWuEAu+dJ403A+hRVjHk2pbtyaLj3C6dcS X-Received: by 10.194.77.99 with SMTP id r3mr39376972wjw.149.1427471348115; Fri, 27 Mar 2015 08:49:08 -0700 (PDT) Received: from [192.168.71.52] ([62.217.45.26]) by mx.google.com with ESMTPSA id ka1sm3398473wjc.2.2015.03.27.08.49.05 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 27 Mar 2015 08:49:07 -0700 (PDT) Message-ID: <55157BF1.8020303@profitbricks.com> Date: Fri, 27 Mar 2015 16:49:05 +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 10/11] IB/Verbs: Use management helper cap_ib() for ib-check References: <551579CA.4030901@profitbricks.com> In-Reply-To: <551579CA.4030901@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 TODO: We need to classify these check into the management helper. 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/hw/mlx4/mad.c | 4 ++-- drivers/infiniband/hw/mlx4/main.c | 5 ++--- include/rdma/ib_verbs.h | 8 ++++++++ 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c index cbbc85b..1f68816 100644 --- a/drivers/infiniband/core/cma.c +++ b/drivers/infiniband/core/cma.c @@ -696,7 +696,7 @@ static int cma_ib_init_qp_attr(struct rdma_id_private *id_priv, int ret; u16 pkey; - if (rdma_port_ll_is_ib(id_priv->id.device, id_priv->id.port_num)) + if (cap_ib(id_priv->id.device, id_priv->id.port_num)) pkey = ib_addr_get_pkey(dev_addr); else pkey = 0xffff; @@ -2053,8 +2053,7 @@ port_found: goto out; id_priv->id.route.addr.dev_addr.dev_type = - (rdma_port_ll_is_ib(cma_dev->device, p)) ? - ARPHRD_INFINIBAND : ARPHRD_ETHER; + (cap_ib(cma_dev->device, p)) ? ARPHRD_INFINIBAND : ARPHRD_ETHER; rdma_addr_set_sgid(&id_priv->id.route.addr.dev_addr, &gid); ib_addr_set_pkey(&id_priv->id.route.addr.dev_addr, pkey); diff --git a/drivers/infiniband/hw/mlx4/mad.c b/drivers/infiniband/hw/mlx4/mad.c index 09874d0..2a867fd 100644 --- a/drivers/infiniband/hw/mlx4/mad.c +++ b/drivers/infiniband/hw/mlx4/mad.c @@ -1247,7 +1247,7 @@ out: static int get_slave_base_gid_ix(struct mlx4_ib_dev *dev, int slave, int port) { - if (rdma_port_ll_is_ib(&dev->ib_dev, port)) + if (cap_ib(&dev->ib_dev, port)) return slave; return mlx4_get_base_gid_ix(dev->dev, slave, port); } @@ -1255,7 +1255,7 @@ static int get_slave_base_gid_ix(struct mlx4_ib_dev *dev, int slave, int port) static void fill_in_real_sgid_index(struct mlx4_ib_dev *dev, int slave, int port, struct ib_ah_attr *ah_attr) { - if (rdma_port_ll_is_ib(&dev->ib_dev, port)) + if (cap_ib(&dev->ib_dev, port)) ah_attr->grh.sgid_index = slave; else ah_attr->grh.sgid_index += get_slave_base_gid_ix(dev, slave, port); diff --git a/drivers/infiniband/hw/mlx4/main.c b/drivers/infiniband/hw/mlx4/main.c index f445f4c..1acc1c1 100644 --- a/drivers/infiniband/hw/mlx4/main.c +++ b/drivers/infiniband/hw/mlx4/main.c @@ -482,7 +482,7 @@ static int iboe_query_gid(struct ib_device *ibdev, u8 port, int index, static int mlx4_ib_query_gid(struct ib_device *ibdev, u8 port, int index, union ib_gid *gid) { - if (rdma_port_ll_is_ib(ibdev, port)) + if (cap_ib(ibdev, port)) return __mlx4_ib_query_gid(ibdev, port, index, gid, 0); else return iboe_query_gid(ibdev, port, index, gid); @@ -2552,8 +2552,7 @@ static void mlx4_ib_event(struct mlx4_dev *dev, void *ibdev_ptr, case MLX4_DEV_EVENT_PORT_UP: if (p > ibdev->num_ports) return; - if (mlx4_is_master(dev) && - rdma_port_ll_is_ib(&ibdev->ib_dev, p)) { + if (mlx4_is_master(dev) && cap_ib(&ibdev->ib_dev, p)) { mlx4_ib_invalidate_all_guid_record(ibdev, p); } ibev.event = IB_EVENT_PORT_ACTIVE; diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h index eead588..deeaa52 100644 --- a/include/rdma/ib_verbs.h +++ b/include/rdma/ib_verbs.h @@ -1921,6 +1921,14 @@ static inline int cap_ipoib(struct ib_device *device, u8 port_num) return rdma_port_ll_is_ib(device, port_num); } +/** + * TO BE CLASSIFIED + */ +static inline int cap_ib(struct ib_device *device, u8 port_num) +{ + return rdma_port_ll_is_ib(device, port_num); +} + int ib_query_gid(struct ib_device *device, u8 port_num, int index, union ib_gid *gid);