From owner-svn-src-head@freebsd.org Thu Jan 7 02:20:53 2016 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B0B6AA6593C; Thu, 7 Jan 2016 02:20:53 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-lf0-x233.google.com (mail-lf0-x233.google.com [IPv6:2a00:1450:4010:c07::233]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5587519F2; Thu, 7 Jan 2016 02:20:53 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by mail-lf0-x233.google.com with SMTP id c192so147846214lfe.2; Wed, 06 Jan 2016 18:20:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=A8E8P3KhwrNVqydE3znJE392jz/rSgFAqfCQWVMVwb8=; b=ZVr+I3L4V3+oPeqVjf9Ig3DsxFZurB7LELtTaOpXa720llzkjDkOUhtl/hCg6zYgHf rv3dqO1e1SYL8iMEU+qNvxk1Kx/8BWMHaHShv/KZ+HLsjUn4nDlr0A74NDHl1zdMCjFj nmaLnoXVb+IOry4O8QV8uve3WQ+KTDOPe2z3fhrg8r7jGcURFJIQkNjlCVbO/+bRTZ/I Vij8cl5yTrg101MGdtAwPsfGyvjwYJJKK/XsngudVwhILfqRGsMo52hd+WkHW4IS3InW EMZx7Hxqqgf7g2s5dDQkRigegnE30pZkjunv0dxdX65HDKcYU5Db1j8oodxxBCeZs4sh U2cQ== MIME-Version: 1.0 X-Received: by 10.25.208.213 with SMTP id h204mr27254931lfg.112.1452133250506; Wed, 06 Jan 2016 18:20:50 -0800 (PST) Received: by 10.112.160.133 with HTTP; Wed, 6 Jan 2016 18:20:50 -0800 (PST) In-Reply-To: <201601070014.u070EgW1059880@repo.freebsd.org> References: <201601070014.u070EgW1059880@repo.freebsd.org> Date: Wed, 6 Jan 2016 18:20:50 -0800 Message-ID: Subject: Re: svn commit: r293284 - in head/sys: dev/cxgb/ulp/tom dev/cxgbe/tom netinet From: NGie Cooper To: Gleb Smirnoff Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Thu, 07 Jan 2016 02:20:53 -0000 On Wed, Jan 6, 2016 at 4:14 PM, Gleb Smirnoff wrote: > Author: glebius > Date: Thu Jan 7 00:14:42 2016 > New Revision: 293284 > URL: https://svnweb.freebsd.org/changeset/base/293284 > > Log: > Historically we have two fields in tcpcb to describe sender MSS: t_maxopd, > and t_maxseg. This dualism emerged with T/TCP, but was not properly cleaned > up after T/TCP removal. After all permutations over the years the result is > that t_maxopd stores a minimum of peer offered MSS and MTU reduced by minimum > protocol header. And t_maxseg stores (t_maxopd - TCPOLEN_TSTAMP_APPA) if > timestamps are in action, or is equal to t_maxopd otherwise. That's a very > rough estimate of MSS reduced by options length. Throughout the code it > was used in places, where preciseness was not important, like cwnd or > ssthresh calculations. > > With this change: > > - t_maxopd goes away. > - t_maxseg now stores MSS not adjusted by options. > - new function tcp_maxseg() is provided, that calculates MSS reduced by > options length. The functions gives a better estimate, since it takes > into account SACK state as well. > > Reviewed by: jtl > Differential Revision: https://reviews.freebsd.org/D3593 This broke the build. >From https://jenkins.freebsd.org/job/FreeBSD_HEAD_i386/2053/ : /usr/src/sys/modules/tcp/fastpath/../../../netinet/tcp_stacks/fastpath.c:481:6: error: no member named 't_maxopd' in 'struct tcpcb' --- all_subdir_sound --- --- all_subdir_sb8 --- ===> sound/driver/sb8 (all) --- all_subdir_tcp/fastpath --- if (DELAY_ACK(tp, tlen)) { ^ ~~ /usr/src/sys/modules/tcp/fastpath/../../../netinet/tcp_stacks/fastpath.c:167:19: note: expanded from macro 'DELAY_ACK' (tlen <= tp->t_maxopd) && \ ^ /usr/src/sys/modules/tcp/fastpath/../../../netinet/tcp_stacks/fastpath.c:606:8: error: no member named 't_maxopd' in 'struct tcpcb' if (DELAY_ACK(tp, tlen) && tlen != 0) ^ ~~ /usr/src/sys/modules/tcp/fastpath/../../../netinet/tcp_stacks/fastpath.c:167:19: note: expanded from macro 'DELAY_ACK' (tlen <= tp->t_maxopd) && \ ^ --- all_subdir_sound --- --- all_subdir_sb16 --- ctfconvert -L VERSION -g sb16.o --- all_subdir_tcp/fastpath --- /usr/src/sys/modules/tcp/fastpath/../../../netinet/tcp_stacks/fastpath.c:1545:8: error: no member named 't_maxopd' in 'struct tcpcb' if (DELAY_ACK(tp, tlen)) ^ ~~ /usr/src/sys/modules/tcp/fastpath/../../../netinet/tcp_stacks/fastpath.c:167:19: note: expanded from macro 'DELAY_ACK' (tlen <= tp->t_maxopd) && \ ^ 3 errors generated. *** [fastpath.o] Error code 1