From owner-svn-src-all@freebsd.org Wed Mar 16 15:05:15 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7DE29AD25EE for ; Wed, 16 Mar 2016 15:05:15 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: from mail-qg0-x22e.google.com (mail-qg0-x22e.google.com [IPv6:2607:f8b0:400d:c04::22e]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 293ADD2B for ; Wed, 16 Mar 2016 15:05:15 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: by mail-qg0-x22e.google.com with SMTP id y89so45615308qge.2 for ; Wed, 16 Mar 2016 08:05:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hardenedbsd-org.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=6n+zSyyJErxW1lXNLImvWmCjQXmGnYvVPYeVTZp7mz0=; b=NWH96N8IYyy0V4AmXg0/FQX7aQV1nU/BA7KQZfVXY5BKvOjJaeKREhF0b8oL4CRC+x ghaVzEics7kk+DNXFY1FeyWunXPD46CTUgAKlJXrWT0YkfxQdVVujVZNeq9r9EancAvY YIVpFd4q6XQyO061ZJ/kdNN1l8koeQ2WWIZXAK3flWcWDi9GziHl51e5ljyGA1EQS9am 4u/cgacImxPLRXRZMaKoftrBfzXXho5exm8BM0U6oY0K5gcell0w1Z9aqm0iHv1T58Eq YFN0CxP8PU5Dy3C/zJjQKb8K43HBmRPSy2dWbeKvvWl0tZDQHrhRxJ+evk8/w8IZMsH7 e45g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=6n+zSyyJErxW1lXNLImvWmCjQXmGnYvVPYeVTZp7mz0=; b=ZL2z+kIYJOKKYQ2e3jVROqVFnn3uPuYsSAdVCVbOUsq47LkGTGIf8BSyKRE+SJO5MC 8yrggA51LP2nsbVn3SpZpG1EUUgLAA/8AYzHDyO/AwK6SsD57f8XKEoQyZmJWB4wzsZt vEO9f4UcdH+4D4o/+uBFIF5XHPMEVtJpRyHvQQrgKyK0+/HeP68NSnmmJ64ef0OZQpPI iu6ZqTEMwClOf/DqcZXs5osCGbaeaGqC4Ro95/N4btdJFfJXZDXRa3IYdE99vRcW3YoW wWcIv0xlLsxA9i7H3RDUqTP9QTHnwopjL/KVgr2FOlkaERaQI7aiHSvbaBgs2hFneCAI oYbA== X-Gm-Message-State: AD7BkJLtvFFDyXOWtrWYvr9nDcYPb5i23cnhSKmpuhBjsz3yNHoj3tqxW5pxTarskv1izuvR X-Received: by 10.140.42.39 with SMTP id b36mr5964782qga.4.1458140714288; Wed, 16 Mar 2016 08:05:14 -0700 (PDT) Received: from mutt-hardenedbsd ([63.88.83.105]) by smtp.gmail.com with ESMTPSA id 139sm1634937qhh.33.2016.03.16.08.05.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Mar 2016 08:05:12 -0700 (PDT) Date: Wed, 16 Mar 2016 11:05:06 -0400 From: Shawn Webb To: Gleb Smirnoff Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r296881 - in head: contrib/bsnmp/snmp_mibII sys/netinet Message-ID: <20160316150506.GA88619@mutt-hardenedbsd> References: <201603150015.u2F0FATD089432@repo.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="SUOF0GtieIMvvwua" Content-Disposition: inline In-Reply-To: <201603150015.u2F0FATD089432@repo.freebsd.org> X-Operating-System: FreeBSD mutt-hardenedbsd 11.0-CURRENT-HBSD FreeBSD 11.0-CURRENT-HBSD X-PGP-Key: http://pgp.mit.edu/pks/lookup?op=vindex&search=0x6A84658F52456EEE User-Agent: Mutt/1.5.24 (2015-08-30) X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Mar 2016 15:05:15 -0000 --SUOF0GtieIMvvwua Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Mar 15, 2016 at 12:15:10AM +0000, Gleb Smirnoff wrote: > Author: glebius > Date: Tue Mar 15 00:15:10 2016 > New Revision: 296881 > URL: https://svnweb.freebsd.org/changeset/base/296881 >=20 > Log: > Redo r294869. The array of counters for TCP states doesn't belong to > struct tcpstat, because the structure can be zeroed out by netstat(1) -= z, > and of course running connection counts shouldn't be touched. > =20 > Place running connection counts into separate array, and provide > separate read-only sysctl oid for it. >=20 > Modified: > head/contrib/bsnmp/snmp_mibII/mibII_tcp.c > head/sys/netinet/tcp_input.c > head/sys/netinet/tcp_subr.c > head/sys/netinet/tcp_syncache.c > head/sys/netinet/tcp_timewait.c > head/sys/netinet/tcp_usrreq.c > head/sys/netinet/tcp_var.h >=20 [snip] >=20 > Modified: head/sys/netinet/tcp_input.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/netinet/tcp_input.c Tue Mar 15 00:05:00 2016 (r296880) > +++ head/sys/netinet/tcp_input.c Tue Mar 15 00:15:10 2016 (r296881) > @@ -235,16 +235,39 @@ VNET_DEFINE(struct inpcbhead, tcb); > VNET_DEFINE(struct inpcbinfo, tcbinfo); > =20 > /* > - * TCP statistics are stored in an "array" of counter(9)s. > + * TCP statistics are stored in an array of counter(9)s, which size matc= hes > + * size of struct tcpstat. TCP running connection count is a regular ar= ray. > */ > VNET_PCPUSTAT_DEFINE(struct tcpstat, tcpstat); > -VNET_PCPUSTAT_SYSINIT(tcpstat); > SYSCTL_VNET_PCPUSTAT(_net_inet_tcp, TCPCTL_STATS, stats, struct tcpstat, > tcpstat, "TCP statistics (struct tcpstat, netinet/tcp_var.h)"); > +VNET_DEFINE(counter_u64_t, tcps_states[TCP_NSTATES]); > +SYSCTL_COUNTER_U64_ARRAY(_net_inet_tcp, TCPCTL_STATES, states, CTLFLAG_R= D | > + CTLFLAG_VNET, &VNET_NAME(tcps_states), TCP_NSTATES, > + "TCP connection counts by TCP state"); This breaks the build on amd64: /usr/src/sys/netinet/tcp_input.c:245:1: error: static_assert failed "compil= e-time assertion failed" SYSCTL_COUNTER_U64_ARRAY(_net_inet_tcp, TCPCTL_STATES, states, CTLFLAG_RD | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /usr/src/sys/sys/sysctl.h:657:2: note: expanded from macro 'SYSCTL_COUNTER_= U64_ARRAY' CTASSERT((((access) & CTLTYPE) =3D=3D 0 || = \ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /usr/src/sys/sys/systm.h:103:21: note: expanded from macro 'CTASSERT' #define CTASSERT(x) _Static_assert(x, "compile-time assertion failed") ^ ~ --=20 Shawn Webb HardenedBSD GPG Key ID: 0x6A84658F52456EEE GPG Key Fingerprint: 2ABA B6BD EF6A F486 BE89 3D9E 6A84 658F 5245 6EEE --SUOF0GtieIMvvwua Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJW6XYgAAoJEGqEZY9SRW7uPIEP+QFD1adlt/SC8b5Z6ZzXmmob U7bSvuKfP7FcQqMta/V12rOBnnIJopfVctaO50cWIZlEjIukOGhP34NsZMkAfUrj hft1jfCnUkEZhh4D2z1YQBkEyZmBPrZ1vBieLOPN0B3eCZGuFjqmkth27IN0nDp9 VcWvCk7VDph1+g17gCVGdCFCMZ0wtms4Kp+FM3omRaL6jlsY5ltK7BRhagKD2txZ gfxgAw9BFaxfObxw+MPws6Kndqp52lvTuBpu1uuG1Z934gNompKMx02xFnsyCoup SGqs2xTFXV4QhvS8nB1SlamDeKHYE1rEN5OzKOlJq6lmcWQ8E5g6J4H1zPTixCQU g/JlpHh1pYsGwUdbxRcKFUx0oixID5AxlDzeiBOWovTE5EvAlhX7M8U5BuTdO1G8 eP9PpQ+d6q/1/IGaCbH4e7S/FyIb9a1VQgeEHaceK+s58bnqvlGSKcVDOQ2PBZAM QnCktAYJYAbQHj92IXjroGCkUsn1vwFCOv2JzYvan1rhdZI6edObYkhfD1t0a0Ac UfwztMUcuvbNuTQwzy3E9DtdPx2WEkSjmMWhJ8r0MP3UZy+T0S2e60NGIqKlDgom +Gk2oG0r+gqWUHGs4CJjN39zMAtVAoOXmbKt6ZO7FRKXiNXMdbzBbJoR6wmTwNgx wisnOn0LzLDDGSV0kx5B =CbOx -----END PGP SIGNATURE----- --SUOF0GtieIMvvwua--