From nobody Wed Sep 16 14:13:26 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 4hlLTM1RJYz6rXS0 for ; Wed, 16 Sep 2026 14:13:27 +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 4hlLTL5rgBz3NKF for ; Wed, 16 Sep 2026 14:13:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789568006; 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=zg0AtbgQJE+hBRwsMyuALpgLT1f+UDYntmRJ2GH4d1M=; b=LTDr+52g6N9EZA44Ddh9H3FAhSLmQnFzyjEdh6C3LL8fXUnFlt6xqDNSGmJyHneNhmJ7Tg g5kNC1Wc6Ec7UBhdc6/opMJsnYLfop15GIHBNSvA2yAQyWLFBSh1ETr758wu60phQ24ocs ZSXe04lGr+Im2Vn3emj0nBzBVfHIv4A14VSOPDrvotFePAb9dLoMHrVhypeUtLdm1XZUdd jg4W4wOqhabQ4bE2B5aJX8XqR4kzoCbo0MUaBZG7vRPFWpBmUBE/oiMSlmN8Xm4gTr25Lf 2X5yvR8eYobP6qax9jg3MTAR8iepguWsh+i5cso+PqWMU6lBgZIU9w49lBgf0A== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789568006; b=PgHh/d8HtKfrkuhDsiDfybf2r2IlBTrs4Iun1rU7lBrhjkukkyKk04WEedk3r6Emg9XcNM EsC6M1DkeYEwN0JnnvoqHqTEiaT8IsMsT68C0dbddMgfaYQvzgVbcxKA27+CscgbVAe2wc W94wp07IwRP2L4qWQyLZz5UY1sTa2OJs+sZ3RNhhOuHiY6QN+ZUhIyTOck4GgoXo7QJ7w3 1mxALxkpgSHFvYF49WUMyFIXFlZvJPaRMZCwcQcRohKxzIlsebiHLJLaZ+mSTr+3rIDfbR NzUq9K/ixHfn/dGfF17xDivG68GbmkOofIAvrp8ZzgbRpimHBMOEPvPBcL70dw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789568006; 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=zg0AtbgQJE+hBRwsMyuALpgLT1f+UDYntmRJ2GH4d1M=; b=AmREUFDuMUfL7rixAyB0VZhPiMFqLpWPsiUV45U3N7xf/X8PrEWNa+F7lJaVFou9+HU2FR znUyUyJnaq/KoLS5b5Ve7Ooh/tYiauHJQIGt3JFzQF4rRy+dGCTdPHecICAXHO3mqveKdH fUocptj3l7BXQ6roz4VXiVogRAiPiw5PcDtORO+qJG41QkyFu9KXNCv9q22MZ14zPS+1n0 uWhYtSek9oIQRU6CL9jpSTZydbNuxbfohpH2FLH9ofZh9n1LPng4jk9Tyy2RXkqyNZGPUl mBHZ3NcZwJX+1TtD54uGJ4MB0CJbMvuJupdvzNs0QzL2TF8IYq+cfzkxdoINNg== 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 4hlLTL4x8pzr0g for ; Wed, 16 Sep 2026 14:13:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3717e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 16 Sep 2026 14:13:26 +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: a2703fef5cbe - main - fixup! verbs/mlxs: mlx5: Add tunnel offloads support in direct verbs 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: a2703fef5cbe66be3bff971bcbdd9d328b3029ef Auto-Submitted: auto-generated Date: Wed, 16 Sep 2026 14:13:26 +0000 Message-Id: <6aaaa406.3717e.16dcb29c@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=a2703fef5cbe66be3bff971bcbdd9d328b3029ef commit a2703fef5cbe66be3bff971bcbdd9d328b3029ef Author: Ariel Ehrenberg AuthorDate: 2026-07-28 12:02:54 +0000 Commit: Konstantin Belousov CommitDate: 2026-09-16 14:12:10 +0000 fixup! verbs/mlxs: mlx5: Add tunnel offloads support in direct verbs Fix is based on upstream rdma-core commit ee54f9d5348f ("mlx5: Add loopback flags to QP creation"). Validate create_flags against a supported-flags mask instead of rejecting anything that is not MLX5DV_QP_CREATE_TUNNEL_OFFLOADS. A create_flags of 0 is now accepted, unknown bits are rejected, and the vendor flag is OR-ed in rather than assigned. The loopback flags that commit also adds do not exist in this tree, so only the validation is taken. Sponsored by: NVidia networking MFC after: 1 month --- contrib/ofed/libmlx5/verbs.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/contrib/ofed/libmlx5/verbs.c b/contrib/ofed/libmlx5/verbs.c index 5e91dcaf5f7a..a0c6111ff107 100644 --- a/contrib/ofed/libmlx5/verbs.c +++ b/contrib/ofed/libmlx5/verbs.c @@ -1265,6 +1265,11 @@ enum { MLX5_DV_CREATE_QP_SUP_COMP_MASK = MLX5DV_QP_INIT_ATTR_MASK_QP_CREATE_FLAGS }; +enum { + MLX5DV_QP_CREATE_SUP_FLAGS = + (MLX5DV_QP_CREATE_TUNNEL_OFFLOADS), +}; + enum { MLX5_CREATE_QP_EX2_COMP_MASK = (IBV_QP_INIT_ATTR_CREATE_FLAGS | IBV_QP_INIT_ATTR_MAX_TSO_HEADER | @@ -1318,15 +1323,17 @@ static struct ibv_qp *create_qp(struct ibv_context *context, if (mlx5_qp_attr->comp_mask & MLX5DV_QP_INIT_ATTR_MASK_QP_CREATE_FLAGS) { - if (mlx5_qp_attr->create_flags & - MLX5DV_QP_CREATE_TUNNEL_OFFLOADS) { - mlx5_create_flags = MLX5_QP_FLAG_TUNNEL_OFFLOADS; - } else { + if (!check_comp_mask(mlx5_qp_attr->create_flags, + MLX5DV_QP_CREATE_SUP_FLAGS)) { mlx5_dbg(fp, MLX5_DBG_QP, "Unsupported creation flags requested for create_qp\n"); errno = EINVAL; goto err; } + if (mlx5_qp_attr->create_flags & + MLX5DV_QP_CREATE_TUNNEL_OFFLOADS) { + mlx5_create_flags |= MLX5_QP_FLAG_TUNNEL_OFFLOADS; + } } }