svn commit: r352657 - in head/sys: conf kern modules/tcp modules/tcp/bbr netinet netinet/tcp_stacks sys

[Randall Stewart]

Hmm

It looks like BBR needs an update too since it calls the inpcb detach of the ratelimit function too… I may
need to reassess this since it should use only the tcp_ratelimit interfaces… but for now an simple
ifdef will work

make sure to pick up r352660

(and actually it might be best to include ratelimit.. it costs little and makes it so if you
 do get a nic that supports rate limiting you will be able to take advantage of it)

R

> On Sep 24, 2019, at 1:06 PM, Randall Stewart <rrs at netflix.com> wrote:
> 
> Right
> 
> Thats because GENERIC does not add the optional TCP stacks.
> 
> Ok the problem is fixed with r352659
> 
> The tcp_ratelimit.h had a mixed up ifdef
> 
> i.e.
> 
> #ifdef RATELIMIT
> #ifdef _KERNEL
> 
> definitions
> 
> #else
> 
> macro definitions that return error
> #endif
> #endif
> 
> 
> Which should have  been the opposite
> 
> #ifdef _KERNEL
> #ifdef RATELIMIT
> 
> definitions
> 
> #else
> 
> 
> macros def’s returning errors
> 
> #endif
> #endif
> 
> Reversing that will fix the issue if you add the extra stacks but fail to add RATELIMIT
> 
> R
> 
>> On Sep 24, 2019, at 1:01 PM, Li-Wen Hsu <lwhsu at freebsd.org> wrote:
>> 
>> I mean the head (r352657) world and GENERIC kernel can be built
>> successfully on 12.0-R, which is we guaranteed.
>> Also the LINT kernel build is fine on CI:
>> https://ci.freebsd.org/job/FreeBSD-head-amd64-LINT/13781/
>> 
>> So I was curious about the build environment of that build failure.
>> 
>> Best,
>> Li-Wen
>> 
>> On Tue, Sep 24, 2019 at 9:55 PM Randall Stewart <rrs at netflix.com> wrote:
>>> 
>>> 12.0R would not have BBR .. its only in head… hmm it could be a issue with TCP_RATELIMIT not defined
>>> though I did compile GENERIC without the extra stacks (and without rate limit and hpts) and that
>>> compiled ok..
>>> 
>>> R
>>> 
>>>> On Sep 24, 2019, at 12:49 PM, Li-Wen Hsu <lwhsu at freebsd.org> wrote:
>>>> 
>>>> On Tue, Sep 24, 2019 at 9:29 PM O. Hartmann <ohartmann at walstatt.org> wrote:
>>>>> 
>>>>> -----BEGIN PGP SIGNED MESSAGE-----
>>>>> Hash: SHA256
>>>>> 
>>>>> Am Tue, 24 Sep 2019 18:18:11 +0000 (UTC)
>>>>> Randall Stewart <rrs at FreeBSD.org> schrieb:
>>>>> 
>>>>>> Author: rrs
>>>>>> Date: Tue Sep 24 18:18:11 2019
>>>>>> New Revision: 352657
>>>>>> URL: https://svnweb.freebsd.org/changeset/base/352657
>>>> 
>>>> ...
>>>> 
>>>>> This break kernel builds:
>>>>> 
>>>>> [...]
>>>>> /usr/src/sys/modules/tcp/bbr/../../../netinet/tcp_stacks/bbr.c:5613:9: error: implicit
>>>>> declaration of function 'tcp_chg_pacing_rate' is invalid in C99
>>>>> [-Werror,-Wimplicit-function-declaration] nrte = tcp_chg_pacing_rate(bbr->r_ctl.crte, ^
>>>>> /usr/src/sys/modules/tcp/bbr/../../../netinet/tcp_stacks/bbr.c:5613:9: error: this function
>>>>> declaration is not a prototype [-Werror,-Wstrict-prototypes]
>>>>> /usr/src/sys/modules/tcp/bbr/../../../netinet/tcp_stacks/bbr.c:5613:7: error: incompatible
>>>>> integer to pointer conversion assigning to 'const struct tcp_hwrate_limit_table *' from 'int'
>>>>> [-Werror,-Wint-conversion] nrte = tcp_chg_pacing_rate(bbr->r_ctl.crte, ^
>>>>> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- all_subdir_toecore --- Building
>>>>> /usr/obj/usr/src/amd64.amd64/sys/THOR/modules/usr/src/sys/modules/toecore/toecore.ko ---
>>>>> all_subdir_tcp --- /usr/src/sys/modules/tcp/bbr/../../../netinet/tcp_stacks/bbr.c:10443:4:
>>>>> error: implicit declaration of function 'tcp_rel_pacing_rate' is invalid in C99
>>>>> [-Werror,-Wimplicit-function-declaration] tcp_rel_pacing_rate(bbr->r_ctl.crte, bbr->rc_tp); ^
>>>>> - --- all_subdir_tpm ---
>>>>> ===> tpm (all)
>>>>> - --- all_subdir_tcp ---
>>>>> /usr/src/sys/modules/tcp/bbr/../../../netinet/tcp_stacks/bbr.c:10443:4: error: this function
>>>>> declaration is not a prototype [-Werror,-Wstrict-prototypes] --- all_subdir_trm ---
>>>>> ===> trm (all)
>>>>> - --- all_subdir_tcp ---
>>>>> /usr/src/sys/modules/tcp/bbr/../../../netinet/tcp_stacks/bbr.c:14307:21: error: implicit
>>>>> declaration of function 'tcp_set_pacing_rate' is invalid in C99
>>>>> [-Werror,-Wimplicit-function-declaration] bbr->r_ctl.crte = tcp_set_pacing_rate(bbr->rc_tp,
>>>> 
>>>> CI completed a clean build on 12.0-R:
>>>> https://ci.freebsd.org/job/FreeBSD-head-amd64-build/14672/
>>>> 
>>>> What's your build environment and platform?
>>>> 
>>>> Best,
>>>> Li-Wen
>>> 
>>> ------
>>> Randall Stewart
>>> rrs at netflix.com
>>> 
>>> 
>>> 
> 
> ------
> Randall Stewart
> rrs at netflix.com
> 
> 
> 

------
Randall Stewart
rrs at netflix.com