From nobody Wed Sep 16 14:13:31 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 4hlLTR4FKbz6rXS7 for ; Wed, 16 Sep 2026 14:13:31 +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 4hlLTR1gdNz3NNc for ; Wed, 16 Sep 2026 14:13:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789568011; 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=KlQqaWbdqVGfL8OPAA11njfhff2Kz8da43B7Dt9e7x4=; b=vRXV6dHNk5v9fLTeanOVWhIX0tShhd54FmD08anNk8/webE2rOYVr6oe+XsVptifqs6pkn OvzE9dsQj9lMwVZBo/Q4Es86GvI3dDUGglhhyG/GaC4V8ng+kXBIQAEmYjR3rWS61rDaM6 UY40ijKatOj8F6WMNukI0Qszm+B6734mSfhX7ybvkpLrXeIKyOItHmN21qg4e/Y6CI0uQ+ CtfeM7HPuGx1vU1+NwpVlA8kriXtvPcCiEslhknOmPMbVzotarwSF2r8Ds950leQaIswV1 zvRK17WgTL6s2RdpSw4091+90vosmSH6chwW8c8EEzj96J5AN752URZuSj78Cw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789568011; b=Xw1JDxqecuKt2Wap/CZxce2FScMJC4jZ5S5QBq6MUl3njFq4EE19U03b3LvW0rRa7n9prr XZUZBeKrJWjqVp8Car+gyHH8K81+YP7eixirs8KyvfJy6t8L8xdazf4OWPbii3XSrVT+OS 55gE993HbAPfN0w7HK+O8oJucj9xu9Oo2/VMpnzaYdMJ6+LewxgU4s2d8xMFdN4aOH6u6o tIJtpocfqz9t13rvBHVTD7WS3ZRqZmiyV7/69m09iy6LiKaLrhCaphzzSYHQFHHrBPTr/7 BO4BStP621VPmpyccRWxqGpssxSPGVvO8ae0JjLKeW+16MweBQe4tcjNWad0xg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789568011; 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=KlQqaWbdqVGfL8OPAA11njfhff2Kz8da43B7Dt9e7x4=; b=HKUndcj51SgcyFOY7Y+2rNAZ1/rplkWu6iu8oc8iNe76GEv/v9lev7FeIzGU3+MyaDsLbb 3y2BesITmAFlEC4jAC45D1jsxx+IL9H+RfRU0/9vVq2hi0EgrnS1Ei8ANbqs3dPcNfySPa NTy/Sy7dVtjPwiON9OS3a0z6lrP+4YLuWsNTDcJltB/pbbdfXEpjxQ06bK6UU1N97HF+BR gQm157tQZyvkNbntYCIEK1MOGNhpzlmzVGVQVZR0Ccuo6K9hOGw0+VG237bEMRVLiQg3bK jxcgjfoZPnkYrG7HOO3YUzjlN3qR8ClSLxFoPeBzkcSqVxBZhQvQLIfYhiT7fg== 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 4hlLTR0mjbzqX3 for ; Wed, 16 Sep 2026 14:13:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36ee8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 16 Sep 2026 14:13:31 +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: 6ff2d2d5d47e - main - fixup! verbs/mlx5: Add GRE and MPLS flow specification filter 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: 6ff2d2d5d47e53028bbfb48150c32cb0d128e58f Auto-Submitted: auto-generated Date: Wed, 16 Sep 2026 14:13:31 +0000 Message-Id: <6aaaa40b.36ee8.7238162f@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6ff2d2d5d47e53028bbfb48150c32cb0d128e58f commit 6ff2d2d5d47e53028bbfb48150c32cb0d128e58f Author: Ariel Ehrenberg AuthorDate: 2026-07-28 12:02:56 +0000 Commit: Konstantin Belousov CommitDate: 2026-09-16 14:12:10 +0000 fixup! verbs/mlx5: Add GRE and MPLS flow specification filter Import rdma-core upstream commit ff01da2c5ac2 ("verbs: Fix typo in copying IBV_FLOW_SPEC_UDP/TCP 'val'"). The TCP/UDP filter value was copied using the size of the IPv4 filter, overrunning the destination subobject. Also accept inner MPLS flow specs, matching 6d6f29721eea ("verbs: Allow creation of inner MPLS flow spec"). Upstream deliberately has no inner case for GRE - it is a tunnel header, matched only in the outer stack - so that part of the review comment is not applied. Sponsored by: NVidia networking MFC after: 1 month --- contrib/ofed/libibverbs/cmd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contrib/ofed/libibverbs/cmd.c b/contrib/ofed/libibverbs/cmd.c index 9c79757f0e60..e165923184c8 100644 --- a/contrib/ofed/libibverbs/cmd.c +++ b/contrib/ofed/libibverbs/cmd.c @@ -1910,7 +1910,7 @@ static int ib_spec_to_kern_spec(struct ibv_flow_spec *ib_spec, case IBV_FLOW_SPEC_UDP | IBV_FLOW_SPEC_INNER: kern_spec->tcp_udp.size = sizeof(struct ibv_kern_spec_tcp_udp); memcpy(&kern_spec->tcp_udp.val, &ib_spec->tcp_udp.val, - sizeof(struct ibv_flow_ipv4_filter)); + sizeof(struct ibv_flow_tcp_udp_filter)); memcpy(&kern_spec->tcp_udp.mask, &ib_spec->tcp_udp.mask, sizeof(struct ibv_flow_tcp_udp_filter)); break; @@ -1922,6 +1922,7 @@ static int ib_spec_to_kern_spec(struct ibv_flow_spec *ib_spec, sizeof(struct ibv_flow_gre_filter)); break; case IBV_FLOW_SPEC_MPLS: + case IBV_FLOW_SPEC_MPLS | IBV_FLOW_SPEC_INNER: kern_spec->mpls.size = sizeof(struct ib_uverbs_flow_spec_mpls); memcpy(&kern_spec->mpls.val, &ib_spec->mpls.val, sizeof(struct ibv_flow_mpls_filter));