From nobody Mon Jul 20 20:53:39 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 4h3t5w2FrRz6dPqW for ; Mon, 20 Jul 2026 20:53:40 +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 4h3t5w0shzz47Mr for ; Mon, 20 Jul 2026 20:53:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784580820; 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=qvA/hVhG2sgHncO/lzOMAV+LqtIO8zdRDUfnV8FRKcw=; b=hJldhZhs2EAVn8PXgDcZg1csIXZyNDEYjFnyASGrnJjKlyoppSw4le7EPhP2ndvryR02rS OkOFDItj6tP3MQ3/6OZPaQSfyW4v6DZIR4sMCcg1oOcB/Lr3iR0PFRKlksHz6sujHYeVkx b2M1zJVZeWw6p9cgjtkoF+yF4gMKO/jsMIaGA4+iNQulEYp0fa4XOPgFwvNNe+To9WDrTi ZRxmdUs4Q4tcJLtsTk/Hlfs3REQDlgzvRuHSzOgp+qEZn37c4dK4f0/Q0cd5K+ZxashLS7 mj2ybghF+8PcaKpK0t92qLl/u9zmHuE1mFy4beUUDq2ND/7NTcEFnYzddwhImg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784580820; a=rsa-sha256; cv=none; b=eTV7HRJoVioxmAN0oNsOVsNYFRWLZAeLRymiWggBjuUVGGZbozYKgUFWx2+IT0cVMm13vZ rbmFXkZiPGmCVO4lV8PaIJMA6HojgrjLhhuGL3FVrIEV2WEpn/o0W2wrrTKeS0+KYsBunV 25oWWE7J/J7bq5CewcwS2eMVgaKDulLnfwN61ctSXbCp3YWe0H3xpqzh9yewyCB2KcYDeg GTeppbm0MWunkccXZ8HUQueY6qMyReqedvni/hfSzvAXU/fInKHuATmvIWW6Ea9+JjVyoE cu0Og4KuqrLhqbvNxL1dJrvq7OXdJWXbELdua51jvtvn17Zla+7eSOeqzYMKeQ== 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=1784580820; 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=qvA/hVhG2sgHncO/lzOMAV+LqtIO8zdRDUfnV8FRKcw=; b=kpgaMSOX4vtYY0kmm1KofDdfmNw2fYB/66r0b3laj4JyMAE00h6/KNwkYQwKEJsBxwlxb4 eLB0p7codey7jY9j4JePgTmEARfw2ZFRU+aWEfL3pq2ABeWnhF2sWZvm+l3qlJqGN3eMUF xh1TRA5PsFVUAEZQebl1X6+bLfZUKhMWnwNjcKgP6Lb4bVXHfEIXn1oAY2lr8fQSWYyHS9 ++HZZ2VwVRo74/9Gfa+iXnMMRRlp8UbgHrgbB+vX+PAqksD9SdO1rONePg1GtW66KH6Qy4 uYKtGTfmQxKx17AABkU4hOJKY3WDpPDnBHK2XsvvSfx0t9HV7xm/W8PaCUW6/g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h3t5v6snWz33r for ; Mon, 20 Jul 2026 20:53:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d328 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 20 Jul 2026 20:53:39 +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: 86cdda181e4e - stable/15 - mlx5: propagate the DEVX uid through SRQ create and destroy 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: 86cdda181e4e98ec7b9b96d2d03f4eb92df4c14e Auto-Submitted: auto-generated Date: Mon, 20 Jul 2026 20:53:39 +0000 Message-Id: <6a5e8ad3.1d328.a089fa9@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=86cdda181e4e98ec7b9b96d2d03f4eb92df4c14e commit 86cdda181e4e98ec7b9b96d2d03f4eb92df4c14e Author: Ariel Ehrenberg AuthorDate: 2026-06-15 19:00:47 +0000 Commit: Konstantin Belousov CommitDate: 2026-07-20 20:26:09 +0000 mlx5: propagate the DEVX uid through SRQ create and destroy (cherry picked from commit 07f780cb7f8eab1aa6e84d3ed6785144d0d3cc47) --- sys/dev/mlx5/driver.h | 1 + sys/dev/mlx5/mlx5_core/mlx5_srq.c | 30 +++++++++++++++++++++++++++--- sys/dev/mlx5/mlx5_ifc.h | 2 +- 3 files changed, 29 insertions(+), 4 deletions(-) diff --git a/sys/dev/mlx5/driver.h b/sys/dev/mlx5/driver.h index ba6714c5c7b6..f5a73bec0776 100644 --- a/sys/dev/mlx5/driver.h +++ b/sys/dev/mlx5/driver.h @@ -481,6 +481,7 @@ struct mlx5_sq_bfreg { struct mlx5_core_srq { struct mlx5_core_rsc_common common; /* must be first */ u32 srqn; + u16 uid; int max; size_t max_gs; size_t max_avail_gather; diff --git a/sys/dev/mlx5/mlx5_core/mlx5_srq.c b/sys/dev/mlx5/mlx5_core/mlx5_srq.c index 7318a5b2c3c8..cd705ae6de88 100644 --- a/sys/dev/mlx5/mlx5_core/mlx5_srq.c +++ b/sys/dev/mlx5/mlx5_core/mlx5_srq.c @@ -166,7 +166,10 @@ static int create_rmp_cmd(struct mlx5_core_dev *dev, struct mlx5_core_srq *srq, set_wq(wq, in); memcpy(MLX5_ADDR_OF(rmpc, rmpc, wq.pas), in->pas, pas_size); + MLX5_SET(create_rmp_in, create_in, uid, in->uid); err = mlx5_core_create_rmp(dev, create_in, inlen, &srq->srqn); + if (!err) + srq->uid = in->uid; kvfree(create_in); return err; @@ -175,7 +178,14 @@ static int create_rmp_cmd(struct mlx5_core_dev *dev, struct mlx5_core_srq *srq, static int destroy_rmp_cmd(struct mlx5_core_dev *dev, struct mlx5_core_srq *srq) { - return mlx5_core_destroy_rmp(dev, srq->srqn); + u32 in[MLX5_ST_SZ_DW(destroy_rmp_in)] = {0}; + u32 out[MLX5_ST_SZ_DW(destroy_rmp_out)] = {0}; + + MLX5_SET(destroy_rmp_in, in, opcode, MLX5_CMD_OP_DESTROY_RMP); + MLX5_SET(destroy_rmp_in, in, rmpn, srq->srqn); + MLX5_SET(destroy_rmp_in, in, uid, srq->uid); + + return mlx5_cmd_exec(dev, in, sizeof(in), out, sizeof(out)); } static int query_rmp_cmd(struct mlx5_core_dev *dev, struct mlx5_core_srq *srq, @@ -232,7 +242,10 @@ static int create_xrc_srq_cmd(struct mlx5_core_dev *dev, MLX5_SET(xrc_srqc, xrc_srqc, user_index, in->user_index); memcpy(pas, in->pas, pas_size); + MLX5_SET(create_xrc_srq_in, create_in, uid, in->uid); err = mlx5_core_create_xsrq(dev, create_in, inlen, &srq->srqn); + if (!err) + srq->uid = in->uid; if (err) goto out; @@ -244,7 +257,14 @@ out: static int destroy_xrc_srq_cmd(struct mlx5_core_dev *dev, struct mlx5_core_srq *srq) { - return mlx5_core_destroy_xsrq(dev, srq->srqn); + u32 in[MLX5_ST_SZ_DW(destroy_xrc_srq_in)] = {0}; + u32 out[MLX5_ST_SZ_DW(destroy_xrc_srq_out)] = {0}; + + MLX5_SET(destroy_xrc_srq_in, in, opcode, MLX5_CMD_OP_DESTROY_XRC_SRQ); + MLX5_SET(destroy_xrc_srq_in, in, xrc_srqn, srq->srqn); + MLX5_SET(destroy_xrc_srq_in, in, uid, srq->uid); + + return mlx5_cmd_exec(dev, in, sizeof(in), out, sizeof(out)); } static int query_xrc_srq_cmd(struct mlx5_core_dev *dev, @@ -304,10 +324,13 @@ static int create_srq_cmd(struct mlx5_core_dev *dev, struct mlx5_core_srq *srq, memcpy(pas, in->pas, pas_size); MLX5_SET(create_srq_in, create_in, opcode, MLX5_CMD_OP_CREATE_SRQ); + MLX5_SET(create_srq_in, create_in, uid, in->uid); err = mlx5_cmd_exec(dev, create_in, inlen, create_out, sizeof(create_out)); kvfree(create_in); - if (!err) + if (!err) { srq->srqn = MLX5_GET(create_srq_out, create_out, srqn); + srq->uid = in->uid; + } return err; } @@ -320,6 +343,7 @@ static int destroy_srq_cmd(struct mlx5_core_dev *dev, MLX5_SET(destroy_srq_in, srq_in, opcode, MLX5_CMD_OP_DESTROY_SRQ); MLX5_SET(destroy_srq_in, srq_in, srqn, srq->srqn); + MLX5_SET(destroy_srq_in, srq_in, uid, srq->uid); return mlx5_cmd_exec(dev, srq_in, sizeof(srq_in), srq_out, sizeof(srq_out)); } diff --git a/sys/dev/mlx5/mlx5_ifc.h b/sys/dev/mlx5/mlx5_ifc.h index 952f51d3c3f7..1906b670f013 100644 --- a/sys/dev/mlx5/mlx5_ifc.h +++ b/sys/dev/mlx5/mlx5_ifc.h @@ -7212,7 +7212,7 @@ struct mlx5_ifc_destroy_rmp_out_bits { struct mlx5_ifc_destroy_rmp_in_bits { u8 opcode[0x10]; - u8 reserved_0[0x10]; + u8 uid[0x10]; u8 reserved_1[0x10]; u8 op_mod[0x10];