Date: Thu, 7 Jan 2016 11:24:24 +0200 From: Ivan Klymenko <fidaj@ukr.net> To: NGie Cooper <yaneurabeya@gmail.com> Cc: Gleb Smirnoff <glebius@freebsd.org>, "svn-src-head@freebsd.org" <svn-src-head@freebsd.org>, "svn-src-all@freebsd.org" <svn-src-all@freebsd.org>, "src-committers@freebsd.org" <src-committers@freebsd.org> Subject: Re: svn commit: r293284 - in head/sys: dev/cxgb/ulp/tom dev/cxgbe/tom netinet Message-ID: <20160107112424.701146a9@nonamehost.local> In-Reply-To: <CAGHfRMDF0a9y6669ZXynq4B8b2_TRZVhuYDn%2BpyJLppwTEjrAg@mail.gmail.com> References: <201601070014.u070EgW1059880@repo.freebsd.org> <CAGHfRMDF0a9y6669ZXynq4B8b2_TRZVhuYDn%2BpyJLppwTEjrAg@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Wed, 6 Jan 2016 18:20:50 -0800 NGie Cooper <yaneurabeya@gmail.com> wrote: > On Wed, Jan 6, 2016 at 4:14 PM, Gleb Smirnoff <glebius@freebsd.org> > 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 amd64 also ... --- dragon_saver.o --- /usr/local/libexec/ccache/world/cc -target x86_64-unknown-freebsd11.0 --sysroot=/media/da0s1/obj/usr/src/tmp -B/media/da0s1/obj/usr/src/tmp/usr/bin -O2 -pipe -march=native -fno-strict-aliasing -Werror -D_KERNEL -DKLD_MODULE -nostdinc -DHAVE_KERNEL_OPTION_HEADERS -include /media/da0s1/obj/usr/src/sys/mk11/opt_global.h -I. -I/usr/src/sys -fno-common -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -I/media/da0s1/obj/usr/src/sys/mk11 -mcmodel=kernel -mno-red-zone -mno-mmx -mno-sse -msoft-float -fno-asynchronous-unwind-tables -ffreestanding -fwrapv -fstack-protector -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual -Wundef -Wno-pointer-sign -D__printf__=__freebsd_kprintf__ -Wmissing-include-dirs -fdiagnostics-show-option -Wno-unknown-pragmas -Wno-error-tautological-compare -Wno-error-empty-body -Wno-error-parentheses-equality -Wno-error-unused-function -Wno-error-pointer-sign -Wno-error-shift-negative-v alue -fvectorize -fslp-vectorize -fblocks -fcolor-diagnostics -mno-aes -mno-avx -std=iso9899:1999 -c /usr/src/sys/modules/syscons/dragon/../../../dev/syscons/dragon/dragon_saver.c -o dragon_saver.o --- all_subdir_tcp/fastpath --- /usr/src/sys/modules/tcp/fastpath/../../../netinet/tcp_stacks/fastpath.c:481:6: 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) && \ ^ /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) && \ ^ /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 make[4]: stopped in /usr/src/sys/modules/tcp/fastpath 1 error make[4]: stopped in /usr/src/sys/modules/tcp/fastpath *** [all_subdir_tcp/fastpath] Error code 2 make[3]: stopped in /usr/src/sys/modules --- all_subdir_sound --- A failure has been detected in another branch of the parallel make make[6]: stopped in /usr/src/sys/modules/sound/driver/ich *** [all_subdir_ich] Error code 2 make[5]: stopped in /usr/src/sys/modules/sound/driver 1 error make[5]: stopped in /usr/src/sys/modules/sound/driver *** [all_subdir_driver] Error code 2 make[4]: stopped in /usr/src/sys/modules/sound 1 error make[4]: stopped in /usr/src/sys/modules/sound *** [all_subdir_sound] Error code 2 make[3]: stopped in /usr/src/sys/modules --- all_subdir_syscons --- A failure has been detected in another branch of the parallel make make[5]: stopped in /usr/src/sys/modules/syscons/dragon *** [all_subdir_dragon] Error code 2 make[4]: stopped in /usr/src/sys/modules/syscons 1 error make[4]: stopped in /usr/src/sys/modules/syscons *** [all_subdir_syscons] Error code 2 make[3]: stopped in /usr/src/sys/modules --- all_subdir_sysvipc --- A failure has been detected in another branch of the parallel make make[5]: stopped in /usr/src/sys/modules/sysvipc/sysvshm *** [all_subdir_sysvshm] Error code 2 make[4]: stopped in /usr/src/sys/modules/sysvipc 1 error make[4]: stopped in /usr/src/sys/modules/sysvipc *** [all_subdir_sysvipc] Error code 2 make[3]: stopped in /usr/src/sys/modules 4 errors make[3]: stopped in /usr/src/sys/modules *** [modules-all] Error code 2 make[2]: stopped in /media/da0s1/obj/usr/src/sys/mk11 1 error make[2]: stopped in /media/da0s1/obj/usr/src/sys/mk11 *** [buildkernel] Error code 2 make[1]: stopped in /usr/src 1 error make[1]: stopped in /usr/src *** [buildkernel] Error code 2 make: stopped in /usr/src 1 error make: stopped in /usr/src
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20160107112424.701146a9>