Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965588AbbDVAKb (ORCPT ); Tue, 21 Apr 2015 20:10:31 -0400 Received: from mga14.intel.com ([192.55.52.115]:8368 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965265AbbDVAKZ (ORCPT ); Tue, 21 Apr 2015 20:10:25 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.11,619,1422950400"; d="scan'208";a="683665665" Date: Tue, 21 Apr 2015 20:10:19 -0400 From: "ira.weiny" To: Michael Wang Cc: Roland Dreier , Sean Hefty , linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org, hal@dev.mellanox.co.il, Tom Tucker , Steve Wise , Hoang-Nam Nguyen , Christoph Raisch , Mike Marciniszyn , Eli Cohen , Faisal Latif , Jack Morgenstein , Or Gerlitz , Haggai Eran , Tom Talpey , Jason Gunthorpe , Doug Ledford Subject: Re: [PATCH v5 19/27] IB/Verbs: Use management helper cap_iw_cm() Message-ID: <20150422001018.GS15893@phlsvsds.ph.intel.com> References: <5534B8C9.506@profitbricks.com> <5534BB7B.4020601@profitbricks.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <5534BB7B.4020601@profitbricks.com> User-Agent: Mutt/1.4.2.2i Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4741 Lines: 121 On Mon, Apr 20, 2015 at 10:40:27AM +0200, Michael Wang wrote: > > Introduce helper cap_iw_cm() to help us check if the port of an > IB device support IWARP Communication Manager. > > Cc: Hal Rosenstock > Cc: Steve Wise > Cc: Tom Talpey > Cc: Jason Gunthorpe > Cc: Doug Ledford > Cc: Ira Weiny > Cc: Sean Hefty > Signed-off-by: Michael Wang Reviewed-by: Ira Weiny > --- > 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 ff59dbc..dd37b4a 100644 > --- a/drivers/infiniband/core/cma.c > +++ b/drivers/infiniband/core/cma.c > @@ -775,7 +775,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->device, id->port_num)) { > + } else if (cap_iw_cm(id->device, id->port_num)) { > if (!id_priv->cm_id.iw) { > qp_attr->qp_access_flags = 0; > *qp_attr_mask = IB_QP_STATE | IB_QP_ACCESS_FLAGS; > @@ -1057,7 +1057,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); > } > @@ -2541,7 +2541,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; > @@ -2886,7 +2886,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, id->port_num)) > + } else if (cap_iw_cm(id->device, id->port_num)) > ret = cma_connect_iw(id_priv, conn_param); > else > ret = -ENOSYS; > @@ -3008,7 +3008,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, id->port_num)) > + } else if (cap_iw_cm(id->device, id->port_num)) > ret = cma_accept_iw(id_priv, conn_param); > else > ret = -ENOSYS; > @@ -3063,7 +3063,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, id->port_num)) { > + } else if (cap_iw_cm(id->device, id->port_num)) { > ret = iw_cm_reject(id_priv->cm_id.iw, > private_data, private_data_len); > } else > @@ -3089,7 +3089,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, id->port_num)) { > + } else if (cap_iw_cm(id->device, id->port_num)) { > 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); > > -- > 2.1.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/