From owner-svn-src-stable@FreeBSD.ORG Fri Jan 7 14:52:44 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AAFB4106566C; Fri, 7 Jan 2011 14:52:44 +0000 (UTC) (envelope-from gnn@freebsd.org) Received: from vps.hungerhost.com (vps.hungerhost.com [216.38.53.176]) by mx1.freebsd.org (Postfix) with ESMTP id 6044D8FC1B; Fri, 7 Jan 2011 14:52:44 +0000 (UTC) Received: from smtp.hudson-trading.com ([209.249.190.9] helo=gnnmac.hudson-trading.com) by vps.hungerhost.com with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.69) (envelope-from ) id 1PbDgI-0003hV-Dx; Fri, 07 Jan 2011 09:52:42 -0500 Mime-Version: 1.0 (Apple Message framework v1082) Content-Type: text/plain; charset=us-ascii From: George Neville-Neil In-Reply-To: <201101070804.46913.jhb@freebsd.org> Date: Fri, 7 Jan 2011 09:52:42 -0500 Content-Transfer-Encoding: quoted-printable Message-Id: References: <201101051852.p05IqUjK087769@svn.freebsd.org> <4D26A165.3070001@freebsd.org> <20110107091418.H14966@maildrop.int.zabbadoz.net> <201101070804.46913.jhb@freebsd.org> To: John Baldwin X-Mailer: Apple Mail (2.1082) X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - vps.hungerhost.com X-AntiAbuse: Original Domain - freebsd.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - freebsd.org Cc: "Robert N. M. Watson" , src-committers@freebsd.org, svn-src-stable@freebsd.org, svn-src-all@freebsd.org, "Bjoern A. Zeeb" , svn-src-stable-8@freebsd.org, Lawrence Stewart Subject: Re: svn commit: r217018 - stable/8/sys/netinet X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Jan 2011 14:52:44 -0000 On Jan 7, 2011, at 08:04 , John Baldwin wrote: > On Friday, January 07, 2011 4:36:38 am Bjoern A. Zeeb wrote: >> On Fri, 7 Jan 2011, Lawrence Stewart wrote: >>=20 >>> Hi George, >>>=20 >>> On 01/06/11 05:52, George V. Neville-Neil wrote: >>>> Author: gnn >>>> Date: Wed Jan 5 18:52:30 2011 >>>> New Revision: 217018 >>>> URL: http://svn.freebsd.org/changeset/base/217018 >>>>=20 >>>> Log: >>>> Fix binary compatability for netstats across the -x/-T changes >>>> that have been previously MFC'd. >>>>=20 >>>> Reviewed by: rwatson, bz >>>>=20 >>>> Modified: >>>> stable/8/sys/netinet/tcp_var.h >>>>=20 >> ... >>>=20 >>> On my stable/8 machine after updating world but not kernel I see = "struct >>> xtcpcb size mismatch" messages which indicates the ABI has been = futzed=20 > with. >>=20 >> Be sure that it's not local changes. >>=20 >>> Looking at the above diff I think this commit does indeed change the = ABI >>> and therefore needs to be tweaked in order to maintain our current = ABI >>> preservation policy for stable branches (unless I'm missing = something?). >>> If the change to the ABI is intentional, a note in UPDATING would >>> probably be warranted. >>=20 >> I think you are missing that that was the "repair" commit. Are you >> sure you didn't pickup the wrong versions? There was about a 1 day >> timeframe, where things were hosed but I believe George fixed them >> all. >>=20 >> Hmm looking at the diff committed more closely I see that the two >> uint64_t are not were they should be. Are you by any chance on i386 >> or another 32bit platform? >>=20 >> uint64_t t_sndrexmitpack;/* retransmit packets sent */ >> uint64_t t_rcvoopack; /* out-of-order packets received = */ >> should move after t_pspare2[6] and the patch I had seen had that. >>=20 >> Maybe we should even move them after _pad[] to keep the spares >> together. >>=20 >> Can you test this one? >> http://people.freebsd.org/~bz/20110107-01-restore-xtcpcb-ABI.diff >=20 > I think something like this is appropriate even regardless as it is = cleaner to=20 > use the pad[] spots where they were originally. Yeah, that patch is the right way to go. Best, George