From nobody Tue Jul 7 11:30:01 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 4gvfCb34S2z6dRPV for ; Tue, 07 Jul 2026 11:30:03 +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 4gvfCb0y76z3M7K for ; Tue, 07 Jul 2026 11:30:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783423803; 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=ZCQlusVtpY2AX+mtfpZDedOZQS7HmJCubQgj62hEXzE=; b=SsPmuFH430qgcKRdL7OarcM/dncy6qwcvpcXG2m7dIJqKojZ2RAuaS0gSJicKhAlAaFWgY IGGDB4MQLWDmZE0d79eOWbt0sWos/0yzfc1ZcxVPwe/Fmfnkr4Uv53K7FhbB5fM7IYpYCU kkqosF9nODKxtpqjJU0U7woN7l5yOarj0qlUZoyQ9b99RprwxhcQkk+g6Hix3CHBmG97f6 l/67MuikwQgEZkWheP3Wl4WiezOBlWG7FphZeDlwkdIHaAbHuQm6b3KCplOOk4NfKtIrNg 5DOX2xNjLrwSlP3CcCyMYhfpFp3LQF7qCTEU670mNEkQvsWNJXz4H847LB5LHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1783423803; a=rsa-sha256; cv=none; b=pQJxftAv0GdmzNNhtBCCMFdrIF+sybHUnEMPRSDZ2r1pMSX9l0yXYzNTfxije95As5nAk9 4iTgTMWiNEi/BlQeAK5Y6uWxqH5jN6ZDGgvaiz4A3VqrqRBpASteBG1qWTxliip/VWwhRZ A3kSz9DQFzUvHAdSHuUdmWyCjPm/hK+XXhuHbJLiGMn9GaTzZXNbWhLPDENTxmKHs/F2zW 3CAkgsKlnabEEj4ED0iU6ad/b8MoKBZeNXXhMcE3b14jmq3laMIhDnxOLlOPN2uBhrgDrl w/0wKP/hrlE56TAhIRGpuf9VzxGY8b0kO+IJEWsNUTPxGhlYhL17PizTlIgK2w== 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=1783423803; 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=ZCQlusVtpY2AX+mtfpZDedOZQS7HmJCubQgj62hEXzE=; b=B6O/qLoGNnvBIQVqawvUz/Nkg11bDul30dbuOkqcc147dTBfm4KI136WkvBM3FDN8yGmu5 7onCIpseKBq3oYsuh9HDg34RYRFfsLh38GA3awcqigbWRpppu6/yG3dBbqepIHV0czinOm tpryVT9flj6PAQvtl0gVjUMp0txAeJLqtpg3o5ehkCeWLs6hEna1o2uIwbLalnh2W4NcBS de+aUJGdoupSLA4Rd06QXH0j5Cfjej0SVPHIDwahGlanfwXvJ0I6RZjUL1a6jl7VRh6soH N8/rr/vR0yoata78EF1lCRrJO1w6aO8gkU3AcFxAbDCdhOrLJrS+8y0ioLM7ZQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gvfCY6Py4zYqS for ; Tue, 07 Jul 2026 11:30:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36d1e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 07 Jul 2026 11:30:01 +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: 705d6cf4bf25 - main - mlx5_ib: register DEVX objects in the uverbs ioctl parse tree 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/main X-Git-Reftype: branch X-Git-Commit: 705d6cf4bf25f7b87f017322e04c6a1a37f1fac0 Auto-Submitted: auto-generated Date: Tue, 07 Jul 2026 11:30:01 +0000 Message-Id: <6a4ce339.36d1e.1b46e7b7@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=705d6cf4bf25f7b87f017322e04c6a1a37f1fac0 commit 705d6cf4bf25f7b87f017322e04c6a1a37f1fac0 Author: Ariel Ehrenberg AuthorDate: 2026-06-09 11:20:23 +0000 Commit: Konstantin Belousov CommitDate: 2026-07-07 11:24:29 +0000 mlx5_ib: register DEVX objects in the uverbs ioctl parse tree Import Linux upstream commits a8b92ca1b0e5ce620e425e9d2f89ce44f1a82a82 and c59450c463695a016e823175bac421cff219935d. The DEVX object and method definitions were already present, but nothing pointed ib_device.driver_def at them. ibcore therefore never merged them into the uverbs uapi tree and every DEVX ioctl came back as EPROTONOSUPPORT. Reviewed by: kib Tested by: Wafa Hamzah Sponsored by: Nvidia networking MFC after: 1 month --- sys/dev/mlx5/mlx5_ib/mlx5_ib.h | 1 + sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c | 22 ++++++++++++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/sys/dev/mlx5/mlx5_ib/mlx5_ib.h b/sys/dev/mlx5/mlx5_ib/mlx5_ib.h index a97d74864292..bbc7aa4a170a 100644 --- a/sys/dev/mlx5/mlx5_ib/mlx5_ib.h +++ b/sys/dev/mlx5/mlx5_ib/mlx5_ib.h @@ -1080,6 +1080,7 @@ void mlx5_ib_devx_init_event_table(struct mlx5_ib_dev *dev); void mlx5_ib_devx_cleanup_event_table(struct mlx5_ib_dev *dev); bool mlx5_ib_devx_is_flow_dest(void *obj, int *dest_id, int *dest_type); bool mlx5_ib_devx_is_flow_counter(void *obj, u32 offset, u32 *counter_id); +extern const struct uapi_definition mlx5_ib_devx_defs[]; #else static inline int mlx5_ib_devx_create(struct mlx5_ib_dev *dev, diff --git a/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c b/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c index 53ccf68e4077..f5c7d5cf382b 100644 --- a/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c +++ b/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c @@ -3300,6 +3300,11 @@ free: return ARRAY_SIZE(names); } +static const struct uapi_definition mlx5_ib_defs[] = { + UAPI_DEF_CHAIN(mlx5_ib_devx_defs), + {} +}; + static int mlx5_ib_stage_bfreg_init(struct mlx5_ib_dev *dev) { int err; @@ -3374,6 +3379,7 @@ static void *mlx5_ib_add(struct mlx5_core_dev *mdev) dev->ib_dev.num_comp_vectors = dev->mdev->priv.eq_table.num_comp_vectors; dev->ib_dev.dma_device = &mdev->pdev->dev; + dev->ib_dev.driver_def = mlx5_ib_defs; dev->ib_dev.uverbs_abi_ver = MLX5_IB_UVERBS_ABI_VERSION; dev->ib_dev.uverbs_cmd_mask = @@ -3539,9 +3545,18 @@ static void *mlx5_ib_add(struct mlx5_core_dev *mdev) if (err) goto err_q_cnt; + /* + * Initialize the DEVX event table before ib_register_device(). + * Registration merges ib_dev.driver_def into the uverbs uapi, which + * makes the DEVX object tree live immediately; initializing the event + * table afterwards would leave a window where a DEVX ioctl could touch + * an uninitialized dev->devx_event_table. + */ + mlx5_ib_devx_init_event_table(dev); + err = ib_register_device(&dev->ib_dev, NULL); if (err) - goto err_bfreg; + goto err_devx; err = create_umr_res(dev); if (err) @@ -3568,7 +3583,9 @@ err_umrc: err_dev: ib_unregister_device(&dev->ib_dev); -err_bfreg: +err_devx: + mlx5_ib_devx_cleanup_event_table(dev); + mlx5_ib_stage_bfreg_cleanup(dev); err_q_cnt: @@ -3600,6 +3617,7 @@ static void mlx5_ib_remove(struct mlx5_core_dev *mdev, void *context) struct mlx5_ib_dev *dev = context; enum rdma_link_layer ll = mlx5_ib_port_link_layer(&dev->ib_dev, 1); + mlx5_ib_devx_cleanup_event_table(dev); mlx5_ib_cleanup_congestion(dev); mlx5_remove_roce_notifier(dev); ib_unregister_device(&dev->ib_dev);