On Thu, Jan 07, 2016 at 06:31:11AM +0100, O. Hartmann wrote:
> Recent r293304 fails to build kernel due to the error below:
>
> [...]
> --- kern_testfrwk.o ---
> cc -O2 -pipe -O3 -O3 -pipe -march=native -fno-strict-aliasing -Werror
> -D_KERNEL -DKLD_MODULE -nostdinc -DHAVE_KERNEL_OPTION_HEADERS
> -include /usr/obj/usr/src/sys/FREYJA/opt_global.h -I. -I/usr/src/sys
> -fno-common -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer
> -I/usr/obj/usr/src/sys/FREYJA -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-value -mno-aes -mno-avx
> -std=iso9899:1999
> -c
> /usr/src/sys/modules/tests/framework/../../../tests/framework/kern_testfrwk.c
> -o kern_testfrwk.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)
> && \ ^ --- sctp_indata.o --- ctfconvert -L
> VERSION sctp_indata.o ERROR: ctfconvert: sctp_indata.o doesn't have type data
> to convert --- modules-all --- --- all_subdir_sfxge --- --- siena_vpd.o --- cc
> -O2 -pipe -O3 -O3 -pipe -march=native -fno-strict-aliasing -Werror -D_KERNEL
> -DKLD_MODULE -nostdinc -DHAVE_KERNEL_OPTION_HEADERS
> -include /usr/obj/usr/src/sys/FREYJA/opt_global.h -I. -I/usr/src/sys
> -fno-common -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer
> -I/usr/obj/usr/src/sys/FREYJA -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-value -mno-aes -mno-avx
> -std=iso9899:1999
> -c /usr/src/sys/modules/sfxge/../../dev/sfxge/common/siena_vpd.c -o
> siena_vpd.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
>
> 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_sfxge ---
> --- siena_sram.o ---
> ctfconvert -L VERSION siena_sram.o
> ERROR: ctfconvert: siena_sram.o doesn't have type data to convert
> --- all_subdir_tests/callout_test ---
> ctfconvert -L VERSION callout_test.o
> ERROR: ctfconvert: callout_test.o doesn't have type data to convert
> A failure has been detected in another branch of the parallel make
>
> make[4]: stopped in /usr/src/sys/modules/tests/callout_test
> *** [all_subdir_tests/callout_test] Error code 2
>
> make[3]: stopped in /usr/src/sys/modules
> --- sctp_input.o ---
> ctfconvert -L VERSION sctp_input.o
> _______________________________________________
> freebsd-current@freebsd.org mailing list
> https://lists.freebsd.org/mailman/listinfo/freebsd-current
> To unsubscribe, send any mail to "freebsd-current-unsubscr...@freebsd.org"The attached patch gets through the buildkernel. After install & reboot, I'm not seeing obvious issues -- I can still talk to the box over TCP, at least. Peace, david -- David H. Wolfskill da...@catwhisker.org Those who would murder in the name of God or prophet are blasphemous cowards. See http://www.catwhisker.org/~david/publickey.gpg for my public key.
Index: sys/netinet/tcp_stacks/fastpath.c =================================================================== --- sys/netinet/tcp_stacks/fastpath.c (revision 293312) +++ sys/netinet/tcp_stacks/fastpath.c (working copy) @@ -164,7 +164,7 @@ #define DELAY_ACK(tp, tlen) \ ((!tcp_timer_active(tp, TT_DELACK) && \ (tp->t_flags & TF_RXWIN0SENT) == 0) && \ - (tlen <= tp->t_maxopd) && \ + (tlen <= tp->t_maxseg) && \ (V_tcp_delack_enabled || (tp->t_flags & TF_NEEDSYN))) /*
signature.asc
Description: PGP signature
