From patchwork Thu Apr 16 08:12:26 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Wang X-Patchwork-Id: 6224651 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 47EC99F1AC for ; Thu, 16 Apr 2015 08:13:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 596CC201C0 for ; Thu, 16 Apr 2015 08:13:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4F3AA20108 for ; Thu, 16 Apr 2015 08:13:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932359AbbDPIND (ORCPT ); Thu, 16 Apr 2015 04:13:03 -0400 Received: from mail-wi0-f172.google.com ([209.85.212.172]:32836 "EHLO mail-wi0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933818AbbDPIMa (ORCPT ); Thu, 16 Apr 2015 04:12:30 -0400 Received: by wiax7 with SMTP id x7so5753714wia.0 for ; Thu, 16 Apr 2015 01:12:28 -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=NpNILdqs1ixLi5iku/d4NrwN4H5y4DLB48XLsvANo9U=; b=XohAkOKhrMwM5rXUauh4SlpJkAG54+RHi1yXv3ztEy2nBiq8UyHbyL42TpOFWFyucs iJcBVEf0kZpbFmu5QWzVwdgUfQVUknua7eZOhPGWI5bG/f3ZTwhLrNKRXjWZuTQud1pL 3IlvtWlm0UiYgWC78hle0ag//JEklAQB3rbw89KpilGLh8uc80Kt928kAHNteCbCK5z4 8Fc3gWg5OwJbZ86PMfi1uNjLB1VL+uJfLiwa2pTwEuMOi+ap3nOQXmj2Xsq0lPQ/vvYG ddmEuG4YMLuOwwS0G6X3ZJtUS6nzDZI4vVRlgzA1cJ8jsyKmYjgeQjTMDYNMYDkBQlHN mcfQ== X-Gm-Message-State: ALoCoQnXmfo5eaWwDc2ynjcYLJzPW0pP8GI9fC3a8HyHlQIh5ZJLn/dXHumzbRwCIqdSnTWEFs3+ X-Received: by 10.180.91.76 with SMTP id cc12mr2887078wib.67.1429171948928; Thu, 16 Apr 2015 01:12:28 -0700 (PDT) Received: from [192.168.71.52] ([62.217.45.26]) by mx.google.com with ESMTPSA id di9sm24910364wib.16.2015.04.16.01.12.27 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 Apr 2015 01:12:28 -0700 (PDT) Message-ID: <552F6EEA.4090100@profitbricks.com> Date: Thu, 16 Apr 2015 10:12:26 +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 , hal@dev.mellanox.co.il, Michael Wang Subject: [PATCH v4 19/27] IB/Verbs: Use management helper cap_iw_cm() References: <552F6CF2.4000606@profitbricks.com> In-Reply-To: <552F6CF2.4000606@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=-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 Introduce helper cap_iw_cm() to help us check if the port of an IB device support IWARP 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 | 14 +++++++------- include/rdma/ib_verbs.h | 15 +++++++++++++++ 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c index 7415078..a6f1526 100644 --- a/drivers/infiniband/core/cma.c +++ b/drivers/infiniband/core/cma.c @@ -776,7 +776,7 @@ int rdma_init_qp_attr(struct rdma_cm_id *id, struct ib_qp_attr *qp_attr, if (qp_attr->qp_state == IB_QPS_RTR) qp_attr->rq_psn = id_priv->seq_num; - } else if (rdma_tech_iwarp(id_priv->id.device, 1)) { + } else if (cap_iw_cm(id_priv->id.device, 1)) { if (!id_priv->cm_id.iw) { qp_attr->qp_access_flags = 0; *qp_attr_mask = IB_QP_STATE | IB_QP_ACCESS_FLAGS; @@ -1058,7 +1058,7 @@ void rdma_destroy_id(struct rdma_cm_id *id) if (cap_ib_cm(id_priv->id.device, 1)) { if (id_priv->cm_id.ib) ib_destroy_cm_id(id_priv->cm_id.ib); - } else if (rdma_tech_iwarp(id_priv->id.device, 1)) { + } else if (cap_iw_cm(id_priv->id.device, 1)) { if (id_priv->cm_id.iw) iw_destroy_cm_id(id_priv->cm_id.iw); } @@ -2542,7 +2542,7 @@ int rdma_listen(struct rdma_cm_id *id, int backlog) ret = cma_ib_listen(id_priv); if (ret) goto err; - } else if (rdma_tech_iwarp(id->device, 1)) { + } else if (cap_iw_cm(id->device, 1)) { ret = cma_iw_listen(id_priv, backlog); if (ret) goto err; @@ -2887,7 +2887,7 @@ int rdma_connect(struct rdma_cm_id *id, struct rdma_conn_param *conn_param) ret = cma_resolve_ib_udp(id_priv, conn_param); else ret = cma_connect_ib(id_priv, conn_param); - } else if (rdma_tech_iwarp(id->device, 1)) + } else if (cap_iw_cm(id->device, 1)) ret = cma_connect_iw(id_priv, conn_param); else ret = -ENOSYS; @@ -3009,7 +3009,7 @@ int rdma_accept(struct rdma_cm_id *id, struct rdma_conn_param *conn_param) else ret = cma_rep_recv(id_priv); } - } else if (rdma_tech_iwarp(id->device, 1)) + } else if (cap_iw_cm(id->device, 1)) ret = cma_accept_iw(id_priv, conn_param); else ret = -ENOSYS; @@ -3064,7 +3064,7 @@ int rdma_reject(struct rdma_cm_id *id, const void *private_data, ret = ib_send_cm_rej(id_priv->cm_id.ib, IB_CM_REJ_CONSUMER_DEFINED, NULL, 0, private_data, private_data_len); - } else if (rdma_tech_iwarp(id->device, 1)) { + } else if (cap_iw_cm(id->device, 1)) { ret = iw_cm_reject(id_priv->cm_id.iw, private_data, private_data_len); } else @@ -3090,7 +3090,7 @@ int rdma_disconnect(struct rdma_cm_id *id) /* Initiate or respond to a disconnect. */ if (ib_send_cm_dreq(id_priv->cm_id.ib, NULL, 0)) ib_send_cm_drep(id_priv->cm_id.ib, NULL, 0); - } else if (rdma_tech_iwarp(id->device, 1)) { + } else if (cap_iw_cm(id->device, 1)) { ret = iw_cm_disconnect(id_priv->cm_id.iw, 0); } else ret = -EINVAL; diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h index 6805e3e..e4999f6 100644 --- a/include/rdma/ib_verbs.h +++ b/include/rdma/ib_verbs.h @@ -1818,6 +1818,21 @@ static inline int cap_ib_cm(struct ib_device *device, u8 port_num) return rdma_ib_or_iboe(device, port_num); } +/** + * cap_iw_cm - Check if the port of device has the capability IWARP + * Communication Manager. + * + * @device: Device to be checked + * @port_num: Port number of the device + * + * Return 0 when port of the device don't support IWARP + * Communication Manager. + */ +static inline int cap_iw_cm(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);