From nobody Fri Jul 14 11:23:25 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4R2Tcj5DbZz2tkBt; Fri, 14 Jul 2023 11:23:33 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4R2Tch6f4Cz3MPg; Fri, 14 Jul 2023 11:23:32 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: from tom.home (kib@localhost [127.0.0.1]) by kib.kiev.ua (8.17.1/8.17.1) with ESMTPS id 36EBNPVq078121 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Fri, 14 Jul 2023 14:23:28 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 36EBNPVq078121 Received: (from kostik@localhost) by tom.home (8.17.1/8.17.1/Submit) id 36EBNPYT078120; Fri, 14 Jul 2023 14:23:25 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Fri, 14 Jul 2023 14:23:25 +0300 From: Konstantin Belousov To: Michael Tuexen Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: be78a31188c5 - main - tcp: fix build issue for some cc modules Message-ID: References: <202307132031.36DKVYIK019476@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202307132031.36DKVYIK019476@gitrepo.freebsd.org> X-Spam-Status: No, score=0.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM,FREEMAIL_REPLY, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.0 X-Spam-Checker-Version: SpamAssassin 4.0.0 (2022-12-14) on tom.home X-Rspamd-Queue-Id: 4R2Tch6f4Cz3MPg X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On Thu, Jul 13, 2023 at 08:31:34PM +0000, Michael Tuexen wrote: > The branch main has been updated by tuexen: > > URL: https://cgit.FreeBSD.org/src/commit/?id=be78a31188c530c93700396ecfdb5604a8f22fff > > commit be78a31188c530c93700396ecfdb5604a8f22fff > Author: Michael Tuexen > AuthorDate: 2023-07-13 16:56:25 +0000 > Commit: Michael Tuexen > CommitDate: 2023-07-13 16:56:25 +0000 > > tcp: fix build issue for some cc modules > > The TCP_HHOOK option was moved from opt_inet.h to opt_global.h in > https://cgit.FreeBSD.org/src/commit/?id=e68b3792440cac248347afe08ba5881a00ba6523 > The corresponding changes in two Makefiles were missed, which resulted > in not building cc_cdg, cc_chd, cc_hd, and cc_vegas anymore. > > Reported by: void@f-m.fm > Reviewed by: rrs, rscheff > Sponsored by: Netflix, Inc. > Differential Revision: https://reviews.freebsd.org/D41010 > --- > sys/modules/cc/Makefile | 6 +++--- > sys/modules/khelp/Makefile | 6 +++--- > 2 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/sys/modules/cc/Makefile b/sys/modules/cc/Makefile > index 3f7110024722..b595cc204481 100644 > --- a/sys/modules/cc/Makefile > +++ b/sys/modules/cc/Makefile > @@ -8,9 +8,9 @@ SUBDIR= cc_newreno \ > > # Do we have the TCP_HHOOK symbol defined? If not, there is no point in > # building these modules by default. > -# We will default to building these modules unless $OPT_INET is defined > -# and does not contain the TCP_HHOOK option. > -.if defined(ALL_MODULES) || ${OPT_INET:UTCP_HHOOK:MTCP_HHOOK} != "" > +# We will default to building these modules if $OPT_GLOBAL does contain > +# the TCP_HHOOK option. > +.if defined(ALL_MODULES) || ${OPT_GLOBAL:UTCP_HHOOK:MTCP_HHOOK} != "" > SUBDIR+= \ > cc_cdg \ > cc_chd \ > diff --git a/sys/modules/khelp/Makefile b/sys/modules/khelp/Makefile > index 256d8838c573..c01d61541062 100644 > --- a/sys/modules/khelp/Makefile > +++ b/sys/modules/khelp/Makefile > @@ -4,9 +4,9 @@ SUBDIR= > > # Do we have the TCP_HHOOK symbol defined? If not, there is no point in > # building this modules by default. > -# We will default to building this module unless $OPT_INET is defined > -# and does not contain the TCP_HHOOK option. > -.if defined(ALL_MODULES) || ${OPT_INET:UTCP_HHOOK:MTCP_HHOOK} != "" > +# We will default to building this module if $OPT_GLOBAL does contain > +# the TCP_HHOOK option. > +.if defined(ALL_MODULES) || ${OPT_GLOBAL:UTCP_HHOOK:MTCP_HHOOK} != "" > SUBDIR+= h_ertt > .endif > It seems modules are actually broken for some configurations. I get ===> cc/cc_cdg (all) /usr/home/kostik/work/DEV/src/sys/netinet/cc/cc_cdg.c:585:47: error: no member named 't_osd' in 'struct tcpcb' e_t = (struct ertt *)khelp_get_osd(&CCV(ccv, t_osd), ertt_id); ~~~~~~~~~^~~~~~ /usr/home/kostik/work/DEV/src/sys/netinet/cc/cc_module.h:59:41: note: expanded from macro 'CCV' #define CCV(ccv, what) (ccv)->ccvc.tcp->what ~~~~~~~~~~~~~~~ ^ 1 error generated. --- cc_cdg.o --- *** [cc_cdg.o] Error code 1