From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4DA3CC54FD0 for ; Thu, 23 Apr 2020 19:04:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 259B020776 for ; Thu, 23 Apr 2020 19:04:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587668663; bh=x0yTO0jVXVrBKF90ca6IoguQ+yFD7lI2U4flACm3+qA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=mG4iCnLZSEbcE8Z7Cowq+9ez2Wy1Q1GlR2Gh3Dqqo5OEyUVUoKUIS2iseYT+zU81C zMHGjh74bs0s7IKG/gijL2QSU+RK2tNn2+yaWsxkBRUzwyZEs0yn8LgAt0l54Z9VjZ wG2D6Bw14EPzvv6aC/JQi8KW0RTBHTBhCNjKqfLQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728238AbgDWTEW (ORCPT ); Thu, 23 Apr 2020 15:04:22 -0400 Received: from mail.kernel.org ([198.145.29.99]:42416 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728200AbgDWTEW (ORCPT ); Thu, 23 Apr 2020 15:04:22 -0400 Received: from localhost (unknown [213.57.247.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0189E20767; Thu, 23 Apr 2020 19:04:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587668661; bh=x0yTO0jVXVrBKF90ca6IoguQ+yFD7lI2U4flACm3+qA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XSQ/qWKZwfS6E+p5W3OWINcF6XTHS8TJi8gjnte7Nyu5Ugm1z1AUObvzQUOgCSNsQ kCdldKM+KCoRbRRwXxrEwT3UDreHTFcwaBqMIEIk96iJI0PGUuGZsHTBwncdTU6iKo F7ZpUp42lIw0sL/qo6CzeSx18BckIOHIdNNqX66Q= From: Leon Romanovsky To: Doug Ledford , Jason Gunthorpe Cc: Leon Romanovsky , linux-rdma@vger.kernel.org, Maor Gottlieb Subject: [PATCH rdma-next 17/18] RDMA/mlx5: Consolidate into special function all create QP calls Date: Thu, 23 Apr 2020 22:03:02 +0300 Message-Id: <20200423190303.12856-18-leon@kernel.org> X-Mailer: git-send-email 2.25.3 In-Reply-To: <20200423190303.12856-1-leon@kernel.org> References: <20200423190303.12856-1-leon@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org From: Leon Romanovsky Finish separation to blocks of mlx5_ib_create_qp() functions, so all internal create QP implementation are located in one place. Reviewed-by: Maor Gottlieb Signed-off-by: Leon Romanovsky --- drivers/infiniband/hw/mlx5/qp.c | 85 +++++++++++++++++++-------------- 1 file changed, 49 insertions(+), 36 deletions(-) diff --git a/drivers/infiniband/hw/mlx5/qp.c b/drivers/infiniband/hw/mlx5/qp.c index 0612663868dd..9ee12622ac3c 100644 --- a/drivers/infiniband/hw/mlx5/qp.c +++ b/drivers/infiniband/hw/mlx5/qp.c @@ -1953,6 +1953,7 @@ static int create_xrc_tgt_qp(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp, list_add_tail(&qp->qps_list, &dev->qp_list); spin_unlock_irqrestore(&dev->reset_flow_resource_lock, flags); + qp->trans_qp.xrcdn = to_mxrcd(attr->xrcd)->xrcdn; return 0; } @@ -2785,14 +2786,54 @@ static int process_udata_size(struct mlx5_ib_dev *dev, return (params->inlen) ? 0 : -EINVAL; } -static int create_raw_qp(struct mlx5_ib_dev *dev, struct ib_pd *pd, - struct mlx5_ib_qp *qp, - struct mlx5_create_qp_params *params) +static int create_qp(struct mlx5_ib_dev *dev, struct ib_pd *pd, + struct mlx5_ib_qp *qp, + struct mlx5_create_qp_params *params) { - if (params->is_rss_raw) - return create_rss_raw_qp_tir(dev, pd, qp, params); + int err; + + if (params->is_rss_raw) { + err = create_rss_raw_qp_tir(dev, pd, qp, params); + goto out; + } + + if (qp->type == MLX5_IB_QPT_DCT) { + err = create_dct(pd, qp, params); + goto out; + } + + if (qp->type == IB_QPT_XRC_TGT) { + err = create_xrc_tgt_qp(dev, qp, params); + goto out; + } + + if (params->udata) + err = create_user_qp(dev, pd, qp, params); + else + err = create_kernel_qp(dev, pd, qp, params); + +out: + if (err) { + mlx5_ib_err(dev, "Create QP type %d failed\n", qp->type); + return err; + } + + if (is_qp0(qp->type)) + qp->ibqp.qp_num = 0; + else if (is_qp1(qp->type)) + qp->ibqp.qp_num = 1; + else + qp->ibqp.qp_num = qp->trans_qp.base.mqp.qpn; + + mlx5_ib_dbg(dev, + "QP type %d, ib qpn 0x%X, mlx qpn 0x%x, rcqn 0x%x, scqn 0x%x\n", + qp->type, qp->ibqp.qp_num, qp->trans_qp.base.mqp.qpn, + params->attr->recv_cq ? to_mcq(params->attr->recv_cq)->mcq.cqn : + -1, + params->attr->send_cq ? to_mcq(params->attr->send_cq)->mcq.cqn : + -1); - return create_user_qp(dev, pd, qp, params); + return 0; } static int check_qp_attr(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp, @@ -2862,7 +2903,6 @@ struct ib_qp *mlx5_ib_create_qp(struct ib_pd *pd, struct ib_qp_init_attr *attr, struct mlx5_ib_dev *dev; struct mlx5_ib_qp *qp; enum ib_qp_type type; - u16 xrcdn = 0; int err; dev = pd ? to_mdev(pd->device) : @@ -2922,40 +2962,13 @@ struct ib_qp *mlx5_ib_create_qp(struct ib_pd *pd, struct ib_qp_init_attr *attr, if (err) goto free_qp; - switch (qp->type) { - case IB_QPT_RAW_PACKET: - err = create_raw_qp(dev, pd, qp, ¶ms); - break; - case MLX5_IB_QPT_DCT: - err = create_dct(pd, qp, ¶ms); - break; - case IB_QPT_XRC_TGT: - xrcdn = to_mxrcd(attr->xrcd)->xrcdn; - err = create_xrc_tgt_qp(dev, qp, ¶ms); - break; - default: - if (udata) - err = create_user_qp(dev, pd, qp, ¶ms); - else - err = create_kernel_qp(dev, pd, qp, ¶ms); - } - if (err) { - mlx5_ib_err(dev, "create_qp failed %d\n", err); + err = create_qp(dev, pd, qp, ¶ms); + if (err) goto free_qp; - } kfree(params.ucmd); params.ucmd = NULL; - if (is_qp0(attr->qp_type)) - qp->ibqp.qp_num = 0; - else if (is_qp1(attr->qp_type)) - qp->ibqp.qp_num = 1; - else - qp->ibqp.qp_num = qp->trans_qp.base.mqp.qpn; - - qp->trans_qp.xrcdn = xrcdn; - if (udata) /* * It is safe to copy response for all user create QP flows, -- 2.25.3