From nobody Mon Sep 21 19:46:30 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 4hpYdf2vthz6t5Cg for ; Mon, 21 Sep 2026 19:46:46 +0000 (UTC) (envelope-from oliver.pntr@gmail.com) Received: from mail-yx2-x11.google.com (mail-yx2-x11.google.com [IPv6:2607:f8b0:4864:41::11]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hpYdd4WLvz4QHs for ; Mon, 21 Sep 2026 19:46:45 +0000 (UTC) (envelope-from oliver.pntr@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20251104 header.b="R/1zB6ap"; arc=pass ("google.com:s=arc-20260327:i=1"); spf=pass (mx1.freebsd.org: domain of oliver.pntr@gmail.com designates 2607:f8b0:4864:41::11 as permitted sender) smtp.mailfrom=oliver.pntr@gmail.com; dmarc=pass (policy=none) header.from=gmail.com Received: by mail-yx2-x11.google.com with SMTP id 956f58d0204a3-66e4aa8d881so3511248d50.1 for ; Mon, 21 Sep 2026 12:46:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1790020003; cv=none; d=google.com; s=arc-20260327; b=qT0ERUCeJUsUTsBvUzwgJuS8TRLnLHlAht33swhkyuFCCyx9Q3NKsnIvTxENpC80+H NK57ZsT7rLlsl9ODbTnUP5cNkg9G5IQrnKO6S5B7cVUmimoWE0syPKA+gLryhJaFpRiA YI9g+lK3gpDzDfZBtioOYs9OO/Lp2dZT4xApDE05q7HkkG2OV/9e2I+UXgYLzIzgtEMP 0G6kbe8TOgNHMY1R0EoTwL1kaRKMdO4rnTYwaSEsTdVgsNvHRZGeS+z/P1gKGe/1BIRX aV95IVCxympEFBpGidII945Qoy0rL2Huepv3REO1JuZRLLC8gsxqX78l23wWzhHDIWEn XlwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:dkim-signature; bh=4nlIldkrbAu2P/eaTcPXnDkXxejy/XY9Q9MnR1yVJH8=; fh=LHVu+s02r3IhybYwzAV34aIWU5M5x1NNIKQfzdEAYrU=; b=e+jZx4dtdQyPL1IAY4r77nWkX25HfoSZeXDVVGVftw6wQjqffRVjMjh5sbJQp/pQBM NzvsFu7Ayaj+jfePI2u3L4aqCwXeJYD1RGzbNIDMB86lNIAxXqpmdz0R06ob4OqicTT5 4y/azDgHgBkRzoJ1vr7M+UDVOTNXeCNoNz/s2ql+aOUT6uIPbGVSK+k+NbJg9QsjW1Jm wGK8hT5lit4FpR1YxnPSqeZ2VzU2hTjei0RKyqhUCBpJremeU53TVaqdkTGPNXsHrRZL DdTO3DGSZz3mqQT27VOYeWOBRkzxMo7Vmm4ioyso8bh3gpeVbVAE76NuEVu9D9xrlJoL 909A==; darn=freebsd.org ARC-Authentication-Results: i=1; mx.google.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1790020003; x=1790624803; darn=freebsd.org; h=content-type:cc:to:subject:message-id:date:from:in-reply-to :references:mime-version:from:to:cc:subject:date:message-id:reply-to :content-type; bh=4nlIldkrbAu2P/eaTcPXnDkXxejy/XY9Q9MnR1yVJH8=; b=R/1zB6apw19hyhtc0ANhLvpF3sWcv8e+I9OFGSoLIvtPo/WIW/pgyR3p89awYl+X2z Z+2ZvZOCNOWLXl8s0JFnxsuAivrqbiAeY7B/2BhkCYxienzq5tErz/kgXM5kkzu/9kCR FatsjcFbicWyuORVWioIVKnefHtppDbdDLMfG02HOERgEx9Pyetnz/HlOVRbgVvehwul yVkWVrQO5qAjteIJ1ewCK2EMxiGQqewA1B0HzOpTRS10hVMCMRMQuzumGlufTgSs/k2C b8KwPGHOiGNHkmC//Y8zxFuuyO4BklqbViikKwW6L7135fNu/nzob5cRxCphVs1+U4n4 ZdgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790020003; x=1790624803; h=content-type:cc:to:subject:message-id:date:from:in-reply-to :references:mime-version:x-gm-gg:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to:content-type; bh=4nlIldkrbAu2P/eaTcPXnDkXxejy/XY9Q9MnR1yVJH8=; b=Vv4O2a8HNnZhbCrrhuG5xxocuLF6lm0KUD8FfsdLtBt9sbJ65y4hgrznqv2NM9pTdZ GvWpxc+rXVC5pF4KNN7j69pFM56K+uTfn6h68Tmu55ZQdkVkRUH/SMBaccN1YjPyudeo pwTfJGiCRNRI9NyLuh4CTj8XUTVBWLs/i66kO3lQjwcVhRihs8MWqmhJy9CVHb98XiHS soKZsnz5e8FPW7bOV4hW+Ok0Kgf08vfy59f0Hv9uAtEEj4PInUfcZnXfniGBpZqQXfbL ssPJRH9UpfCivkHoaGG/WrngmtdhQeliVdZlQNUnOrlqlGene+u5ZbrqrPh+tC1+4Iy0 qN/g== X-Forwarded-Encrypted: i=1; AKwUvBwOdx64FUc5NkDN4VsQSsit1heO27nNCzVJTbhPQca9XDna5QTnIuA8vYc79Toz6SB4ykXjriJFHKV8zczHgobD6xyw@freebsd.org X-Gm-Message-State: AFuF++nSV4IDle7vEZjYyCVeSIzihtExlKVsUyiP/XtmC4p6ITL3hQd8 Be/xE7g4iwAz6n85GP9iPZDbawm7XHcnAu5Yfrz9345iyFs/yPfR+9Gsqmmbo9tttMD0HHhhUWe +bfVMvTZd7qtD+K63tf79vjdvNyGyzE0= X-Gm-Gg: AYBFou08m9ZBy7Iu1bIykoXiezyGUCaWWJf724NMMxA6idkA6CnCtS5Z0OY8t5KzOua dJEDKw/UP/U1dXoiPLR3f1gR3SWGPsx+2DAwEWCxOR7anRnspgHcipbjj+HZhMux3eyYKxvTRHe EsAHqHawwnaYie6GhVuO/3hQrNEQFcLVOFRLTGUg6SHsA1C6eduSSNJ5h7VsYqsgf4MjMuIhlBD prwel0Ck7aJw03JEgOOV0uoWseI6brCQtUhsBGg9HGUvrSRNM8ZHAr1bWV58Zb52BP0jpnVScnT huBTXKe3qORyxfiTq9bRj+AjRz1tJKKW8o2WyKkLHaWwLWISGhHBf/FtDI+8fLHQVy4PfcNi X-Received: by 2002:a05:690e:4183:b0:671:27a:df14 with SMTP id 956f58d0204a3-6717fc74349mr3633589d50.20.1790020003265; Mon, 21 Sep 2026 12:46:43 -0700 (PDT) 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 References: <6aaaa408.35fdc.49134488@gitrepo.freebsd.org> In-Reply-To: <6aaaa408.35fdc.49134488@gitrepo.freebsd.org> From: Oliver Pinter Date: Mon, 21 Sep 2026 21:46:30 +0200 X-Gm-Features: AcwNN1WM6i9o4N4vz1M5YpGILa2AlPn2Z0ecXC4EZnd_ruWqmCOeo2uBCU7uXlY Message-ID: Subject: Re: git: 966d4c21b186 - main - fixup! IB/mlx5: Expose GRE flow spec to user-kernel ABI header To: Konstantin Belousov Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, Ariel Ehrenberg Content-Type: multipart/alternative; boundary="0000000000006f8181065c03825d" X-Spamd-Bar: -- X-Spamd-Result: default: False [-2.00 / 15.00]; ARC_ALLOW(-1.00)[google.com:s=arc-20260327:i=1]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20251104]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4864::/56]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; RCVD_COUNT_ONE(0.00)[1]; TO_DN_SOME(0.00)[]; MISSING_XM_UA(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; FREEMAIL_ENVFROM(0.00)[gmail.com]; FREEMAIL_FROM(0.00)[gmail.com]; MID_RHS_MATCH_FROMTLD(0.00)[]; SUBJECT_HAS_EXCLAIM(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org]; TO_MATCH_ENVRCPT_SOME(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_FIVE(0.00)[5]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; RCVD_TLS_LAST(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-all@freebsd.org]; ALIAS_RESOLVED(0.00)[]; DKIM_TRACE(0.00)[gmail.com:+] X-Rspamd-Queue-Id: 4hpYdd4WLvz4QHs --0000000000006f8181065c03825d Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hi Konstantin! Are these fixup! patches intended? On Wed, Sep 16, 2026 at 4:21=E2=80=AFPM Konstantin Belousov wrote: > The branch main has been updated by kib: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3D966d4c21b186dfafda58d3d586fbe7f= 02299fb5e > > commit 966d4c21b186dfafda58d3d586fbe7f02299fb5e > Author: Ariel Ehrenberg > AuthorDate: 2026-07-28 12:02:55 +0000 > Commit: Konstantin Belousov > CommitDate: 2026-09-16 14:12:10 +0000 > > fixup! IB/mlx5: Expose GRE flow spec to user-kernel ABI header > > Import Linux upstream commit a93b632c4531 ("IB/mlx5: Fix GRE flow > specification"). > > Honour the user-supplied GRE protocol mask instead of hard-coding > 0xffff, > so wildcard and partial masks work. > > Also give flow_spec_data[] 8-byte alignment, so this userspace copy o= f > struct ib_uverbs_flow_spec_hdr matches the kernel UAPI on 32-bit > builds. > The kernel header has always used __aligned_u64 here and only our cop= y > diverged, so there is no upstream commit for that half. The attribut= e > is > spelled out instead of introducing an __aligned_u64 macro, which > does not provide and which libbnxtre already > defines > for itself. > > Sponsored by: NVidia networking > MFC after: 1 month > --- > contrib/ofed/libibverbs/kern-abi.h | 2 +- > sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/contrib/ofed/libibverbs/kern-abi.h > b/contrib/ofed/libibverbs/kern-abi.h > index 74cf407840e9..d5ed405d08c7 100644 > --- a/contrib/ofed/libibverbs/kern-abi.h > +++ b/contrib/ofed/libibverbs/kern-abi.h > @@ -960,7 +960,7 @@ struct __ib_uverbs_flow_spec_hdr { > __u16 size; > __u16 reserved; > /* followed by flow_spec */ > - __u64 flow_spec_data[0]; > + __u64 __attribute__((aligned(8))) flow_spec_data[0]; > }; > > /* Define in rdma/ib_user_verbs.h after refactoring OFED - start */ > diff --git a/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c > b/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c > index f9c2c2a1b310..306116a7eee7 100644 > --- a/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c > +++ b/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c > @@ -2209,7 +2209,7 @@ static int parse_flow_attr(u32 *match_c, u32 > *match_v, > IPPROTO_GRE); > > MLX5_SET(fte_match_set_misc, misc_params_c, gre_protocol, > - 0xffff); > + ntohs(ib_spec->gre.mask.protocol)); > MLX5_SET(fte_match_set_misc, misc_params_v, gre_protocol, > ntohs(ib_spec->gre.val.protocol)); > > > --0000000000006f8181065c03825d Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hi Konstantin!

Are these fixup! patches= intended?

=
On Wed, Sep 16, 2026 at 4:21=E2=80=AF= PM Konstantin Belousov <kib@freebsd.o= rg> wrote:
https://cgit.= FreeBSD.org/src/commit/?id=3D966d4c21b186dfafda58d3d586fbe7f02299fb5e
commit 966d4c21b186dfafda58d3d586fbe7f02299fb5e
Author:=C2=A0 =C2=A0 =C2=A0Ariel Ehrenberg <aehrenberg@nvidia.com>
AuthorDate: 2026-07-28 12:02:55 +0000
Commit:=C2=A0 =C2=A0 =C2=A0Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2026-09-16 14:12:10 +0000

=C2=A0 =C2=A0 fixup! IB/mlx5: Expose GRE flow spec to user-kernel ABI heade= r

=C2=A0 =C2=A0 Import Linux upstream commit a93b632c4531 ("IB/mlx5: Fix= GRE flow
=C2=A0 =C2=A0 specification").

=C2=A0 =C2=A0 Honour the user-supplied GRE protocol mask instead of hard-co= ding 0xffff,
=C2=A0 =C2=A0 so wildcard and partial masks work.

=C2=A0 =C2=A0 Also give flow_spec_data[] 8-byte alignment, so this userspac= e copy of
=C2=A0 =C2=A0 struct ib_uverbs_flow_spec_hdr matches the kernel UAPI on 32-= bit builds.
=C2=A0 =C2=A0 The kernel header has always used __aligned_u64 here and only= our copy
=C2=A0 =C2=A0 diverged, so there is no upstream commit for that half.=C2=A0= The attribute is
=C2=A0 =C2=A0 spelled out instead of introducing an __aligned_u64 macro, wh= ich
=C2=A0 =C2=A0 <infiniband/types.h> does not provide and which libbnxt= re already defines
=C2=A0 =C2=A0 for itself.

=C2=A0 =C2=A0 Sponsored by:=C2=A0 =C2=A0NVidia networking
=C2=A0 =C2=A0 MFC after:=C2=A0 =C2=A0 =C2=A0 1 month
---
=C2=A0contrib/ofed/libibverbs/kern-abi.h=C2=A0 | 2 +-
=C2=A0sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c | 2 +-
=C2=A02 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/ofed/libibverbs/kern-abi.h b/contrib/ofed/libibverbs/k= ern-abi.h
index 74cf407840e9..d5ed405d08c7 100644
--- a/contrib/ofed/libibverbs/kern-abi.h
+++ b/contrib/ofed/libibverbs/kern-abi.h
@@ -960,7 +960,7 @@ struct __ib_uverbs_flow_spec_hdr {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 __u16 size;
=C2=A0 =C2=A0 =C2=A0 =C2=A0 __u16 reserved;
=C2=A0 =C2=A0 =C2=A0 =C2=A0 /* followed by flow_spec */
-=C2=A0 =C2=A0 =C2=A0 =C2=A0__u64 flow_spec_data[0];
+=C2=A0 =C2=A0 =C2=A0 =C2=A0__u64 __attribute__((aligned(8))) flow_spec_dat= a[0];
=C2=A0};

=C2=A0/* Define in rdma/ib_user_verbs.h after refactoring OFED - start */ diff --git a/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c b/sys/dev/mlx5/mlx5_ib/mlx= 5_ib_main.c
index f9c2c2a1b310..306116a7eee7 100644
--- a/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c
+++ b/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c
@@ -2209,7 +2209,7 @@ static int parse_flow_attr(u32 *match_c, u32 *match_v= ,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0IPPROTO_GRE);

=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 MLX5_SET(fte_match_= set_misc, misc_params_c, gre_protocol,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 0xffff);
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 ntohs(ib_spec->gre.mask.protocol));
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 MLX5_SET(fte_match_= set_misc, misc_params_v, gre_protocol,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0ntohs(ib_spec->gre.val.protocol));


--0000000000006f8181065c03825d--