From owner-svn-src-head@freebsd.org Tue Jun 2 15:07:37 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6E93B2F1BD8; Tue, 2 Jun 2020 15:07:37 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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-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 49bwPz4ZV6z44Qj; Tue, 2 Jun 2020 15:07:35 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from mail-qk1-f182.google.com (mail-qk1-f182.google.com [209.85.222.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) (Authenticated sender: kevans) by smtp.freebsd.org (Postfix) with ESMTPSA id 4EB921B78D; Tue, 2 Jun 2020 15:07:34 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: by mail-qk1-f182.google.com with SMTP id f18so12865842qkh.1; Tue, 02 Jun 2020 08:07:34 -0700 (PDT) X-Gm-Message-State: AOAM533S4iAslzyl/sYvjqBV7P4HIlmlLYxIfAI2rYyEta8eJbnf94Nj As5DV5gRxYnHjzckfbPVD1p2yV4L9l/TFfTjwqk= X-Google-Smtp-Source: ABdhPJwftzdS/gD9MkorQpV+ZcmmebGJPOGEfZMV5t1upfF9amsTVlu/WLDQ9K5JD/33CRqie33KUka3VBZnZYOqN9Q= X-Received: by 2002:a37:4dcc:: with SMTP id a195mr25921891qkb.430.1591110453553; Tue, 02 Jun 2020 08:07:33 -0700 (PDT) MIME-Version: 1.0 References: <202005291922.04TJMemQ098017@repo.freebsd.org> <20200531114318.2b415934@hermann.fritz.box> <20200601081810.79c9fb1d@hermann.fritz.box> <6b8d4731-15e0-4c0b-af5f-bbecdbead7e3@FreeBSD.org> In-Reply-To: <6b8d4731-15e0-4c0b-af5f-bbecdbead7e3@FreeBSD.org> From: Kyle Evans Date: Tue, 2 Jun 2020 10:07:20 -0500 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r361633 - in head/sys: net netipsec To: John Baldwin Cc: "Hartmann, O." , src-committers , svn-src-all , svn-src-head Content-Type: text/plain; charset="UTF-8" X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Jun 2020 15:07:37 -0000 On Tue, Jun 2, 2020 at 10:05 AM John Baldwin wrote: > > On 6/1/20 8:02 AM, Kyle Evans wrote: > > On Mon, Jun 1, 2020 at 1:18 AM Hartmann, O. wrote: > >> > >> On Sun, 31 May 2020 11:43:18 +0200 > >> "Hartmann, O." wrote: > >> > >>> On Fri, 29 May 2020 19:22:40 +0000 (UTC) > >>> John Baldwin wrote: > >>> > >>>> Author: jhb > >>>> Date: Fri May 29 19:22:40 2020 > >>>> New Revision: 361633 > >>>> URL: https://svnweb.freebsd.org/changeset/base/361633 > >>>> > >>>> Log: > >>>> Consistently include opt_ipsec.h for consumers of > >>>> . > >>>> This fixes ipsec.ko to include all of IPSEC_DEBUG. > >>>> > >>> [... snip ...] > >>> > >>> [...] > >>> --- all_subdir_ipsec --- > >>> --- ipsec_mod.o --- > >>> /usr/src/sys/netipsec/ipsec_mod.c:114:3: error: implicit declaration > >>> of function 'ipsec_support_enable' is invalid in C99 > >>> [-Werror,-Wimplicit-function-declaration] > >>> ipsec_support_enable(ipv4_ipsec_support, &ipv4_methods); ^ > >>> /usr/src/sys/netipsec/ipsec_mod.c:125:3: error: implicit declaration > >>> of function 'ipsec_support_disable' is invalid in C99 > >>> [-Werror,-Wimplicit-function-declaration] > >>> ipsec_support_disable(ipv4_ipsec_support); ^ --- all_subdir_ipwfw --- > >>> Building > >>> /usr/obj/usr/src/amd64.amd64/sys/WALHALL/modules/usr/src/sys/modules/ipwfw/ipw_bss/ipw_bss.ko > >>> --- all_subdir_ipsec --- /usr/src/sys/netipsec/ipsec_mod.c:125:3: > >>> note: did you mean 'ipsec_support_enable'? > >>> /usr/src/sys/netipsec/ipsec_mod.c:114:3: note: 'ipsec_support_enable' > >>> declared here ipsec_support_enable(ipv4_ipsec_support, &ipv4_methods); > >>> ^ 2 errors generated. *** [ipsec_mod.o] Error code 1 > >>> > >>> make[4]: stopped in /usr/src/sys/modules/ipsec > >> > >> FYI: IPSEC is statically built into the kernel via "options IPSEC" > > > > This is the same failure as we're seeing on LINT kernels, which also > > have both. I've got a tentative diff at [0] that teaches the modules > > to cope with the possibility, but I haven't thought too much on how > > useful the result is. IIRC we're building the modules into the kernel > > anyways in this scenario, so the result probably just won't load > > because it's already loaded. > > > > [0] https://people.freebsd.org/~kevans.ipsec.diff > > I think we should just not build ipsec.ko and tcp_md5.ko if the kernel already > includes the support instead. I started testing this yesterday but got side > tracked. I will try to get this fixed today. > Hi, Sorry, I forgot to follow up- I went ahead and tested+committed that as r361712 to end the Jenkins spam. Thanks, Kyle Evans