From nobody Sat Sep 27 19:12:01 2025 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 4cYxsX4rh9z68YPx for ; Sat, 27 Sep 2025 19:12:16 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-pf1-x434.google.com (mail-pf1-x434.google.com [IPv6:2607:f8b0:4864:20::434]) (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 4cYxsW6bFhz3WLv for ; Sat, 27 Sep 2025 19:12:15 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-pf1-x434.google.com with SMTP id d2e1a72fcca58-781251eec51so849921b3a.3 for ; Sat, 27 Sep 2025 12:12:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1759000333; x=1759605133; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=AYjgvLVoQDIzJwkMgrD7XFSwvH+Uf/YnW0vb7gJCvCE=; b=RP7vzcaBpPxUbjyH7l9NUt5R2cMlrQP64lMLtJno/bsCp6dCV3i5ZV46Dvb/JOcQIl h+ZCuzvSbxWOdJL9aSXhmv3T+PqGMAZ8RLX9LGp+WucglNy30fHV5Q7IGwP0AAH7UZms oSJW6ugaAmHdEzQ5zb7O3c18ypj65LjMZZfHn+pykYW8L9dURR/eBY3AmTJb+jtWzL1Y sDVKt5ixxesYuvSp1gP+7DwXfLdo8sKqQtZazHQh0t6Hb8tp+Qr2NkTUqzYVG6onVvuh zZaKKcnNsixbLesRHcLIUOWD3SKZaP4OjGrHFhW/nwJ+gjkNl95V134/LzZc90nl6cit eaVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759000333; x=1759605133; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=AYjgvLVoQDIzJwkMgrD7XFSwvH+Uf/YnW0vb7gJCvCE=; b=Bs4XqPB7VhQQDHIOv2dy5QbMNkzURXZn11cbtDcmKr8xsMQhhbMkLJLMCeTHEBi0ek S/7DGamgG/8dCznxYKLjXHSYdQbgxe1BmNxTyrysT0xT3mQDWe2Fp7pvONufHXF3EzCa i1uhh/b5lgzF20ZWln3YHFmE9fA+QorIrzFdtFZoGsRv+Eu7cKyJyzmn3DFRS2RZaXax /eNzkk9w+66rSkD9aNX3COtqtN2kRnQAJIGE/gsWfS4xdJ+kCDPkPXN5citUmEXTV5gZ I69duk/NfIilC1VDpTJ0uDXSXdEsgxLdX7oCucCJYpSRu8beQtFh3h625nol59xJOl0g r0bg== X-Forwarded-Encrypted: i=1; AJvYcCW9yOmxox4hsrkDqKJnCzW4kom6V76ggqFDHPRbnHuCe81/ZFEUDpD4rRGOaGQs4oIpfNHcWu8+5/GCMf8/SlCRRnWg@freebsd.org X-Gm-Message-State: AOJu0YyHK7Pv6Zwg2QmEMkOs4tbPhfRue2D76OD4NMM7aTyN/8jzsocy MZQ5VScz0teArGFDvE298HVJ0vVr3KD/+19we7xDMRrJRe28VT6WTqO2XZvV3zvGDgTfWMfGnZv CBfafAsg9CzO5maFETDYEGN8OsXarJ2Gm25ZSFGM01A== X-Gm-Gg: ASbGncv51d+kD1wJ998nxqTAzwYgPVvBiYDjoY7TEvzv+YTo58UPmvhB7OAutmY5ZXG lgUbznexpj0zLtdiMhRpwSp83PNUsWRSbLRkB19t+4XeWeJS2F6hFZvJhgJfRRbCarTW+qDA9+p BN3X0F4Vn1laOpJA0L44b39jp+xN7rwixEyAAQUhopUS1tNYZ9enDGm6AmsuiKaSONs7+w7Kv4m ZRPR1VoiaW8/mJj4c2oB4YtNS3NbNyoxSXvEnVCTz/xwkN+zw0qMvMFSc4Ex7qO6+20bg== X-Google-Smtp-Source: AGHT+IFHVQm2rLyxyMakfUlBU+pI8jKOUvOaY55J8Puy+a2og+LpPyHvACu6DUZsMwFXOopzjCTEfq7iUL8/t10FvF8= X-Received: by 2002:a17:90b:4d08:b0:32b:6cf2:a2cf with SMTP id 98e67ed59e1d1-3342a3e634dmr12580015a91.14.1759000333227; Sat, 27 Sep 2025 12:12:13 -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 MIME-Version: 1.0 References: <202509271513.58RFDst3083057@gitrepo.freebsd.org> <44DAB9B2-B037-49B0-9153-90B4CFBB6234@FreeBSD.org> <20250927143548.661e75f7@ralga.knownspace> <7CCC215D-E9EF-49CD-95A1-F2D5215AD268@FreeBSD.org> In-Reply-To: <7CCC215D-E9EF-49CD-95A1-F2D5215AD268@FreeBSD.org> From: Warner Losh Date: Sat, 27 Sep 2025 13:12:01 -0600 X-Gm-Features: AS18NWAZHJmktUhqHgmRlgJaANuLpwYjmY_staK2voBameHVZDp-DBkCzzUn5EM Message-ID: Subject: Re: git: b4c6c3db0379 - stable/14 - ipfw: Teach ipfw that EtherIP is an upper layer protocol To: Michael Tuexen Cc: Justin Hibbits , Zhenlei Huang , src-committers , "" , dev-commits-src-branches@freebsd.org Content-Type: multipart/alternative; boundary="00000000000005aaa4063fcd2e65" X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4cYxsW6bFhz3WLv --00000000000005aaa4063fcd2e65 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Sat, Sep 27, 2025, 12:44=E2=80=AFPM Michael Tuexen = wrote: > > On 27. Sep 2025, at 20:35, Justin Hibbits > wrote: > > > > On Sat, 27 Sep 2025 20:32:20 +0200 > > Michael Tuexen wrote: > > > >>> On 27. Sep 2025, at 17:13, Zhenlei Huang wrote: > >>> > >>> The branch stable/14 has been updated by zlei: > >>> > >>> URL: > >>> > https://cgit.FreeBSD.org/src/commit/?id=3Db4c6c3db0379a5b3d34143325805cd7= e68cf3d9a > >>> > >>> commit b4c6c3db0379a5b3d34143325805cd7e68cf3d9a > >>> Author: Zhenlei Huang > >>> AuthorDate: 2025-09-16 15:58:24 +0000 > >>> Commit: Zhenlei Huang > >>> CommitDate: 2025-09-27 15:11:35 +0000 > >>> > >>> ipfw: Teach ipfw that EtherIP is an upper layer protocol > >>> > >>> so that we do not discard EtherIP packets ( over IPv6 network ) > >>> when net.inet6.ip6.fw.deny_unknown_exthdrs is set to 1 ( which is > >>> the default value ). > >>> > >>> PR: 227450 > >>> Reviewed by: ae, #network > >>> MFC after: 1 week > >>> Differential Revision: https://reviews.freebsd.org/D52566 > >>> > >>> (cherry picked from commit > >>> 0418e6690e91aa6c38dd9af9da43c4c5a9dc1cd2) (cherry picked from > >>> commit b1c96e54b906d0cdea0b5a9c74cc295803dfe50e) > >> Why is this cherry picked from two commits? Shouldn't this be only > >> cherry picked from the commit to the main branch? > >> > >> Best regards > >> Michael > > > > It's common to cherry-pick from stable to older-stable. This was > > likely cherry-picked from stable/15, which was cherry-picked from main. > That is why I am asking. > > My understanding is that we should > * MFC from main to stable/15 > * MFC from main to stable/14 > * MFC from stable/14 to releng/14.4 > > So I might be wrong and and I should actually do instead > * MFC from main to stable/15 > * MFC from stable/15 to stable/14 > * MFC from stable/14 to releng/14.4 > > I know that releng/14.4 does not exist, but there is a time window > we can get changes into relen/14.4 with approval from re@. > > I would just like to know how I should MFC to stable/14... > Either way works. Without conflicts I do main to both. With conflicts I do main to 15 and then 15 to 14. For releng, it's always from the stable branch. Warner Best regards > Michael > > > > - Justin > > > >>> --- > >>> sys/netpfil/ipfw/ip_fw2.c | 7 +++++++ > >>> 1 file changed, 7 insertions(+) > >>> > >>> diff --git a/sys/netpfil/ipfw/ip_fw2.c b/sys/netpfil/ipfw/ip_fw2.c > >>> index 0e0ecd3c6b20..928ccefe4803 100644 > >>> --- a/sys/netpfil/ipfw/ip_fw2.c > >>> +++ b/sys/netpfil/ipfw/ip_fw2.c > >>> @@ -67,6 +67,7 @@ > >>> #include > >>> #include > >>> #include > >>> +#include > >>> #include > >>> > >>> #include > >>> @@ -1717,6 +1718,12 @@ do { \ > >>> PULLUP_TO(hlen, ulp, struct ip); > >>> break; > >>> > >>> + case IPPROTO_ETHERIP: /* RFC 3378 */ > >>> + PULLUP_LEN(hlen, ulp, > >>> + sizeof(struct etherip_header) + > >>> + sizeof(struct ether_header)); > >>> + break; > >>> + > >>> case IPPROTO_PFSYNC: > >>> PULLUP_TO(hlen, ulp, struct pfsync_header); > >>> break; > >> > > > > --00000000000005aaa4063fcd2e65 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Sat, Sep 27, 2025, 12:44=E2= =80=AFPM Michael Tuexen <tuexen@fr= eebsd.org> wrote:
> On = 27. Sep 2025, at 20:35, Justin Hibbits <chmeee@has.gonegalt.net= > wrote:
>
> On Sat, 27 Sep 2025 20:32:20 +0200
> Michael Tuexen <tuexen@FreeBSD.org> wrote:
>
>>> On 27. Sep 2025, at 17:13, Zhenlei Huang <zlei@FreeBSD.org&= gt; wrote:
>>>
>>> The branch stable/14 has been updated by zlei:
>>>
>>> URL:
>>> https://cgit.FreeBSD.org/src/commit/?id=3Db4c6c3db0379a5b3d3414332580= 5cd7e68cf3d9a
>>>
>>> commit b4c6c3db0379a5b3d34143325805cd7e68cf3d9a
>>> Author:=C2=A0 =C2=A0 =C2=A0Zhenlei Huang <zlei@FreeBSD.org&= gt;
>>> AuthorDate: 2025-09-16 15:58:24 +0000
>>> Commit:=C2=A0 =C2=A0 =C2=A0Zhenlei Huang <zlei@FreeBSD.org&= gt;
>>> CommitDate: 2025-09-27 15:11:35 +0000
>>>
>>>=C2=A0 =C2=A0ipfw: Teach ipfw that EtherIP is an upper layer pr= otocol
>>>
>>>=C2=A0 =C2=A0so that we do not discard EtherIP packets ( over I= Pv6 network )
>>> when net.inet6.ip6.fw.deny_unknown_exthdrs is set to 1 ( which= is
>>> the default value ).
>>>
>>>=C2=A0 =C2=A0PR:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0227450
>>>=C2=A0 =C2=A0Reviewed by:=C2=A0 =C2=A0 ae, #network
>>>=C2=A0 =C2=A0MFC after:=C2=A0 =C2=A0 =C2=A0 1 week
>>>=C2=A0 =C2=A0Differential Revision:=C2=A0 h= ttps://reviews.freebsd.org/D52566
>>>
>>>=C2=A0 =C2=A0(cherry picked from commit
>>> 0418e6690e91aa6c38dd9af9da43c4c5a9dc1cd2) (cherry picked from<= br> >>> commit b1c96e54b906d0cdea0b5a9c74cc295803dfe50e)=C2=A0
>> Why is this cherry picked from two commits? Shouldn't this be = only
>> cherry picked from the commit to the main branch?
>>
>> Best regards
>> Michael
>
> It's common to cherry-pick from stable to older-stable.=C2=A0 This= was
> likely cherry-picked from stable/15, which was cherry-picked from main= .
That is why I am asking.

My understanding is that we should
* MFC from main to stable/15
* MFC from main to stable/14
* MFC from stable/14 to releng/14.4

So I might be wrong and and I should actually do instead
* MFC from main to stable/15
* MFC from stable/15 to stable/14
* MFC from stable/14 to releng/14.4

I know that releng/14.4 does not exist, but there is a time window
we can get changes into relen/14.4 with approval from re@.

I would just like to know how I should MFC to stable/14...
=

Either way works.= Without conflicts I do main to both. With conflicts I do main to 15 and th= en 15 to 14. For releng, it's always from the stable branch.

Warner

=
Best regards
Michael
>
> - Justin
>
>>> ---
>>> sys/netpfil/ipfw/ip_fw2.c | 7 +++++++
>>> 1 file changed, 7 insertions(+)
>>>
>>> diff --git a/sys/netpfil/ipfw/ip_fw2.c b/sys/netpfil/ipfw/ip_f= w2.c
>>> index 0e0ecd3c6b20..928ccefe4803 100644
>>> --- a/sys/netpfil/ipfw/ip_fw2.c
>>> +++ b/sys/netpfil/ipfw/ip_fw2.c
>>> @@ -67,6 +67,7 @@
>>> #include <net/route/nhop.h>
>>> #include <net/pfil.h>
>>> #include <net/vnet.h>
>>> +#include <net/if_gif.h>
>>> #include <net/if_pfsync.h>
>>>
>>> #include <netpfil/pf/pf_mtag.h>
>>> @@ -1717,6 +1718,12 @@ do { \
>>> PULLUP_TO(hlen, ulp, struct ip);
>>> break;
>>>
>>> + case IPPROTO_ETHERIP: /* RFC 3378 */
>>> + PULLUP_LEN(hlen, ulp,
>>> +=C2=A0 =C2=A0 sizeof(struct etherip_header) +
>>> +=C2=A0 =C2=A0 sizeof(struct ether_header));
>>> + break;
>>> +
>>> case IPPROTO_PFSYNC:
>>> PULLUP_TO(hlen, ulp, struct pfsync_header);
>>> break;=C2=A0
>>
>

--00000000000005aaa4063fcd2e65--