From nobody Mon Jul 20 20:53:33 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4h3t5n6tJCz6dQ5y for ; Mon, 20 Jul 2026 20:53:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h3t5n24DLz472m for ; Mon, 20 Jul 2026 20:53:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784580813; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S3EdVwLowHtxBNv52VVV7y7fMEqfsN87XEBSk1vDKfI=; b=AUss4jpJtTQQPG/UEhNX18Hor/l+NvqFvj72Q2jaKhPuKu1QEZCVqXWfYSbMNzYSk/d8pf ZRGSOGZBIjbVVY429kVu8TKijlFy9sRMnmXz/9Ujokdz8O5M9JbBJ/f/rmxWfq3zJ7p9y4 0g8u9y+/ItaQ2Kwa2K3pa5zNxLC4dxjI+NUorLZfxT6x2xKbCF5NnGOD6RMhWvAOP6hjtS pS+B42VoLPqW01cL501OCrvfsyJIYcqe6WjJz+PlDTWoilymBt2rf/ZeAr9UEeeARTlTKv u3px+Qa6SjGNWE6K8sn8+hzQee9AjS2siWoFEwxACeoN6DcFggNvIwx3Z6uTtg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784580813; a=rsa-sha256; cv=none; b=iX6SYndz8O46ZYRO6x1xNgMVkKM5EA8Dpyzr0uipi4SqYRYkWVNMRwp99hp4bFSP/MAdJl OvoK4FIOKuFxH/loTTr7OKA5Z5fRhKN0u1hXLBklW3XSW2ys6HQ1aJPheouJPvJA/ue+dc txOgJL2TRR9p62xENfS+bnBeTcw5AMXn0KpUK0d1fbdxcOCG8CZ81M/g3zEv2llNNjfAhm L9vp9zVuqNU7VwpEEcOBdE9bocLtHaiU1Y/pjqwXlkxPqEkZvS8916uJ6ZWEAUnN6UPK/L bKKZbcfHbrinqEXUdwCV4KVosTvvyODpFsoNclrmFxXJ10ofrWfn2Pi2o/yRVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784580813; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S3EdVwLowHtxBNv52VVV7y7fMEqfsN87XEBSk1vDKfI=; b=gQT0cTr3Cqv1cZ6crNirfGWJVmnav+57RvgGD6uLZ/9BhxY3mo7w+0lsF4sgmSOZqfJ6V7 ULY6KLKUCH5o74VKWTtZOpUzKYFO3ThG4k+4S8GfhAiAJNO29aRIOd23LSyJD9fqdjmpS3 XnAfTEKkmFtVMlCIlJhb6pMmH7x2wmALOWdiNt9zySAJjmrfJr8oCRXNbl0HoMCtsJxkQE tO1x0GzOOVuGZ60YZWKRflrTpsVdTAfWoWQj9YlWELZd248Z727hw5ZRfGsrGntxIYgyF5 +5iS9DjbQqvrlf+G0PlfozJ9r8B5mbZUdxs1v1e2QcPUERWJsH28/4gVj/q33g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h3t5n0WDkz3LN for ; Mon, 20 Jul 2026 20:53:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1dce4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 20 Jul 2026 20:53:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Ariel Ehrenberg From: Konstantin Belousov Subject: git: c122d64b5ab2 - stable/15 - mlx5ib: allocate IB queue counters as a shared resource List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: c122d64b5ab2ff77ab4fc3478885bdb316cdfc54 Auto-Submitted: auto-generated Date: Mon, 20 Jul 2026 20:53:33 +0000 Message-Id: <6a5e8acd.1dce4.eaaad5@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c122d64b5ab2ff77ab4fc3478885bdb316cdfc54 commit c122d64b5ab2ff77ab4fc3478885bdb316cdfc54 Author: Ariel Ehrenberg AuthorDate: 2026-06-04 15:46:28 +0000 Commit: Konstantin Belousov CommitDate: 2026-07-20 20:26:07 +0000 mlx5ib: allocate IB queue counters as a shared resource (cherry picked from commit 412aa220aeb920dcbc0f2b3effbbb51ad41c7fc3) --- sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c b/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c index 728ea19756b8..599361549763 100644 --- a/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c +++ b/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c @@ -3251,9 +3251,17 @@ static void mlx5_disable_roce(struct mlx5_ib_dev *dev) static void mlx5_ib_dealloc_q_port_counter(struct mlx5_ib_dev *dev, u8 port_num) { - mlx5_vport_dealloc_q_counter(dev->mdev, - MLX5_INTERFACE_PROTOCOL_IB, - dev->port[port_num].q_cnt_id); + u32 in[MLX5_ST_SZ_DW(dealloc_q_counter_in)] = {}; + u32 out[MLX5_ST_SZ_DW(dealloc_q_counter_out)] = {}; + + if (!dev->port[port_num].q_cnt_id) + return; + + MLX5_SET(dealloc_q_counter_in, in, opcode, + MLX5_CMD_OP_DEALLOC_Q_COUNTER); + MLX5_SET(dealloc_q_counter_in, in, counter_set_id, + dev->port[port_num].q_cnt_id); + mlx5_cmd_exec(dev->mdev, in, sizeof(in), out, sizeof(out)); dev->port[port_num].q_cnt_id = 0; } @@ -3267,19 +3275,31 @@ static void mlx5_ib_dealloc_q_counters(struct mlx5_ib_dev *dev) static int mlx5_ib_alloc_q_counters(struct mlx5_ib_dev *dev) { + u32 in[MLX5_ST_SZ_DW(alloc_q_counter_in)] = {}; + u32 out[MLX5_ST_SZ_DW(alloc_q_counter_out)] = {}; int i; int ret; + MLX5_SET(alloc_q_counter_in, in, opcode, MLX5_CMD_OP_ALLOC_Q_COUNTER); + /* + * On devices that support user contexts, allocate the queue counters + * as a shared resource so QPs owned by a user context (DEVX uid) can + * reference them; otherwise RST2INIT_QP fails with a firmware "bad + * resource state" error. + */ + if (MLX5_CAP_GEN(dev->mdev, log_max_uctx)) + MLX5_SET(alloc_q_counter_in, in, uid, MLX5_SHARED_RESOURCE_UID); + for (i = 0; i < dev->num_ports; i++) { - ret = mlx5_vport_alloc_q_counter(dev->mdev, - MLX5_INTERFACE_PROTOCOL_IB, - &dev->port[i].q_cnt_id); + ret = mlx5_cmd_exec(dev->mdev, in, sizeof(in), out, sizeof(out)); if (ret) { mlx5_ib_warn(dev, "couldn't allocate queue counter for port %d, err %d\n", i + 1, ret); goto dealloc_counters; } + dev->port[i].q_cnt_id = MLX5_GET(alloc_q_counter_out, out, + counter_set_id); } return 0;