From nobody Mon Jul 20 20:53:29 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 4h3t5k3f77z6dPm1 for ; Mon, 20 Jul 2026 20:53:30 +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 4h3t5k0n4Hz4725 for ; Mon, 20 Jul 2026 20:53:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784580810; 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=xJDtzySsGF2b5gFBlchaAUossaocsiV+r3b2+GAyU+E=; b=i1K+k8si8WouLz0PvTsR7fDPzgd2+zUWCJ1ibxjR/Kj5FS4nyFOdBo4AsjjCpa3VANkLcb zCI1iWTh8stZxt6GizWHmXQEKVLthVX1gqcD0vpL2/oqjhMlvI7A+eLLrleH234gRm+x8D 8f5LBnx9nRbs14Yk5B8uFjqkESf0A8zU5Fv+waljSDkXlSuIDMx4JHnwKRt8EEmkH0JMU5 LHWS6k73uF7/MVAPtnwUV3UNQjjHGhnXAOvC0skmxd1loA5Ue4oGraah+v9EM9xdz6FHBU HjanWkgDd5hBPsaUYzzXplu8I6fJpKtz2dVrGn/CCfFqMjFVosGwmAxwcmnZwg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784580810; a=rsa-sha256; cv=none; b=h7Hb47dCYDXo7oezdUqP0ow1LMPmrbTl2WDn264zBQvFy1HfqJxY2Gr9zlBXTxS7Iw818a U1//X7czYRZgECsbGBqlo2+OwgX0wyI+JB9LwqbrgNR8oSe49ivkUs5xiuaT9uj4hxUhxM vbe9bM14XQj61CGlwax751z2/A68/Mpio+pPt0SwTDaZwjqK1HL3Ml0rLzuG2yUtMaPc2J LfudwIWHjWaPRuMds2OJlAgmP3ZRldc6V+G8aLJpmT85ldhnz4truqQ7qd83eer/sspSr1 RT5YtKUxSZoKFXbt7ZOREkUfwmos6Acu/mDgORn5U0lsuqRq5N3ZrOH9JWbvBA== 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=1784580810; 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=xJDtzySsGF2b5gFBlchaAUossaocsiV+r3b2+GAyU+E=; b=k0ZaIwvwWOY2lngmHX3CvtejfJOJjSH7CQlfckpnoUW4K447bgNYnlPEt0MYlXhEK4f7cS ZxA2N/222UwRv1jVlLVxm5ZO7mz3gW5y2eHdGCIIx5At7J2A4iGyENuc2KunynQgOu9Zfu p7C7Gm7OHhjB/Bdeo54UlnZCdTxgZviyIKmXpWS68R6aQzaUoZkd7Afqpz3VhL0rzze2+R 4bHmMZnhxs5NUunDthAYyS10sxmJd45mwj33uR22kTzqJZWw/4N6W17lL4LzoB7sdSQKKp xwL/9SMLUvtfYdbpVfEaSxm6npuOq0gLz+sN/0KdS9k05TvR0QLAtJnleLHouQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h3t5j57p5z33k for ; Mon, 20 Jul 2026 20:53:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c633 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 20 Jul 2026 20:53:29 +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: f7280623cdfe - stable/15 - 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/stable/15 X-Git-Reftype: branch X-Git-Commit: f7280623cdfe24bf7cc28fe7d5c5f03fa10f9650 Auto-Submitted: auto-generated Date: Mon, 20 Jul 2026 20:53:29 +0000 Message-Id: <6a5e8ac9.1c633.6b8787ad@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=f7280623cdfe24bf7cc28fe7d5c5f03fa10f9650 commit f7280623cdfe24bf7cc28fe7d5c5f03fa10f9650 Author: Ariel Ehrenberg AuthorDate: 2026-06-09 11:20:23 +0000 Commit: Konstantin Belousov CommitDate: 2026-07-20 20:26:05 +0000 mlx5_ib: register DEVX objects in the uverbs ioctl parse tree (cherry picked from commit 705d6cf4bf25f7b87f017322e04c6a1a37f1fac0) --- 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 c2c4bc5d2791..7e370ba004e7 100644 --- a/sys/dev/mlx5/mlx5_ib/mlx5_ib.h +++ b/sys/dev/mlx5/mlx5_ib/mlx5_ib.h @@ -1082,6 +1082,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 cf1e5f4324d8..b79072e2eaa7 100644 --- a/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c +++ b/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c @@ -3328,6 +3328,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; @@ -3402,6 +3407,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 = @@ -3567,9 +3573,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) @@ -3596,7 +3611,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: @@ -3628,6 +3645,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);