From nobody Wed Sep 16 14:12:41 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 4hlLST4xt6z6rWKg for ; Wed, 16 Sep 2026 14:12:41 +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 4hlLST3GK7z3Lfs for ; Wed, 16 Sep 2026 14:12:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789567961; 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=tXmqVBA5Ry+rktOFDcP7oZBqHo95VEsyFttn+VW7H90=; b=GoaTn1L738x88iyA/54MG4hkuGijNlmccsw4LzG3PIoudK2G7zM/stP0C8hFHWZL6EotL9 +sCVrjc63Fxj6gkJNFifplCWmMnhMGMix/voXDc3avsP4+Hl5gko05yXqP93jtBcH1i0jr 61h9Ez8nVJIQIS6+eMMWkvxcXakFqukP0tzpAAg8rqeY5ivr9X5Nk9vhnzMX7nNd+a434x dK2P/RQnsalQT2AzY2u6FTdL0Wg6Q14X5bQWC0aBJ8uquADH9PRhsu8dnM2xdWrp5LodSr PdtfEOmFJ22BbGdNH8wvdXcb889CNHGJmUKjaXlBuIMA5PXzef86S01Kpfrdbw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789567961; b=QKThVn2HQ/4AirX/VaCeLZ3pM60NNB2SySThlUWPRR60BI9LONWj/gegLU2sz9madjVfh/ bwDoustktkAxXAHsrFELx/IYQ2BKBwP434dGiozz2ymMTq5zbPyW36Z+4fZBX/cIg9mYTH g4Z15UtG9iZgpCTwXZY2MlM731Xmb+8dC/oHn46YxDwL70M58Ov2TjAxvkf3ljf0HUwtkJ TOxQEIVzWVPGES6QVJIqjcICZN2a/gDwP0X3QiInaeZaOJbyuLnHkPHSdROuwwwnSvYxyq T3WWwfAyLWdlMjigPE09mMoYmCbI75T7F3hxdnG0rHFN5OmAmqmRhtVG7DWPYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789567961; 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=tXmqVBA5Ry+rktOFDcP7oZBqHo95VEsyFttn+VW7H90=; b=R3rMM5b/035iRlB3WiG4v8wtk1O3AMO8UEII4V387f6cA9UQNK3NS8WBFQnPUpKJxVDads Z0d7JdZyBUxNO5PwtuDWU4egKp1cWza8sMMqaalyjsfC9DNqDDR3eMkBucQIRCnnK2iYnC /AMZ8dweiOK9uqYOVx5zE2f/VBz2o8u2kvTMRkCHqYD9kYq+6NtFXLVderns8iOPlwop08 9A7xekJ9OFGgbHg0vyX9DSWHgLrv9hP2eJakP/TaHX9ui3mESqyAcQoeUk10UZjc+7cvFw fAS/N0PyCXnQiOdKWawqOrfdTaRyPwk0DACFmB+zZfZ3oVU6a0Lmr6xyRWmNGQ== 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 4hlLST2KYTzqH2 for ; Wed, 16 Sep 2026 14:12:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37f05 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 16 Sep 2026 14:12:41 +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: 8ef9c7dbd706 - main - fixup! IB/mlx5: Enabled VLAN stripping capability 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: 8ef9c7dbd706148bc38b820159c3a6c0324ec041 Auto-Submitted: auto-generated Date: Wed, 16 Sep 2026 14:12:41 +0000 Message-Id: <6aaaa3d9.37f05.789fcffc@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=8ef9c7dbd706148bc38b820159c3a6c0324ec041 commit 8ef9c7dbd706148bc38b820159c3a6c0324ec041 Author: Ariel Ehrenberg AuthorDate: 2026-07-28 12:02:37 +0000 Commit: Konstantin Belousov CommitDate: 2026-09-16 14:12:06 +0000 fixup! IB/mlx5: Enabled VLAN stripping capability Fix is based on upstream Linux commit 2978975ce7f1 ("RDMA/mlx5: Process create QP flags in one place"). Add IB_QP_CREATE_SCATTER_FCS and IB_QP_CREATE_CVLAN_STRIPPING to the create_kernel_qp() allowlist, so a kernel RAW_PACKET QP using these flags is no longer rejected with -EINVAL even though create_qp_common() supports them. The flags arrived in 358e42ea66e2 and e4cc4fa7cca9, neither of which updated this mask; upstream only fixed that later, as part of a much larger refactor that is not worth importing, so the minimal equivalent is done here. Sponsored by: NVidia networking MFC after: 1 month --- sys/dev/mlx5/mlx5_ib/mlx5_ib_qp.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/dev/mlx5/mlx5_ib/mlx5_ib_qp.c b/sys/dev/mlx5/mlx5_ib/mlx5_ib_qp.c index 4997f29488e1..afa4ca5456d8 100644 --- a/sys/dev/mlx5/mlx5_ib/mlx5_ib_qp.c +++ b/sys/dev/mlx5/mlx5_ib/mlx5_ib_qp.c @@ -929,6 +929,8 @@ static int create_kernel_qp(struct mlx5_ib_dev *dev, if (init_attr->create_flags & ~(IB_QP_CREATE_SIGNATURE_EN | IB_QP_CREATE_BLOCK_MULTICAST_LOOPBACK | IB_QP_CREATE_IPOIB_UD_LSO | + IB_QP_CREATE_SCATTER_FCS | + IB_QP_CREATE_CVLAN_STRIPPING | MLX5_IB_QP_CREATE_SQPN_QP1 | MLX5_IB_QP_CREATE_WC_TEST)) return -EINVAL;