From patchwork Thu Jul 28 01:31:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarod Wilson X-Patchwork-Id: 9250523 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C8561607D3 for ; Thu, 28 Jul 2016 01:32:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B107F20855 for ; Thu, 28 Jul 2016 01:32:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A5D64219AC; Thu, 28 Jul 2016 01:32:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0C166219AC for ; Thu, 28 Jul 2016 01:32:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758827AbcG1BcA (ORCPT ); Wed, 27 Jul 2016 21:32:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60688 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758826AbcG1Bb7 (ORCPT ); Wed, 27 Jul 2016 21:31:59 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E6D6712B5; Thu, 28 Jul 2016 01:31:58 +0000 (UTC) Received: from hp-dl360pgen8-07.khw.lab.eng.bos.redhat.com (hp-dl360pgen8-07.khw.lab.eng.bos.redhat.com [10.16.184.47]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u6S1VwCs017621; Wed, 27 Jul 2016 21:31:58 -0400 From: Jarod Wilson To: linux-rdma@vger.kernel.org Cc: Jarod Wilson , Yishai Hadas Subject: [PATCH v2 libmlx5 6/6] fix undefined uuar_index value assignment Date: Wed, 27 Jul 2016 21:31:55 -0400 Message-Id: <1469669515-23720-1-git-send-email-jarod@redhat.com> In-Reply-To: <1469647047-7544-7-git-send-email-jarod@redhat.com> References: <1469647047-7544-7-git-send-email-jarod@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Thu, 28 Jul 2016 01:31:58 +0000 (UTC) Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In the case of (attr->comp_mask & MLX5_CREATE_QP_EX2_COMP_MASK) being not true, uuar_index gets set to resp.uuar_index, but nothing ever initializes resp.uuar_index. That said, both this case, and the true case, it looks like uuar_index never gets assigned to anything but 0. In the true path, resp_ex gets memset to 0, and then nothing ever sets uuar_index. Not sure what the intended use was here, but ultimately, uuar_index is always going to be 0 with this patch (0 or undetermined garbage before). Additionally, I'm not sure if the cmd and resp size parameters passed to ibv_cmd_create_qp_ex() are correct, but they're at least larger than they might be, which should be fine. I think. But I'm just guessing here. v2: only check flag once, save to local var, memset() resp and resp_ex accordingly within this function. CC: Yishai Hadas Signed-off-by: Jarod Wilson --- src/verbs.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/verbs.c b/src/verbs.c index d64e406..c68864a 100644 --- a/src/verbs.c +++ b/src/verbs.c @@ -1098,7 +1098,6 @@ static int mlx5_cmd_create_qp_ex(struct ibv_context *context, struct mlx5_create_qp_ex cmd_ex; int ret; - memset(resp, 0, sizeof(*resp)); memset(&cmd_ex, 0, sizeof(cmd_ex)); memcpy(&cmd_ex.ibv_cmd.base, &cmd->ibv_cmd.user_handle, offsetof(typeof(cmd->ibv_cmd), is_srq) + @@ -1140,6 +1139,7 @@ struct ibv_qp *create_qp(struct ibv_context *context, struct ibv_qp *ibqp; uint32_t usr_idx = 0; uint32_t uuar_index; + uint8_t use_ex2 = 0; #ifdef MLX5_DEBUG FILE *fp = ctx->dbg_fp; #endif @@ -1147,6 +1147,9 @@ struct ibv_qp *create_qp(struct ibv_context *context, if (attr->comp_mask & ~MLX5_CREATE_QP_SUP_COMP_MASK) return NULL; + if (attr->comp_mask & MLX5_CREATE_QP_EX2_COMP_MASK) + use_ex2 = 1; + qp = calloc(1, sizeof(*qp)); if (!qp) { mlx5_dbg(fp, MLX5_DBG_QP, "\n"); @@ -1156,6 +1159,10 @@ struct ibv_qp *create_qp(struct ibv_context *context, qp->ibv_qp = ibqp; memset(&cmd, 0, sizeof(cmd)); + if (use_ex2) + memset(&resp_ex, 0, sizeof(resp_ex)); + else + memset(&resp, 0, sizeof(resp)); qp->wq_sig = qp_sig_enabled(); if (qp->wq_sig) @@ -1235,7 +1242,7 @@ struct ibv_qp *create_qp(struct ibv_context *context, cmd.uidx = usr_idx; } - if (attr->comp_mask & MLX5_CREATE_QP_EX2_COMP_MASK) + if (use_ex2) ret = mlx5_cmd_create_qp_ex(context, attr, &cmd, qp, &resp_ex); else ret = ibv_cmd_create_qp_ex(context, &qp->verbs_qp, sizeof(qp->verbs_qp), @@ -1246,8 +1253,8 @@ struct ibv_qp *create_qp(struct ibv_context *context, goto err_free_uidx; } - uuar_index = (attr->comp_mask & MLX5_CREATE_QP_EX2_COMP_MASK) ? - resp_ex.uuar_index : resp.uuar_index; + uuar_index = use_ex2 ? resp_ex.uuar_index : resp.uuar_index; + if (!ctx->cqe_version) { if (qp->sq.wqe_cnt || qp->rq.wqe_cnt) { ret = mlx5_store_qp(ctx, ibqp->qp_num, qp);