From owner-svn-src-stable-8@FreeBSD.ORG Fri Jan 7 09:40:08 2011 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C6EC4106566B; Fri, 7 Jan 2011 09:40:08 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mail.cksoft.de (mail.cksoft.de [IPv6:2001:4068:10::3]) by mx1.freebsd.org (Postfix) with ESMTP id 3BD118FC15; Fri, 7 Jan 2011 09:40:08 +0000 (UTC) Received: from localhost (amavis.fra.cksoft.de [192.168.74.71]) by mail.cksoft.de (Postfix) with ESMTP id E136041C7A3; Fri, 7 Jan 2011 10:40:06 +0100 (CET) X-Virus-Scanned: amavisd-new at cksoft.de Received: from mail.cksoft.de ([192.168.74.103]) by localhost (amavis.fra.cksoft.de [192.168.74.71]) (amavisd-new, port 10024) with ESMTP id 60bQJiaOdWXi; Fri, 7 Jan 2011 10:40:06 +0100 (CET) Received: by mail.cksoft.de (Postfix, from userid 66) id 1705041C7A9; Fri, 7 Jan 2011 10:40:06 +0100 (CET) Received: from maildrop.int.zabbadoz.net (maildrop.int.zabbadoz.net [10.111.66.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.int.zabbadoz.net (Postfix) with ESMTP id 253B84448F3; Fri, 7 Jan 2011 09:36:39 +0000 (UTC) Date: Fri, 7 Jan 2011 09:36:38 +0000 (UTC) From: "Bjoern A. Zeeb" X-X-Sender: bz@maildrop.int.zabbadoz.net To: Lawrence Stewart In-Reply-To: <4D26A165.3070001@freebsd.org> Message-ID: <20110107091418.H14966@maildrop.int.zabbadoz.net> References: <201101051852.p05IqUjK087769@svn.freebsd.org> <4D26A165.3070001@freebsd.org> X-OpenPGP-Key: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842 MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed 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-8@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Jan 2011 09:40:08 -0000 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 /bz -- Bjoern A. Zeeb You have to have visions! Going to jail sucks -- All my daemons like it! http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/jails.html