From owner-svn-src-stable@FreeBSD.ORG Fri Jan 7 23:47:19 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 C8D081065675; Fri, 7 Jan 2011 23:47:19 +0000 (UTC) (envelope-from lstewart@freebsd.org) Received: from lauren.room52.net (lauren.room52.net [210.50.193.198]) by mx1.freebsd.org (Postfix) with ESMTP id 8284A8FC12; Fri, 7 Jan 2011 23:47:19 +0000 (UTC) Received: from lawrence1.loshell.room52.net (ppp59-167-184-191.static.internode.on.net [59.167.184.191]) by lauren.room52.net (Postfix) with ESMTPSA id 514907E853; Sat, 8 Jan 2011 10:47:18 +1100 (EST) Message-ID: <4D27A605.6090002@freebsd.org> Date: Sat, 08 Jan 2011 10:47:17 +1100 From: Lawrence Stewart User-Agent: Mozilla/5.0 (X11; U; FreeBSD amd64; en-AU; rv:1.9.2.13) Gecko/20101214 Lightning/1.0b2 Thunderbird/3.1.7 MIME-Version: 1.0 To: "Bjoern A. Zeeb" 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> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=0.0 required=5.0 tests=UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on lauren.room52.net Cc: src-committers@FreeBSD.org, svn-src-stable@FreeBSD.org, svn-src-all@FreeBSD.org, "George V. Neville-Neil" , svn-src-stable-8@FreeBSD.org, "Robert N. M. Watson" 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 23:47:19 -0000 On 01/07/11 20:36, 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. Definitely not the issue - this box runs stock stable/8 directly from svn.freebsd.org without any 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. Looking at my kernel.old rev, I updated from stable/8 kernel/world @ r216035 to stable/8 @ r217084. According to my commit mail log, George made the initial change in r216968 and the repair commit was r217018, so I don't think that I should have seen any issues if r217018 didn't mess with the ABI as I hadn't updated in the cross over period. > 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? No: lstewart@lstewart3:~> uname -a FreeBSD lstewart3 8.2-PRERELEASE FreeBSD 8.2-PRERELEASE #16 r217084: Fri Jan 7 16:17:03 EST 2011 root@lstewart3:/usr/obj/usr/src/sys/GENERIC amd64 > 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 This looks to be on the right track. Will do. Cheers, Lawrence