From owner-svn-src-head@freebsd.org Tue Jun 2 15:05:24 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 9C1E72F1E92; Tue, 2 Jun 2020 15:05:24 +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) 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 49bwMS3C2Kz44GJ; Tue, 2 Jun 2020 15:05:24 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from John-Baldwins-MacBook-Pro-274.local (unknown [IPv6:2601:648:8203:2990:b194:c7cf:2443:aa95]) (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 DD7461BD08; Tue, 2 Jun 2020 15:05:23 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Subject: Re: svn commit: r361633 - in head/sys: net netipsec To: Kyle Evans , "Hartmann, O." Cc: src-committers , svn-src-all , svn-src-head References: <202005291922.04TJMemQ098017@repo.freebsd.org> <20200531114318.2b415934@hermann.fritz.box> <20200601081810.79c9fb1d@hermann.fritz.box> From: John Baldwin 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: <6b8d4731-15e0-4c0b-af5f-bbecdbead7e3@FreeBSD.org> Date: Tue, 2 Jun 2020 08:05:22 -0700 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:68.0) Gecko/20100101 Thunderbird/68.6.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit 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:05:24 -0000 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. -- John Baldwin