From owner-dev-commits-src-main@freebsd.org Thu Jul 29 07:25:37 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 75F8866DA12; Thu, 29 Jul 2021 07:25:37 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Gb2B92f0Nz3P1g; Thu, 29 Jul 2021 07:25:37 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: from venus.codepro.be (venus.codepro.be [5.9.86.228]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mx1.codepro.be", Issuer "R3" (verified OK)) (Authenticated sender: kp) by smtp.freebsd.org (Postfix) with ESMTPSA id 29221C0BA; Thu, 29 Jul 2021 07:25:37 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: by venus.codepro.be (Postfix, authenticated sender kp) id BC85D4BE6B; Thu, 29 Jul 2021 09:25:34 +0200 (CEST) From: "Kristof Provost" To: "Kubilay Kocak" Cc: dev-commits-src-all@FreeBSD.org, src-committers@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: da8d8b22e69c - main - pf: fix ABI breakage Date: Thu, 29 Jul 2021 09:25:33 +0200 X-Mailer: MailMate (1.13.2r5673) Message-ID: In-Reply-To: References: <202107281221.16SCLpFm044007@gitrepo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: quoted-printable X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Jul 2021 07:25:37 -0000 On 29 Jul 2021, at 3:19, Kubilay Kocak wrote: > On 28/07/2021 10:21 pm, Kristof Provost wrote: >> The branch main has been updated by kp: >> >> URL: = >> https://cgit.FreeBSD.org/src/commit/?id=3Dda8d8b22e69c72f1d001d55b5eff= 5acbb0265cfc >> >> commit da8d8b22e69c72f1d001d55b5eff5acbb0265cfc >> Author: Kristof Provost >> AuthorDate: 2021-07-28 09:24:44 +0000 >> Commit: Kristof Provost >> CommitDate: 2021-07-28 10:16:33 +0000 >> >> pf: fix ABI breakage >> The introduction of synproxy support changed the size of = >> struct >> pf_status, which in turn broke the userspace ABI. >> Revert the relevant change. More work is needed on the = >> synproxy code to >> keep and expose the counters, but in the mean time this restores = >> the >> ABI. >> PR: 257469 >> MFC after: 3 days >> Sponsored by: Modirum MDPay >> --- >> sys/netpfil/pf/pf.h | 3 +-- >> sys/netpfil/pf/pf_syncookies.c | 1 - >> 2 files changed, 1 insertion(+), 3 deletions(-) >> >> diff --git a/sys/netpfil/pf/pf.h b/sys/netpfil/pf/pf.h >> index c8bf932af9c3..d8ee43506d99 100644 >> --- a/sys/netpfil/pf/pf.h >> +++ b/sys/netpfil/pf/pf.h >> @@ -160,8 +160,7 @@ enum { PF_ADDR_ADDRMASK, PF_ADDR_NOROUTE, = >> PF_ADDR_DYNIFTL, >> #define LCNT_SRCCONNRATE 4 /* max-src-conn-rate */ >> #define LCNT_OVERLOAD_TABLE 5 /* entry added to overload table */ >> #define LCNT_OVERLOAD_FLUSH 6 /* state entries flushed */ >> -#define LCNT_SYNCOOKIES_VALID 7 /* syncookies validated */ /* XXX = >> TODO: Ensure no API breakage! */ >> -#define LCNT_MAX 8 /* total+1 */ >> +#define LCNT_MAX 7 /* total+1 */ >> #define LCNT_NAMES { \ >> "max states per rule", \ >> diff --git a/sys/netpfil/pf/pf_syncookies.c = >> b/sys/netpfil/pf/pf_syncookies.c >> index 8699ae855ec8..744a12e4e21d 100644 >> --- a/sys/netpfil/pf/pf_syncookies.c >> +++ b/sys/netpfil/pf/pf_syncookies.c >> @@ -275,7 +275,6 @@ pf_syncookie_validate(struct pf_pdesc *pd) >> if ((ack & ~0xff) !=3D (hash & ~0xff)) >> return (0); >> - counter_u64_add(V_pf_status.lcounters[LCNT_SYNCOOKIES_VALID], 1); >> return (1); >> } >> _______________________________________________ >> dev-commits-src-main@freebsd.org mailing list >> https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main >> To unsubscribe, send any mail to = >> "dev-commits-src-main-unsubscribe@freebsd.org" >> > > Are these ABI break^W changes being picked up automatically or via = > people watching commits? > This was a user submitted bug report. I=E2=80=99m not aware of any ABI monitoring tooling. Best regards, Kristof