From nobody Mon May 30 15:17:59 2022 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 37A431B4F2B9; Mon, 30 May 2022 15:18:03 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: from mail-lf1-x12d.google.com (mail-lf1-x12d.google.com [IPv6:2a00:1450:4864:20::12d]) (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 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LBfDV2C10z4YSq; Mon, 30 May 2022 15:18:02 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: by mail-lf1-x12d.google.com with SMTP id j10so17181905lfe.12; Mon, 30 May 2022 08:18:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=SAPtmO/upkmuAiL49RIB3I2aaUdqFvQESJi67rmAKxM=; b=pH/zQ7R6r8nQY7DTfy7cEEyq14l+Spn9r1aXGT8hgRxTD5mTszB2SFh75Eho7vJRAr S9pk1UCyJqM5msKqrPabVyw+rL9KNVpS2rP0gYV4OIkEcV8KNqYqVT1ySxfak/dmFCco EaF0b4lfN2Vx8oue3ARpoNx1F6i5Zml0Xbc0JPWF57CQo5azqArfBXamg98MIg5E9Obj GfFqrcnEPfwB4PT7E2NY/16eiuTcIPZQKLwqLYg6ghzzR/B3G8mcDv0zopD7tA68Ncvz 8pRYiP22u8mDvZMfQUefVtSv7mDBFCWdcFIZCx05WYtkM0fAluxvDUPWcwqXPIJsl5S3 DYHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=SAPtmO/upkmuAiL49RIB3I2aaUdqFvQESJi67rmAKxM=; b=lKCT7Z1/AszPBSBaK/cKn1hn9FF6MFL5wsZSFuaYmZ9jJPKHx9jgDP8OAtnMT36YyA eGv7KKZBfJdTf+JebyirBXZ4a0Z77d/H/vve7mSUQ8qYQnveHPwMfi6L3c0ImEJazp30 J1GGoQ0uqhWhm0lAijO5X0fY3IZoMXe3EqxVYhlZNT+E7nKwx5zhvszrviYmY8qDx9wM MR4Qn1lTd4qd9bobJBuvWONOkjLSwoM86P3sJ6i4T23RwRKTIY+oy7vroikOLMbq34yp MsjNzdWOSR4yeR0C99Dk1pthMX5gRRbbdf1OjvP9cE+NMNmaeOf83yjZ84EEeJrUQlHr Y6bw== X-Gm-Message-State: AOAM533aSWwPK5fLF0oP1h/5MiAYbMdJLVcT2Ap2VkV4hZCYUh5w4QIM V4t8qmMeCh/tKA5+3ojAYzyl47/ukYjZUG56Fqpw85WH X-Google-Smtp-Source: ABdhPJyQ0J2LsDQanag67BzEkB9ENSBLCvLLVoR1vDjeY50T23S925mLNOhoEVDEdcGack0frcjE1N6R7JjxxcyrIFw= X-Received: by 2002:ac2:4bc8:0:b0:478:634f:ad88 with SMTP id o8-20020ac24bc8000000b00478634fad88mr31629867lfq.117.1653923880636; Mon, 30 May 2022 08:18:00 -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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Received: by 2002:aa6:c2d2:0:b0:1e6:e5ee:dbad with HTTP; Mon, 30 May 2022 08:17:59 -0700 (PDT) In-Reply-To: <202205301510.24UFAxvj014259@gitrepo.freebsd.org> References: <202205301510.24UFAxvj014259@gitrepo.freebsd.org> From: Mateusz Guzik Date: Mon, 30 May 2022 17:17:59 +0200 Message-ID: Subject: Re: git: 8c0d1eca7834 - main - sockbuf: retain backward compatibility with userland after d59bc188d652 To: "Alexander V. Chernikov" Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4LBfDV2C10z4YSq X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20210112 header.b="pH/zQ7R6"; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mx1.freebsd.org: domain of mjguzik@gmail.com designates 2a00:1450:4864:20::12d as permitted sender) smtp.mailfrom=mjguzik@gmail.com X-Spamd-Result: default: False [-4.00 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20210112]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; R_SPF_ALLOW(-0.20)[+ip6:2a00:1450:4000::/36:c]; FREEMAIL_FROM(0.00)[gmail.com]; MIME_GOOD(-0.10)[text/plain]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; TO_DN_SOME(0.00)[]; MID_RHS_MATCH_FROMTLD(0.00)[]; DKIM_TRACE(0.00)[gmail.com:+]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::12d:from]; NEURAL_HAM_SHORT(-1.00)[-0.999]; MLMMJ_DEST(0.00)[dev-commits-src-all,dev-commits-src-main]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim] X-ThisMailContainsUnwantedMimeParts: N should probably CTASSERT on size then On 5/30/22, Alexander V. Chernikov wrote: > The branch main has been updated by melifaro: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=8c0d1eca7834bfd5a05c86bf20a7600917057492 > > commit 8c0d1eca7834bfd5a05c86bf20a7600917057492 > Author: Alexander V. Chernikov > AuthorDate: 2022-05-30 14:56:25 +0000 > Commit: Alexander V. Chernikov > CommitDate: 2022-05-30 15:10:53 +0000 > > sockbuf: retain backward compatibility with userland after d59bc188d652 > > Add spare fields to xsockbuf in place of sb_mcnt / sb_ccnt to avoid > rebuilding userland binaries like sockstat(1). > > Reviewed by: glebius > --- > sys/sys/socketvar.h | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/sys/sys/socketvar.h b/sys/sys/socketvar.h > index 52b9376f0559..249e0800f915 100644 > --- a/sys/sys/socketvar.h > +++ b/sys/sys/socketvar.h > @@ -577,6 +577,8 @@ struct xsocket { > uint32_t sb_cc; > uint32_t sb_hiwat; > uint32_t sb_mbcnt; > + uint32_t sb_spare0; /* was sb_mcnt */ > + uint32_t sb_spare1; /* was sb_ccnt */ > uint32_t sb_mbmax; > int32_t sb_lowat; > int32_t sb_timeo; > -- Mateusz Guzik