From owner-svn-src-head@FreeBSD.ORG Sun Sep 22 02:30:01 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 2DBB1497; Sun, 22 Sep 2013 02:30:01 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A67AB24D6; Sun, 22 Sep 2013 02:30:00 +0000 (UTC) Received: from tom.home (kostik@localhost [127.0.0.1]) by kib.kiev.ua (8.14.7/8.14.7) with ESMTP id r8M2TtOb060487; Sun, 22 Sep 2013 05:29:55 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.8.3 kib.kiev.ua r8M2TtOb060487 Received: (from kostik@localhost) by tom.home (8.14.7/8.14.7/Submit) id r8M2TtEo060486; Sun, 22 Sep 2013 05:29:55 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Sun, 22 Sep 2013 05:29:55 +0300 From: Konstantin Belousov To: "Bjoern A. Zeeb" Subject: Re: svn commit: r255759 - head/sys/netinet Message-ID: <20130922022955.GX41229@kib.kiev.ua> References: <201309211001.r8LA1pi1012735@svn.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="Mk6ex6FO95Eep5hX" Content-Disposition: inline In-Reply-To: <201309211001.r8LA1pi1012735@svn.freebsd.org> User-Agent: Mutt/1.5.21 (2010-09-15) X-Spam-Status: No, score=-2.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FREEMAIL_FROM,NML_ADSP_CUSTOM_MED autolearn=no version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on tom.home Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Sep 2013 02:30:01 -0000 --Mk6ex6FO95Eep5hX Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Sep 21, 2013 at 10:01:51AM +0000, Bjoern A. Zeeb wrote: > Author: bz > Date: Sat Sep 21 10:01:51 2013 > New Revision: 255759 > URL: http://svnweb.freebsd.org/changeset/base/255759 >=20 > Log: > Introduce spares in the TCP syncache and timewait structures > so that fixed TCP_SIGNATURE handling can later be merged. > =20 > This is derived from follow-up work to SVN r183001 posted to > net@ on Sep 13 2008. > =20 > Approved by: re (gjb) >=20 > Modified: > head/sys/netinet/tcp_syncache.h > head/sys/netinet/tcp_var.h >=20 > Modified: head/sys/netinet/tcp_syncache.h > =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_syncache.h Sat Sep 21 09:17:14 2013 (r255758) > +++ head/sys/netinet/tcp_syncache.h Sat Sep 21 10:01:51 2013 (r255759) > @@ -75,6 +75,7 @@ struct syncache { > struct label *sc_label; /* MAC label reference */ > struct ucred *sc_cred; /* cred cache for jail checks */ > =20 > + void *sc_pspare; /* TCP_SIGNATURE */ > u_int32_t sc_spare[2]; /* UTO */ > }; > =20 >=20 > Modified: head/sys/netinet/tcp_var.h > =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_var.h Sat Sep 21 09:17:14 2013 (r255758) > +++ head/sys/netinet/tcp_var.h Sat Sep 21 10:01:51 2013 (r255759) > @@ -211,7 +211,7 @@ struct tcpcb { > u_int t_tsomax; /* tso burst length limit */ > =20 > uint32_t t_ispare[8]; /* 5 UTO, 3 TBD */ > - void *t_pspare2[4]; /* 4 TBD */ > + void *t_pspare2[4]; /* 1 TCP_SIGNATURE, 3 TBD */ I think the way to do the KBI padding in head is to introduce new members as needed, leaving spares for consumption during the stable branch lifetime. You did that right for two other changes in the commit. > uint64_t _pad[6]; /* 6 TBD (1-2 CC/RTT?) */ > }; > =20 > @@ -353,6 +353,8 @@ struct tcptw { > u_int t_starttime; > int tw_time; > TAILQ_ENTRY(tcptw) tw_2msl; > + void *tw_pspare; /* TCP_SIGNATURE */ > + u_int *tw_spare; /* TCP_SIGNATURE */ > }; > =20 > #define intotcpcb(ip) ((struct tcpcb *)(ip)->inp_ppcb) --Mk6ex6FO95Eep5hX Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.21 (FreeBSD) iQIcBAEBAgAGBQJSPlYiAAoJEJDCuSvBvK1B6IoP/ioE9bA5njhOQ9kTnZESECAk IWv8lVZeuC3qHAriBCUhat8H30hXyKHnmfQVfNy+PeTyX1dA3H41wiPzApUqxjWw 2S/28m4q+SEqNVl5CQTOXWbPyPvyL8OQA3NWzUag6VfpZQDXhYulMtPBNjMsV5bR Xz6o6EHluQBACWrZE43/T9YbC8xsNTeNzICAQEpYthg9vYGAdqvnnZ70fCOC0+va iz4kC0sX6ExnadD+TPF+ka6WLlruQVY/YEKLOfu6gqR5IT2VijxAeXSbYczbMIPI HTAKYnqwI0o5aNRKdNSwvOh2o6TLPZu6QVLs+TgLeDZe1a4vZT3LXZDohIItkZee 4+SdXoMZipc4f2HhwhjOypeFjPHGinlcAQFELT1skVag1i6V7R9QoJ7RrmHmzVrW 5JG+v44KUHI0Fnrgy1vRZiTN/bvwsZpedSXQA6AvvYF7UU9PobItgWak8Ll13K94 ELvPrMQMtrq5nSDQjPgqqb1gfc6mEll8Fm2t894vKu0v6v/CL0EpQQJenhmxraZs +NkUwIo7BlV0oCv+Qb573kZfEgfupMx1hG+/DtN442IO6ysttwUnsT7tWP+auDES vf2pwMEnswcYjaxkZXP/WazoFLscsbvrH6Ui5lFplPBv4mawMcegLZdKfx2QXUie 2BfpzT8YbkBkIX2Xfv4b =NCHx -----END PGP SIGNATURE----- --Mk6ex6FO95Eep5hX--