From owner-svn-src-stable@FreeBSD.ORG Fri Jan 7 14:46: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 52B4B106564A; Fri, 7 Jan 2011 14:46:44 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [65.122.17.42]) by mx1.freebsd.org (Postfix) with ESMTP id 2229E8FC08; Fri, 7 Jan 2011 14:46:44 +0000 (UTC) Received: from bigwig.baldwin.cx (66.111.2.69.static.nyinternet.net [66.111.2.69]) by cyrus.watson.org (Postfix) with ESMTPSA id BDEE646B1A; Fri, 7 Jan 2011 09:46:43 -0500 (EST) Received: from jhbbsd.localnet (smtp.hudson-trading.com [209.249.190.9]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id BEE638A01D; Fri, 7 Jan 2011 09:46:42 -0500 (EST) From: John Baldwin To: "Bjoern A. Zeeb" Date: Fri, 7 Jan 2011 08:04:46 -0500 User-Agent: KMail/1.13.5 (FreeBSD/7.3-CBSD-20101102; KDE/4.4.5; amd64; ; ) References: <201101051852.p05IqUjK087769@svn.freebsd.org> <4D26A165.3070001@freebsd.org> <20110107091418.H14966@maildrop.int.zabbadoz.net> In-Reply-To: <20110107091418.H14966@maildrop.int.zabbadoz.net> MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <201101070804.46913.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.6 (bigwig.baldwin.cx); Fri, 07 Jan 2011 09:46:42 -0500 (EST) X-Virus-Scanned: clamav-milter 0.96.3 at bigwig.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-1.9 required=4.2 tests=BAYES_00 autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on bigwig.baldwin.cx Cc: "Robert N. M. Watson" , src-committers@freebsd.org, svn-src-stable@freebsd.org, svn-src-all@freebsd.org, "George V. Neville-Neil" , 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:46:44 -0000 On Friday, January 07, 2011 4:36:38 am Bjoern A. Zeeb wrote: > On Fri, 7 Jan 2011, Lawrence Stewart wrote: > > > Hi George, > > > > 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 > >> > >> Log: > >> Fix binary compatability for netstats across the -x/-T changes > >> that have been previously MFC'd. > >> > >> Reviewed by: rwatson, bz > >> > >> Modified: > >> stable/8/sys/netinet/tcp_var.h > >> > ... > > > > 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 with. > > Be sure that it's not local changes. > > > 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. > > 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. > > 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? > > 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. > > Maybe we should even move them after _pad[] to keep the spares > together. > > Can you test this one? > http://people.freebsd.org/~bz/20110107-01-restore-xtcpcb-ABI.diff I think something like this is appropriate even regardless as it is cleaner to use the pad[] spots where they were originally. -- John Baldwin