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=-13.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 66B58C2D0E0 for ; Mon, 7 Sep 2020 17:49:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 34BB82080A for ; Mon, 7 Sep 2020 17:49:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599500968; bh=sp1603JsJ0pJMZKKp0dBQkNJNW6AxmWJXUKVMR6nkCs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=UsoIONDGsU/Q3kbv565wGmYjuUsGoEahcrRK2tMZQLF9/dqKLndmrKjNPx1mvicMk wMTW4g3L7x3zumfku4+RRMn5gra9Vvr/BUqg6yenP4pnZE2SITDucL/wrOf2Oxyo+E WpX0pNPLmghyRy+boxspfRi8ktPMEUlWVhiLo+WE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729355AbgIGRt1 (ORCPT ); Mon, 7 Sep 2020 13:49:27 -0400 Received: from mail.kernel.org ([198.145.29.99]:41102 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729245AbgIGMWJ (ORCPT ); Mon, 7 Sep 2020 08:22:09 -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 EDEEF21481; Mon, 7 Sep 2020 12:22:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599481328; bh=sp1603JsJ0pJMZKKp0dBQkNJNW6AxmWJXUKVMR6nkCs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mu0rfzi4qCG2mduRb233/vI3uDsRy3J0Qa4nnIFOq7hVopAuFWNkDTViVpZ+/hcBF 9oL+LDOvAGq9l3klcTtA8+GuUY5o0IiDM1e7rvoVVos1Q+B2zWyt23TT5Y8S4X9pyR rTu946jDFzYw8TFuFqpeO7BEi47csh+6cbg+nzqE= From: Leon Romanovsky To: Doug Ledford , Jason Gunthorpe Cc: Leon Romanovsky , linux-rdma@vger.kernel.org, Yishai Hadas Subject: [PATCH rdma-next v2 03/14] RDMA/mlx4: Provide port number for special QPs Date: Mon, 7 Sep 2020 15:21:45 +0300 Message-Id: <20200907122156.478360-4-leon@kernel.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200907122156.478360-1-leon@kernel.org> References: <20200907122156.478360-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 Special QPs created by mlx4 have same QP port borrowed from the context, while they are expected to have different ones. Fix it by using HW physical port instead. It fixes the following error during driver init: [ 12.074150] mlx4_core 0000:05:00.0: mlx4_ib: initializing demux service for 128 qp1 clients [ 12.084036] create_pv_sqp: Couldn't create special QP (-16) [ 12.085123] create_pv_resources: Couldn't create QP1 (-16) [ 12.088300] mlx4_en: Mellanox ConnectX HCA Ethernet driver v4.0-0 Signed-off-by: Leon Romanovsky --- drivers/infiniband/hw/mlx4/mad.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/infiniband/hw/mlx4/mad.c b/drivers/infiniband/hw/mlx4/mad.c index 8bd16474708f..be0057222bbc 100644 --- a/drivers/infiniband/hw/mlx4/mad.c +++ b/drivers/infiniband/hw/mlx4/mad.c @@ -1792,7 +1792,7 @@ static void pv_qp_event_handler(struct ib_event *event, void *qp_context) } static int create_pv_sqp(struct mlx4_ib_demux_pv_ctx *ctx, - enum ib_qp_type qp_type, int create_tun) + enum ib_qp_type qp_type, int port, int create_tun) { int i, ret; struct mlx4_ib_demux_pv_qp *tun_qp; @@ -1822,12 +1822,13 @@ static int create_pv_sqp(struct mlx4_ib_demux_pv_ctx *ctx, qp_init_attr.proxy_qp_type = qp_type; qp_attr_mask_INIT = IB_QP_STATE | IB_QP_PKEY_INDEX | IB_QP_QKEY | IB_QP_PORT; + qp_init_attr.init_attr.port_num = ctx->port; } else { qp_init_attr.init_attr.qp_type = qp_type; qp_init_attr.init_attr.create_flags = MLX4_IB_SRIOV_SQP; qp_attr_mask_INIT = IB_QP_STATE | IB_QP_PKEY_INDEX | IB_QP_QKEY; + qp_init_attr.init_attr.port_num = port; } - qp_init_attr.init_attr.port_num = ctx->port; qp_init_attr.init_attr.qp_context = ctx; qp_init_attr.init_attr.event_handler = pv_qp_event_handler; tun_qp->qp = ib_create_qp(ctx->pd, &qp_init_attr.init_attr); @@ -2026,7 +2027,7 @@ static int create_pv_resources(struct ib_device *ibdev, int slave, int port, } if (ctx->has_smi) { - ret = create_pv_sqp(ctx, IB_QPT_SMI, create_tun); + ret = create_pv_sqp(ctx, IB_QPT_SMI, port, create_tun); if (ret) { pr_err("Couldn't create %s QP0 (%d)\n", create_tun ? "tunnel for" : "", ret); @@ -2034,7 +2035,7 @@ static int create_pv_resources(struct ib_device *ibdev, int slave, int port, } } - ret = create_pv_sqp(ctx, IB_QPT_GSI, create_tun); + ret = create_pv_sqp(ctx, IB_QPT_GSI, port, create_tun); if (ret) { pr_err("Couldn't create %s QP1 (%d)\n", create_tun ? "tunnel for" : "", ret); -- 2.26.2