From owner-dev-commits-src-main@freebsd.org Thu Jul 29 01:19:41 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 9906C668A9F; Thu, 29 Jul 2021 01:19:41 +0000 (UTC) (envelope-from koobs.freebsd@gmail.com) Received: from mail-pj1-x102d.google.com (mail-pj1-x102d.google.com [IPv6:2607:f8b0:4864:20::102d]) (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 "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GZt3x3JZWz4f1R; Thu, 29 Jul 2021 01:19:41 +0000 (UTC) (envelope-from koobs.freebsd@gmail.com) Received: by mail-pj1-x102d.google.com with SMTP id mz5-20020a17090b3785b0290176ecf64922so12983110pjb.3; Wed, 28 Jul 2021 18:19:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:message-id:date:mime-version:user-agent:reply-to:subject :content-language:to:references:from:cc:in-reply-to :content-transfer-encoding; bh=Nt2B+sQ4Xv86wj0xYvi0nxyZQwdNcRMZN4FmZS5LraE=; b=AVrD6X/B4V699BuFeTwDcA0eClhV3xdlOpc7CZ3V5Rtc5S9qTVsozVu1Yp77pm5+sV QCuu7sTVRBwNa4MpNkZikJzQSAK64PwshfOmp9vNhBIUw2FATg7HIohrwUOyHEfLjkqG epZg0ujIPgQeBy2pmNPDD2xKpMHgezXv9/g8W8q34J84pHr0Qh7Mt9DUsW833F/HPwnZ Zm0ifilbAGBqWW8odktO4MQlhLSNK4r9Noq+2qcE+FJbRhBOfLt+O+1Ey+qLS4Ht25ys KVAhoYVPpIiiKq3pHOPTus0rv0Ou3ZX/uZr1mrsUNaVbPgEX3A8vG/Hr7ymlMvC2f7MQ r38g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:message-id:date:mime-version:user-agent :reply-to:subject:content-language:to:references:from:cc:in-reply-to :content-transfer-encoding; bh=Nt2B+sQ4Xv86wj0xYvi0nxyZQwdNcRMZN4FmZS5LraE=; b=QIXwJow7fDLPyktOjw5ceFX705oRpp0s33Y9qjX5aY0xujaGOF2o09Jv/8Q8MRDBIe CKvTTDwPxcDx3DquaQC22XlkfqGJg7wGx4eBNAECZRj09uBZcswxxKwGoiLDzxjSsaDT Iu1gPNAyqLylNszBgncbz+4JRyGFu70vEFbXU7kCHPixNa1xfBHVrLTuE5c9RyB7Dpjf kTRd/SFQcjmy9J1I+fE/wameGs8ztI6MWSlc5Fqe34Yk3Mj3BaOenZoXGxlzO5gz+T8P NcgpCMEgCxFpithlywEpYJtmPCk7LIW9eXND2W8UWcb66JSMpNxIEGw7eLjYdMSSckn/ Stsg== X-Gm-Message-State: AOAM531EkFvZFuFnQXFjsMzY/IqBH+k8euIa2gcMV+BjX9f41LsDeuSy k7s/xp8PzUOXw2jKx7B0S09kNGUsU9xGfw== X-Google-Smtp-Source: ABdhPJyY193tSv3Q58joYob4Dx1QrPUjXpy7woG7VbdYmVFmuXDfQlolZynT1AYvSX4tvu7jlTysww== X-Received: by 2002:a65:654c:: with SMTP id a12mr1611121pgw.118.1627521580292; Wed, 28 Jul 2021 18:19:40 -0700 (PDT) Received: from ?IPV6:2403:5800:7500:3601:70f0:f452:bc82:11cb? (2403-5800-7500-3601-70f0-f452-bc82-11cb.ip6.aussiebb.net. [2403:5800:7500:3601:70f0:f452:bc82:11cb]) by smtp.gmail.com with UTF8SMTPSA id f4sm1215569pgi.68.2021.07.28.18.19.38 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 28 Jul 2021 18:19:39 -0700 (PDT) Sender: Kubilay Kocak Message-ID: Date: Thu, 29 Jul 2021 11:19:36 +1000 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:92.0) Gecko/20100101 Thunderbird/92.0a1 Reply-To: koobs@FreeBSD.org Subject: Re: git: da8d8b22e69c - main - pf: fix ABI breakage Content-Language: en-US To: Kristof Provost References: <202107281221.16SCLpFm044007@gitrepo.freebsd.org> From: Kubilay Kocak Cc: dev-commits-src-all@FreeBSD.org, src-committers@FreeBSD.org, dev-commits-src-main@FreeBSD.org In-Reply-To: <202107281221.16SCLpFm044007@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4GZt3x3JZWz4f1R X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; TAGGED_FROM(0.00)[]; REPLY(-4.00)[] 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 01:19:41 -0000 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=da8d8b22e69c72f1d001d55b5eff5acbb0265cfc > > 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) != (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?