From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A8332250BE9; Wed, 5 Mar 2025 17:56:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741197381; cv=none; b=nNlXnAurpZ6P2ijenqjoTbKbXJQiSiihOUhKKSoe5VbcM+1KKcOOuFpqMp6qyhEAdX4cqN4etlXbjXJ/trxcR5tyJ7rH3LwkPpdIsEEwJSJVwv99OvTHC1NHm2YNWU76/o8Q9Vcv3BINrEqBGzCp6O/vfu/J5i0Ct3RYcBers7g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741197381; c=relaxed/simple; bh=/Ubf/GoIoHLc60Wa3q4m/KdbsE0gMSdk0cM9yih+Cy4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qJkuYv7rvD0nfdRtG/B97eruL8xhr8k/wfathH4UpShJXFA4HFKcHXJ2XH47vQM/yEauB1kKM11O+gSAp59rdaqAJw2LPmfMt8YG8xllELYcu/TBerf9imRbq75ZBkEbTWdMaTf4bkffT/zdWNW82tvR8BfMeYDt2eRTOfzqmpY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=MEQPWCZf; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="MEQPWCZf" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 30745C4CED1; Wed, 5 Mar 2025 17:56:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1741197381; bh=/Ubf/GoIoHLc60Wa3q4m/KdbsE0gMSdk0cM9yih+Cy4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MEQPWCZfxLvPMjpm32Mu2oA4PXZOJUWaXo0fc/ASfI1fU8ihupZHq7k/ipBlEcyEJ VfOMfRLfMBjuw4Vmy93NoKF91oS6kEfbGAtPofbBJeObfwEe7RJXGh3tPfOirquEDj BIZFXaQMM0FcfWGdbNAl5NnU3qcTrz7jPQ1UMNms= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Mark Zhang , Maher Sanalla , Leon Romanovsky , Sasha Levin Subject: [PATCH 6.1 105/176] IB/mlx5: Set and get correct qp_num for a DCT QP Date: Wed, 5 Mar 2025 18:47:54 +0100 Message-ID: <20250305174509.682026010@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250305174505.437358097@linuxfoundation.org> References: <20250305174505.437358097@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Mark Zhang [ Upstream commit 12d044770e12c4205fa69535b4fa8a9981fea98f ] When a DCT QP is created on an active lag, it's dctc.port is assigned in a round-robin way, which is from 1 to dev->lag_port. In this case when querying this QP, we may get qp_attr.port_num > 2. Fix this by setting qp->port when modifying a DCT QP, and read port_num from qp->port instead of dctc.port when querying it. Fixes: 7c4b1ab9f167 ("IB/mlx5: Add DCT RoCE LAG support") Signed-off-by: Mark Zhang Reviewed-by: Maher Sanalla Link: https://patch.msgid.link/94c76bf0adbea997f87ffa27674e0a7118ad92a9.1737290358.git.leon@kernel.org Signed-off-by: Leon Romanovsky Signed-off-by: Sasha Levin --- drivers/infiniband/hw/mlx5/qp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/infiniband/hw/mlx5/qp.c b/drivers/infiniband/hw/mlx5/qp.c index 8d132b726c64b..d782a494abcda 100644 --- a/drivers/infiniband/hw/mlx5/qp.c +++ b/drivers/infiniband/hw/mlx5/qp.c @@ -4466,6 +4466,8 @@ static int mlx5_ib_modify_dct(struct ib_qp *ibqp, struct ib_qp_attr *attr, set_id = mlx5_ib_get_counters_id(dev, attr->port_num - 1); MLX5_SET(dctc, dctc, counter_set_id, set_id); + + qp->port = attr->port_num; } else if (cur_state == IB_QPS_INIT && new_state == IB_QPS_RTR) { struct mlx5_ib_modify_qp_resp resp = {}; u32 out[MLX5_ST_SZ_DW(create_dct_out)] = {}; @@ -4955,7 +4957,7 @@ static int mlx5_ib_dct_query_qp(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *mqp, } if (qp_attr_mask & IB_QP_PORT) - qp_attr->port_num = MLX5_GET(dctc, dctc, port); + qp_attr->port_num = mqp->port; if (qp_attr_mask & IB_QP_MIN_RNR_TIMER) qp_attr->min_rnr_timer = MLX5_GET(dctc, dctc, min_rnr_nak); if (qp_attr_mask & IB_QP_AV) { -- 2.39.5