Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964880AbbDPNTy (ORCPT ); Thu, 16 Apr 2015 09:19:54 -0400 Received: from mail-wg0-f50.google.com ([74.125.82.50]:33806 "EHLO mail-wg0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757327AbbDPNTr (ORCPT ); Thu, 16 Apr 2015 09:19:47 -0400 Message-ID: <552FB6EF.80107@profitbricks.com> Date: Thu, 16 Apr 2015 15:19:43 +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: Hal Rosenstock CC: Roland Dreier , Sean Hefty , Hal Rosenstock , linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org, 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 Subject: Re: [PATCH v4 10/27] IB/Verbs: Reform cm related part in IB-core cma/ucm References: <552F6CF2.4000606@profitbricks.com> <552F6DEA.9080701@profitbricks.com> <552FB4D0.5080302@dev.mellanox.co.il> In-Reply-To: <552FB4D0.5080302@dev.mellanox.co.il> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 9166 Lines: 275 On 04/16/2015 03:10 PM, Hal Rosenstock wrote: > On 4/16/2015 4:08 AM, Michael Wang wrote: >> >> Use raw management helpers to reform cm related part in IB-core cma/ucm. >> >> These checks focus on the device cm type rather than the port capability, >> directly pass port 1 works currently, but can't support mixing cm type >> device in future. > > This is equivalent to today where the checks are per node rather than > per port. > > Should all checks here be port 1 based or only certain ones like listen > ? For example, in connect/reject/disconnect, don't we already have port > ? Guess this can be dealt with later as this is not a regression from > the current implementation. Yeah, these parts of cma may need more carve in future, like some new callback for different CM type as Sean suggested. Maybe directly using 1 could help to highlight the problem ;-) Regards, Michael Wanga > > -- Hal > >> >> 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 | 81 +++++++++++++------------------------------ >> drivers/infiniband/core/ucm.c | 3 +- >> 2 files changed, 26 insertions(+), 58 deletions(-) >> >> diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c >> index d570030..6b8a64d 100644 >> --- a/drivers/infiniband/core/cma.c >> +++ b/drivers/infiniband/core/cma.c >> @@ -735,8 +735,7 @@ int rdma_init_qp_attr(struct rdma_cm_id *id, struct ib_qp_attr *qp_attr, >> int ret = 0; >> >> id_priv = container_of(id, struct rdma_id_private, id); >> - switch (rdma_node_get_transport(id_priv->id.device->node_type)) { >> - case RDMA_TRANSPORT_IB: >> + if (rdma_ib_or_iboe(id_priv->id.device, 1)) { >> if (!id_priv->cm_id.ib || (id_priv->id.qp_type == IB_QPT_UD)) >> ret = cma_ib_init_qp_attr(id_priv, qp_attr, qp_attr_mask); >> else >> @@ -745,19 +744,15 @@ 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; >> - break; >> - case RDMA_TRANSPORT_IWARP: >> + } else if (rdma_tech_iwarp(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; >> } else >> ret = iw_cm_init_qp_attr(id_priv->cm_id.iw, qp_attr, >> qp_attr_mask); >> - break; >> - default: >> + } else >> ret = -ENOSYS; >> - break; >> - } >> >> return ret; >> } >> @@ -1037,17 +1032,12 @@ void rdma_destroy_id(struct rdma_cm_id *id) >> mutex_unlock(&id_priv->handler_mutex); >> >> if (id_priv->cma_dev) { >> - switch (rdma_node_get_transport(id_priv->id.device->node_type)) { >> - case RDMA_TRANSPORT_IB: >> + if (rdma_ib_or_iboe(id_priv->id.device, 1)) { >> if (id_priv->cm_id.ib) >> ib_destroy_cm_id(id_priv->cm_id.ib); >> - break; >> - case RDMA_TRANSPORT_IWARP: >> + } else if (rdma_tech_iwarp(id_priv->id.device, 1)) { >> if (id_priv->cm_id.iw) >> iw_destroy_cm_id(id_priv->cm_id.iw); >> - break; >> - default: >> - break; >> } >> cma_leave_mc_groups(id_priv); >> cma_release_dev(id_priv); >> @@ -1626,7 +1616,7 @@ static void cma_listen_on_dev(struct rdma_id_private *id_priv, >> int ret; >> >> if (cma_family(id_priv) == AF_IB && >> - rdma_node_get_transport(cma_dev->device->node_type) != RDMA_TRANSPORT_IB) >> + !rdma_ib_or_iboe(cma_dev->device, 1)) >> return; >> >> id = rdma_create_id(cma_listen_handler, id_priv, id_priv->id.ps, >> @@ -2028,7 +2018,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) >> + !rdma_ib_or_iboe(cur_dev->device, 1)) >> continue; >> >> if (!cma_dev) >> @@ -2060,7 +2050,7 @@ port_found: >> goto out; >> >> id_priv->id.route.addr.dev_addr.dev_type = >> - (rdma_port_get_link_layer(cma_dev->device, p) == IB_LINK_LAYER_INFINIBAND) ? >> + (rdma_tech_ib(cma_dev->device, p)) ? >> ARPHRD_INFINIBAND : ARPHRD_ETHER; >> >> rdma_addr_set_sgid(&id_priv->id.route.addr.dev_addr, &gid); >> @@ -2537,18 +2527,15 @@ int rdma_listen(struct rdma_cm_id *id, int backlog) >> >> id_priv->backlog = backlog; >> if (id->device) { >> - switch (rdma_node_get_transport(id->device->node_type)) { >> - case RDMA_TRANSPORT_IB: >> + if (rdma_ib_or_iboe(id->device, 1)) { >> ret = cma_ib_listen(id_priv); >> if (ret) >> goto err; >> - break; >> - case RDMA_TRANSPORT_IWARP: >> + } else if (rdma_tech_iwarp(id->device, 1)) { >> ret = cma_iw_listen(id_priv, backlog); >> if (ret) >> goto err; >> - break; >> - default: >> + } else { >> ret = -ENOSYS; >> goto err; >> } >> @@ -2884,20 +2871,15 @@ int rdma_connect(struct rdma_cm_id *id, struct rdma_conn_param *conn_param) >> id_priv->srq = conn_param->srq; >> } >> >> - switch (rdma_node_get_transport(id->device->node_type)) { >> - case RDMA_TRANSPORT_IB: >> + if (rdma_ib_or_iboe(id->device, 1)) { >> if (id->qp_type == IB_QPT_UD) >> ret = cma_resolve_ib_udp(id_priv, conn_param); >> else >> ret = cma_connect_ib(id_priv, conn_param); >> - break; >> - case RDMA_TRANSPORT_IWARP: >> + } else if (rdma_tech_iwarp(id->device, 1)) >> ret = cma_connect_iw(id_priv, conn_param); >> - break; >> - default: >> + else >> ret = -ENOSYS; >> - break; >> - } >> if (ret) >> goto err; >> >> @@ -3000,8 +2982,7 @@ int rdma_accept(struct rdma_cm_id *id, struct rdma_conn_param *conn_param) >> id_priv->srq = conn_param->srq; >> } >> >> - switch (rdma_node_get_transport(id->device->node_type)) { >> - case RDMA_TRANSPORT_IB: >> + if (rdma_ib_or_iboe(id->device, 1)) { >> if (id->qp_type == IB_QPT_UD) { >> if (conn_param) >> ret = cma_send_sidr_rep(id_priv, IB_SIDR_SUCCESS, >> @@ -3017,14 +2998,10 @@ int rdma_accept(struct rdma_cm_id *id, struct rdma_conn_param *conn_param) >> else >> ret = cma_rep_recv(id_priv); >> } >> - break; >> - case RDMA_TRANSPORT_IWARP: >> + } else if (rdma_tech_iwarp(id->device, 1)) >> ret = cma_accept_iw(id_priv, conn_param); >> - break; >> - default: >> + else >> ret = -ENOSYS; >> - break; >> - } >> >> if (ret) >> goto reject; >> @@ -3068,8 +3045,7 @@ int rdma_reject(struct rdma_cm_id *id, const void *private_data, >> if (!id_priv->cm_id.ib) >> return -EINVAL; >> >> - switch (rdma_node_get_transport(id->device->node_type)) { >> - case RDMA_TRANSPORT_IB: >> + if (rdma_ib_or_iboe(id->device, 1)) { >> if (id->qp_type == IB_QPT_UD) >> ret = cma_send_sidr_rep(id_priv, IB_SIDR_REJECT, 0, >> private_data, private_data_len); >> @@ -3077,15 +3053,12 @@ 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); >> - break; >> - case RDMA_TRANSPORT_IWARP: >> + } else if (rdma_tech_iwarp(id->device, 1)) { >> ret = iw_cm_reject(id_priv->cm_id.iw, >> private_data, private_data_len); >> - break; >> - default: >> + } else >> ret = -ENOSYS; >> - break; >> - } >> + >> return ret; >> } >> EXPORT_SYMBOL(rdma_reject); >> @@ -3099,22 +3072,18 @@ int rdma_disconnect(struct rdma_cm_id *id) >> if (!id_priv->cm_id.ib) >> return -EINVAL; >> >> - switch (rdma_node_get_transport(id->device->node_type)) { >> - case RDMA_TRANSPORT_IB: >> + if (rdma_ib_or_iboe(id->device, 1)) { >> ret = cma_modify_qp_err(id_priv); >> if (ret) >> goto out; >> /* 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); >> - break; >> - case RDMA_TRANSPORT_IWARP: >> + } else if (rdma_tech_iwarp(id->device, 1)) { >> ret = iw_cm_disconnect(id_priv->cm_id.iw, 0); >> - break; >> - default: >> + } else >> ret = -EINVAL; >> - break; >> - } >> + >> out: >> return ret; >> } >> diff --git a/drivers/infiniband/core/ucm.c b/drivers/infiniband/core/ucm.c >> index f2f6393..70e0ccb 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 || !rdma_ib_or_iboe(device, 1)) >> return; >> >> ucm_dev = kzalloc(sizeof *ucm_dev, GFP_KERNEL); > -- 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/