From nobody Wed Sep 16 14:13: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 4hlLSy0rNGz6rXCd for ; Wed, 16 Sep 2026 14:13:06 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hlLSx5xyGz3MTf for ; Wed, 16 Sep 2026 14:13:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789567985; 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=rj+DrOtBJnp5L4jmsOPdjFRimT4L/ZeQab2mwM4WjSo=; b=qJPiJNdipufefHs36XTMOQnk4YC736LOisIs1ILeyUN+5K5dLmnAvr8PECWa0/BWLYy1CQ 1MfIN8GFKNBMkjLLqTiOEDF7vrXzRXD1mgZ68vei/uhmO3P9YbT3+QACmpOrl98T4qta09 iuwAQro3Qz4Zhk8hcYNS0TWvBwElAe3OBihpzUbnQYDsVZoOWxetzzvdlDkQYv6bgbVfr6 OOyp8lEaONmpm+0eC49fU9azsTr2AkOihjwBxhx+ptpnEt9KaT/vRZ7sxjzpB5RQPQPwd8 yVwdOaONGQn0Qpq0fIKvF95Po8Wzt7Ful00E0NnNFQllbIHLTVktLmHrbwKn7w== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789567985; b=wrw4KZC3sixNvXGYO0dPF0rXYgSTVvvR6N5GK5WJxW9mBOBYrkK2nhvJxCqXHxTBg0d7lR kErpPzoKLNMKdODzBOAsqkqD5swPKbG5OS8wCavCcggY+TS5vGv4m+ek/hazV8SvsETAmV +3GkgOoRnGlbTryx8xhppJvnTH0Mq360j4oO3A6s9XFa8a12SWvcQ9/lzTWO5I/YWyLApD WL+WPvYLRTZEs/qNdifjnO4gC05QbI1y1V2JIhXcDaXySx2vz5VOBrHLRDQ6hIa5EBqngi SObl+xgWAAyQtgzSq4ezARjkEfDt+QjpnYsGGqehkj2zm/ByCaYD1mUkX7CAjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789567985; 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=rj+DrOtBJnp5L4jmsOPdjFRimT4L/ZeQab2mwM4WjSo=; b=yoyXdPMd1G6Jm43thAfPwn+7QYcFD9kLroZWIy4VdPvbkmLjkMHrCgHLR1vRDNQr75jQe1 TXJ2iGkP6kF0yi/5c8tl3FT2fWgFyq7C2t5Pc0h/ISeFYFQg3CSIS6YWcWTJr5NH7IUcmG dHVo3/ldPRbBtKkESWEbpnIDoGGxtOAa2+nAOPjCFMCrFn+38E34IeQCO/rjytLA7GXbNK Q89xBcSIVl9kAAO4KaadWIUd4+pUKZgbHagNP7IWiFhJC3XavQ8CAzrRmgjYby50tCTEjC w/MklCjmUclBpV3Rn5BdAg8mCkTisrFZvvuYM7leLxU+rBenBbPUsZxFRfR05A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hlLSx51Xczqyk for ; Wed, 16 Sep 2026 14:13:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 342ee by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 16 Sep 2026 14:13:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Vag Singh From: Konstantin Belousov Subject: git: 06690c34624c - main - libmlx5: Fix ABI break from revising the UAR pointer 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: 06690c34624c37998283ad87e24f50c97105ebbd Auto-Submitted: auto-generated Date: Wed, 16 Sep 2026 14:13:05 +0000 Message-Id: <6aaaa3f1.342ee.4c730663@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=06690c34624c37998283ad87e24f50c97105ebbd commit 06690c34624c37998283ad87e24f50c97105ebbd Author: Vag Singh AuthorDate: 2025-08-14 06:36:45 +0000 Commit: Konstantin Belousov CommitDate: 2026-09-16 14:12:08 +0000 libmlx5: Fix ABI break from revising the UAR pointer [PATCH 18/31] FreeBSD OFED support for DPDK MLX5 PMD Provide two implementations of mlx5dv_init_obj, one that has the historical behaviour that has existed until now of returning the void **uar and a new version that returns the 'void *' version renamed to cq_uar. Differential revision: https://reviews.freebsd.org/D32192 MFC after: 1 month --- contrib/ofed/libmlx5/libmlx5.map | 6 +++++- contrib/ofed/libmlx5/mlx5.c | 2 +- contrib/ofed/libmlx5/mlx5dv.h | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/contrib/ofed/libmlx5/libmlx5.map b/contrib/ofed/libmlx5/libmlx5.map index 6d9fb25f00a3..976b8cf35849 100644 --- a/contrib/ofed/libmlx5/libmlx5.map +++ b/contrib/ofed/libmlx5/libmlx5.map @@ -3,7 +3,6 @@ MLX5_1.0 { global: mlx5dv_query_device; - mlx5dv_init_obj; local: *; }; @@ -11,3 +10,8 @@ MLX5_1.1 { global: mlx5dv_create_cq; } MLX5_1.0; + +MLX5_1.2 { + global: + mlx5dv_init_obj; +} MLX5_1.1; diff --git a/contrib/ofed/libmlx5/mlx5.c b/contrib/ofed/libmlx5/mlx5.c index 56abaa965a6c..ef6c833c5a31 100644 --- a/contrib/ofed/libmlx5/mlx5.c +++ b/contrib/ofed/libmlx5/mlx5.c @@ -712,7 +712,7 @@ static int mlx5dv_get_cq(struct ibv_cq *cq_in, cq_out->cqe_size = mcq->cqe_sz; cq_out->buf = mcq->active_buf->buf; cq_out->dbrec = mcq->dbrec; - cq_out->uar = mctx->uar; + cq_out->cq_uar = mctx->uar[0]; mcq->flags |= MLX5_CQ_FLAGS_DV_OWNED; diff --git a/contrib/ofed/libmlx5/mlx5dv.h b/contrib/ofed/libmlx5/mlx5dv.h index 856b6c68558d..734303c1ca38 100644 --- a/contrib/ofed/libmlx5/mlx5dv.h +++ b/contrib/ofed/libmlx5/mlx5dv.h @@ -136,7 +136,7 @@ struct mlx5dv_cq { __be32 *dbrec; uint32_t cqe_cnt; uint32_t cqe_size; - void *uar; + void *cq_uar; uint32_t cqn; uint64_t comp_mask; };