From owner-svn-src-stable-11@freebsd.org Thu May 30 17:21:00 2019 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 744EC15A55A6; Thu, 30 May 2019 17:21:00 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 108439507C; Thu, 30 May 2019 17:21:00 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from John-Baldwins-MacBook-Pro-4.local (ralph.baldwin.cx [66.234.199.215]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 3FD97A2B7; Thu, 30 May 2019 17:20:59 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Subject: Re: svn commit: r348435 - stable/11/sys/netinet To: Michael Tuexen , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org References: <201905301632.x4UGWJSJ066904@repo.freebsd.org> From: John Baldwin Openpgp: preference=signencrypt Autocrypt: addr=jhb@FreeBSD.org; keydata= mQGiBETQ+XcRBADMFybiq69u+fJRy/0wzqTNS8jFfWaBTs5/OfcV7wWezVmf9sgwn8TW0Dk0 c9MBl0pz+H01dA2ZSGZ5fXlmFIsee1WEzqeJzpiwd/pejPgSzXB9ijbLHZ2/E0jhGBcVy5Yo /Tw5+U/+laeYKu2xb0XPvM0zMNls1ah5OnP9a6Ql6wCgupaoMySb7DXm2LHD1Z9jTsHcAQMD /1jzh2BoHriy/Q2s4KzzjVp/mQO5DSm2z14BvbQRcXU48oAosHA1u3Wrov6LfPY+0U1tG47X 1BGfnQH+rNAaH0livoSBQ0IPI/8WfIW7ub4qV6HYwWKVqkDkqwcpmGNDbz3gfaDht6nsie5Z pcuCcul4M9CW7Md6zzyvktjnbz61BADGDCopfZC4of0Z3Ka0u8Wik6UJOuqShBt1WcFS8ya1 oB4rc4tXfSHyMF63aPUBMxHR5DXeH+EO2edoSwViDMqWk1jTnYza51rbGY+pebLQOVOxAY7k do5Ordl3wklBPMVEPWoZ61SdbcjhHVwaC5zfiskcxj5wwXd2E9qYlBqRg7QeSm9obiBCYWxk d2luIDxqaGJARnJlZUJTRC5vcmc+iGAEExECACAFAkTQ+awCGwMGCwkIBwMCBBUCCAMEFgID AQIeAQIXgAAKCRBy3lIGd+N/BI6RAJ9S97fvbME+3hxzE3JUyUZ6vTewDACdE1stFuSfqMvM jomvZdYxIYyTUpC5Ag0ERND5ghAIAPwsO0B7BL+bz8sLlLoQktGxXwXQfS5cInvL17Dsgnr3 1AKa94j9EnXQyPEj7u0d+LmEe6CGEGDh1OcGFTMVrof2ZzkSy4+FkZwMKJpTiqeaShMh+Goj XlwIMDxyADYvBIg3eN5YdFKaPQpfgSqhT+7El7w+wSZZD8pPQuLAnie5iz9C8iKy4/cMSOrH YUK/tO+Nhw8Jjlw94Ik0T80iEhI2t+XBVjwdfjbq3HrJ0ehqdBwukyeJRYKmbn298KOFQVHO EVbHA4rF/37jzaMadK43FgJ0SAhPPF5l4l89z5oPu0b/+5e2inA3b8J3iGZxywjM+Csq1tqz hltEc7Q+E08AAwUIAL+15XH8bPbjNJdVyg2CMl10JNW2wWg2Q6qdljeaRqeR6zFus7EZTwtX sNzs5bP8y51PSUDJbeiy2RNCNKWFMndM22TZnk3GNG45nQd4OwYK0RZVrikalmJY5Q6m7Z16 4yrZgIXFdKj2t8F+x613/SJW1lIr9/bDp4U9tw0V1g3l2dFtD3p3ZrQ3hpoDtoK70ioIAjjH aIXIAcm3FGZFXy503DOA0KaTWwvOVdYCFLm3zWuSOmrX/GsEc7ovasOWwjPn878qVjbUKWwx Q4QkF4OhUV9zPtf9tDSAZ3x7QSwoKbCoRCZ/xbyTUPyQ1VvNy/mYrBcYlzHodsaqUDjHuW+I SQQYEQIACQUCRND5ggIbDAAKCRBy3lIGd+N/BCO8AJ9j1dWVQWxw/YdTbEyrRKOY8YZNwwCf afMAg8QvmOWnHx3wl8WslCaXaE8= Message-ID: Date: Thu, 30 May 2019 10:20:58 -0700 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: <201905301632.x4UGWJSJ066904@repo.freebsd.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 108439507C X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.99 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.99)[-0.991,0]; REPLY(-4.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 May 2019 17:21:00 -0000 On 5/30/19 9:32 AM, Michael Tuexen wrote: > Author: tuexen > Date: Thu May 30 16:32:18 2019 > New Revision: 348435 > URL: https://svnweb.freebsd.org/changeset/base/348435 > > Log: > MFC r338053: > > Don't expose the uptime via the TCP timestamps. > > The TCP client side or the TCP server side when not using SYN-cookies > used the uptime as the TCP timestamp value. This patch uses in all > cases an offset, which is the result of a keyed hash function taking > the source and destination addresses and port numbers into account. > The keyed hash function is the same a used for the initial TSN. > > The use of > VNET_DEFINE_STATIC(u_char, ts_offset_secret[32]); > had to be replaced by > VNET_DEFINE(u_char, ts_offset_secret[32]); > > MFC r348290: > > When an ACK segment as the third message of the three way handshake is > received and support for time stamps was negotiated in the SYN/SYNACK > exchange, perform the PAWS check and only expand the syn cache entry if > the check is passed. > Without this check, endpoints may get stuck on the incomplete queue. > > Reviewed by: jtl@, rrs@ > Approved by: re (kib@)) > Sponsored by: Netflix, Inc. > Differential Revision: https://reviews.freebsd.org/D16636 > Differential Revision: https://reviews.freebsd.org/D20374 This broke the build on GCC platforms. > Modified: stable/11/sys/netinet/tcp_subr.c > ============================================================================== > --- stable/11/sys/netinet/tcp_subr.c Thu May 30 16:11:20 2019 (r348434) > +++ stable/11/sys/netinet/tcp_subr.c Thu May 30 16:32:18 2019 (r348435) > @@ -226,6 +226,12 @@ VNET_DEFINE(uma_zone_t, sack_hole_zone); > > VNET_DEFINE(struct hhook_head *, tcp_hhh[HHOOK_TCP_LAST+1]); > > +VNET_DEFINE(u_char, ts_offset_secret[32]); > +#define V_ts_offset_secret VNET(ts_offset_secret) > + > +static int tcp_default_fb_init(struct tcpcb *tp); > +static void tcp_default_fb_fini(struct tcpcb *tp, int tcb_is_purged); > +static int tcp_default_handoff_ok(struct tcpcb *tp); This is a mismerge. These three prototypes for tcp_default_* shouldn't have been added and these prototypes are causing the build breakage. (They weren't added in r338053 in HEAD but in an earlier change. This was probably a merge conflict during the MFC). I think the fix is to just remove them. cc -c -O -pipe -g -nostdinc -I. -I/usr/src/sys -D_KERNEL -DHAVE_KERNEL_OPTION_HEADERS -include opt_global.h -MD -MF.depend.tcp_subr.o -MTtcp_subr.o -ffreestanding -fwrapv -fstack-protector -gdwarf-2 -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual -Wundef -Wno-pointer-sign -fformat-extensions -Wmissing-include-dirs -fdiagnostics-show-option -Wno-unknown-pragmas -Wno-uninitialized -fno-common -fms-extensions -finline-limit=15000 --param inline-unit-growth=100 --param large-function-growth=1000 -mcmodel=medany -msoft-float -std=iso9899:1999 -Werror /usr/src/sys/netinet/tcp_subr.c cc1: warnings being treated as errors /usr/src/sys/netinet/tcp_subr.c:232: warning: 'tcp_default_fb_init' declared 'static' but never defined /usr/src/sys/netinet/tcp_subr.c:233: warning: 'tcp_default_fb_fini' declared 'static' but never defined /usr/src/sys/netinet/tcp_subr.c:234: warning: 'tcp_default_handoff_ok' declared 'static' but never defined *** [tcp_subr.o] Error code 1 make[2]: stopped in /usr/obj/sparc64.sparc64/usr/src/sys/GENERIC -- John Baldwin