From nobody Tue Jul 7 11:30:05 2026 X-Original-To: dev-commits-src-main@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 4gvfCd5y7Dz6dRXM for ; Tue, 07 Jul 2026 11:30:05 +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 4gvfCd1yb4z3M58 for ; Tue, 07 Jul 2026 11:30:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783423805; 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=tm3sstQ5t8oaCS+5vvd7BhjKRcBzA72vGA+uwppgbkE=; b=evp6TaDsdtOyROtI+jYZF3gKMzvu8EeyFkVZ4N6C/POedL2xinNDqo35Ksh5a8hHC1cSB/ X6N4OlNrBTuRYgkV8yzrODs3IsDDpbx5oDFlwAreeExB7/WjEILq0VYML8Cx8XN4NltRZy RhgQzhUep9TaNtUlsDdZw1NfumGTct4wpgFMVtnTQ70FOCDJKKHMsPd123lYzg4KowTsFf Ku/yOwuGbdM77rrpwRBrPSitpf2dHhxamy+WXHgQP07lJ97zF0sN7Syt5tY8k/56aSz0fn zZhnKwvFyxELs7BKBqH9rBcsn363ulorCf2fbFAZGLkcsJGAA8ZqHZBZ/8jmIg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1783423805; a=rsa-sha256; cv=none; b=WgpFXjDqfeOV9sXT4zOh2/cemfgH5WF8Exwh9d7N7EtEsSLFBib2fWZCKqaKZzNhgPEZhl 5jtGnQByo1B1W2nwoFH6k9kBGmu+1rPbxBNOigcFljog6KyC4LHdFRz7SuTmBYeGvbdTGK 6ouIvaL6gYOJGAVbM3skoeRMfiQJGcekyTFyrieGrc/9XEyUl5KNb3jxspYNy4q8T8uD0N fy1Tgap3FzzWYrJQ8MckzlsWTk5DdvwW1eVDoVicrVcIg31jliQoK+fD9kk27g/3YZY2J8 5R+wxVp1+CYvDyVQYLBC+na/yyl9U+cWSOaTliXFH9fRd8USbdKTlCu+75awbQ== 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=1783423805; 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=tm3sstQ5t8oaCS+5vvd7BhjKRcBzA72vGA+uwppgbkE=; b=s4LclYbnb9wfa17ZYE2WicCyDN5IGed1cd+GAYZCSqWv07BOzx36hAloz5Vs+4b4zkh/N5 ddBBlRenfDNkrKxZWdFU8S3IUiPPsbroaElrs5wweDVkgHRbYDtmRcRICbJVtxRKK3rkXN a4CjkX2iRwj4XGwHkH1Bi5gJrmwK++omY1eiysRACjSURoH6qJbWL4K4SCHoylUBlFEOph Av95OUP/qRK6IPt7jxN8Ub/PBC+Qmxbsy5rHYVz4Ku53CaAa5iu1oDQC0XC/inKLeq8L0Z vXkfOfrdKDf1ZvnocNIIHNaT2SOfYFf8dqzLkgHfoLL7KNTu9byVoMRTXNPs3w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gvfCd0cvzzYwZ for ; Tue, 07 Jul 2026 11:30:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34878 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 07 Jul 2026 11:30:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Ariel Ehrenberg From: Konstantin Belousov Subject: git: 412aa220aeb9 - main - mlx5ib: allocate IB queue counters as a shared resource List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 412aa220aeb920dcbc0f2b3effbbb51ad41c7fc3 Auto-Submitted: auto-generated Date: Tue, 07 Jul 2026 11:30:05 +0000 Message-Id: <6a4ce33d.34878.31b00570@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=412aa220aeb920dcbc0f2b3effbbb51ad41c7fc3 commit 412aa220aeb920dcbc0f2b3effbbb51ad41c7fc3 Author: Ariel Ehrenberg AuthorDate: 2026-06-04 15:46:28 +0000 Commit: Konstantin Belousov CommitDate: 2026-07-07 11:24:57 +0000 mlx5ib: allocate IB queue counters as a shared resource A QP owned by a DEVX uid references the port's queue counter. The counter was allocated with uid 0, so RST2INIT_QP on a uid-owned QP failed with "bad resource state". Allocate and free the IB queue counters directly and, on devices that support user contexts, stamp them with MLX5_SHARED_RESOURCE_UID so uid-owned QPs can use them. The code follows the Linux commit d2c8a1554c10d5e0443b1f97f480d7dacd55cf55 ("IB/mlx5: Enable UAR to have DevX UID"). Reviewed by: kib Tested by: Wafa Hamzah Sponsored by: Nvidia networking MFC after: 1 month --- 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 fc9af189f3fa..daf5cb217001 100644 --- a/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c +++ b/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c @@ -3223,9 +3223,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; } @@ -3239,19 +3247,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;