From owner-dev-commits-src-main@freebsd.org Wed Jan 6 09:20:16 2021 Return-Path: Delivered-To: dev-commits-src-main@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 9DB184C9D3F; Wed, 6 Jan 2021 09:20:16 +0000 (UTC) (envelope-from o.hartmann@walstatt.org) Received: from mout.gmx.net (mout.gmx.net [212.227.17.21]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mout.gmx.net", Issuer "TeleSec ServerPass Class 2 CA" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D9kNc2Mb2z3FR0; Wed, 6 Jan 2021 09:20:15 +0000 (UTC) (envelope-from o.hartmann@walstatt.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1609924814; bh=6dbKO1Z9/QwNguDMBEAbx4LEI6qe7c80katWmoNbyhE=; h=X-UI-Sender-Class:Date:From:To:Cc:Subject:In-Reply-To:References; b=axw4NyF/BFQydTbTdPrR3dejleYB6qgZrRNCDEdXhx5bEikfw9b0dEOxZUsx0oQLI aTHSExbOOLj9yU6KyovqkXZ9vm1EUa0dTxnIsu6KdxmRqnZ1NW7ednZnrREarup/8z UULS5WRjp+9H36Yb4OuQMOdJvFkBf4gxBrTgxrOI= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from hermann.fritz.box ([78.54.32.108]) by mail.gmx.com (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1M42nY-1kx4zG2Fqy-0001gL; Wed, 06 Jan 2021 10:20:14 +0100 Date: Wed, 6 Jan 2021 10:20:02 +0100 From: "Hartmann, O." To: "Kristof Provost" Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: fda7daf06301 - main - pfctl: Stop sharing pf_ruleset.c with the kernel Message-ID: <20210106102002.5af4db05@hermann.fritz.box> In-Reply-To: <1D693FF6-3D56-40C0-A058-5EFF0E3058FD@FreeBSD.org> References: <202101052237.105MbsPa081440@gitrepo.freebsd.org> <20210106055051.51e28498@hermann.fritz.box> <1D693FF6-3D56-40C0-A058-5EFF0E3058FD@FreeBSD.org> Organization: walstatt.org MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/b7U+sqDA68er+geJHYt+r_A"; protocol="application/pgp-signature"; micalg=pgp-sha256 X-Provags-ID: V03:K1:YvPl95q88X+QlwHVUDE/p0rhErZLvJcuOgTcMgXpxEbi1yKV8dv 62zHEugvEhMUv/nwUYyBWlrimK0jAC3QyWmaHJt+IpOhBaFlUJ7xZZ84hx9KYnCM2AdF1pR Fdzj46QIRqIaCKrdaP6JSujpK7Eg781zIf0sW7f3C5TpmPuYTV6DoCkegaN1PriGw+6zzy9 IYMGckFSIcxJM5zEAfcaw== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:LUgV1Z9C0uQ=:SF/1VxDGClRNd0kRn33rbN SH5o8z5WZovMhJ3rkPMFQ3jDHB6DoDxeb31wxEb2KII7ZupjuUd8I9qmEh+cxU1E81n6Bp0Jj 3uZBhI5611MVjYhGeRc+Z5nzh9KeUiJBzOrkUE86t5VaP/Vm+PxqdSe278PZ9CchWtWcdZjHo AFOhpx3YEyOy8yxhThHeC/Q9jTMls2S2tJmxo5plavctXQgDsB3EomtkLK1tauzlnn0++vmrK JrWmB8jhCCpXdRGEGnrsWEIk5s5kRk0mMgm6M/12pDj3VMTCj5NT0P2bfxSMWOSG6NdHDmsI4 1iZz4rdnPoVk4GcBO4BYAHAVnVhLUp+Iw6eAQOZqU5r8APNw/vjVYgVdXp8lhgwR7tjASyL+S zSn8LaBHeoz82QSAdf1ClfOpWewSP3RXuYznAEfcEadXQW5wztpKokMAmqQKvCSFpk9aKejFG LgpgZZvT5tuWo/9GzMm1hXNG7Umd4eC8O7tBzVnakfK+XmIIDx4rU4lbgnk6Udb0rm8L5j48S WkbWcQ5UOVZfvRrO3J1HRKOfkEjP5nKEtvfv+/jg4Z/2Q5fBhgOoUcGJTq5qH6PTVgIVRwCZq cqG4At1q2jiit6H4Q0ATCCscQ5dOnUvH4L3lFHBqXs1Djq+OIchJT203kA/m6MYvpiimYvST6 65ycINfLb2109kVDJ+6uL9teC2Kya7LEZfObsODGCSolJMetcKvkSWiox8wmErfx9PB6YaQVq BbR7riLQ+XDoqfpOK3OrHCuEZ7J8jePpshgrQox1YszRzq1FcetsFUa2D8/8jIh/FI9HfFu4N KMBulsbSTtnpzOb8Z4nmczwGqvAxAAq+b6etZh38uisLo/MY4Gm/YPw4V9I1pZeOCuVOyoPN+ Lfjb0NyQ7i6e0aH7V0FQ== X-Rspamd-Queue-Id: 4D9kNc2Mb2z3FR0 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Jan 2021 09:20:16 -0000 --Sig_/b7U+sqDA68er+geJHYt+r_A Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable On Wed, 06 Jan 2021 07:28:27 +0100 "Kristof Provost" wrote: > On 6 Jan 2021, at 5:50, Hartmann, O. wrote: > > On Tue, 5 Jan 2021 22:37:54 GMT > > Kristof Provost wrote: > > =20 > >> The branch main has been updated by kp: > >> > >> URL:=20 > >> https://cgit.FreeBSD.org/src/commit/?id=3Dfda7daf06301beef1bdad3989123= 2a12c6925b22 > >> > >> commit fda7daf06301beef1bdad39891232a12c6925b22 > >> Author: Kristof Provost > >> AuthorDate: 2020-12-24 15:02:04 +0000 > >> Commit: Kristof Provost > >> CommitDate: 2021-01-05 22:35:37 +0000 > >> > >> pfctl: Stop sharing pf_ruleset.c with the kernel > >> > >> Now that we've split up the datastructures used by the kernel and > >> userspace there's essentually no more overlap between the=20 > >> pf_ruleset.c > >> code used by userspace and kernelspace. > >> > >> Copy the userspace bits to the pfctl directory and stop using the= =20 > >> kernel > >> file. > >> > >> Reviewed by: philip > >> MFC after: 2 weeks > >> Sponsored by: Orange Business Services > >> Differential Revision: https://reviews.freebsd.org/D27764 > >> --- > >> sbin/pfctl/Makefile | 3 - > >> sbin/pfctl/pf_ruleset.c | 343=20 > >> ++++++++++++++++++++++++++++++++++++++++++++ > >> sys/netpfil/pf/pf_ruleset.c | 286=20 > >> +----------------------------------- > >> 3 files changed, 349 insertions(+), 283 deletions(-) > >> =20 > > > > It seems that now make buildkernel fails (at least for me): > > > > > > [...] =20 > > =3D=3D=3D> lib/libelftc (all) =20 > > --- all_subdir_sbin --- > > /usr/src/sys/netpfil/pf/pf_ruleset.c:62:2: error: "Kernel only file.=20 > > Please use > > sbin/pfctl/pf_ruleset.c instead." #error "Kernel only file. Please use > > sbin/pfctl/pf_ruleset.c instead." ^ > > /usr/src/sys/netpfil/pf/pf_ruleset.c:71:39: warning: type specifier=20 > > missing, defaults to > > 'int' [-Wimplicit-int] VNET_DEFINE(struct pf_kanchor_global, =20 > > pf_anchors); > > ^ > > /usr/src/sys/netpfil/pf/pf_ruleset.c:71:1: warning: type specifier=20 > > missing, defaults to > > 'int' [-Wimplicit-int] VNET_DEFINE(struct pf_kanchor_global, =20 > > pf_anchors); > > ^ > > /usr/src/sys/netpfil/pf/pf_ruleset.c:72:33: warning: type specifier=20 > > missing, defaults to > > 'int' [-Wimplicit-int] VNET_DEFINE(struct pf_kanchor, =20 > > pf_main_anchor); > > ^ > > /usr/src/sys/netpfil/pf/pf_ruleset.c:72:1: warning: type specifier=20 > > missing, defaults to > > 'int' [-Wimplicit-int] VNET_DEFINE(struct pf_kanchor, =20 > > pf_main_anchor); > > ^ > > /usr/src/sys/netpfil/pf/pf_ruleset.c:72:1: error: conflicting types=20 > > for 'VNET_DEFINE' > > /usr/src/sys/netpfil/pf/pf_ruleset.c:71:1: note: previous declaration=20 > > is here > > VNET_DEFINE(struct pf_kanchor_global, pf_anchors); > > > > =20 > What architecture are you building for? What kernel config? Do you have=20 > anything in src.conf or make.conf? >=20 > Regards, > Kristof amd64. kernel config is custom, no debug, IPFW, MAC. pf is not used, we use IPFW. = make.conf has only port related stuff. src.conf looks like this: # CPUTYPE?=3D native # CFLAGS+=3D -O3 # for the kernel COPTFLAGS+=3D -O3 # #CXXFLAGS+=3D -std=3Dc++17 # WITH_CLANG_EXTRAS=3D YES WITH_LLDB=3D YES # #WITH_BSD_GREP=3D YES # WITH_OFED_EXTRA=3D YES WITH_NAND=3D YES #WITH_CTF=3D YES # WITH_NVME=3D YES # WITH_BEARSSL=3D YES #Build dynamically linked binaries as Position-Independent Executable (PIE) WITH_PIE=3D YES # WITH_SVN=3D YES # WITH_SORT_THREADS=3D YES # WITH_ZONEINFO_LEAPSECONDS_SUPPORT=3D YES # WITH_MALLOC_PRODUCTION=3D YES # WITHOUT_ASSERT_DEBUG=3D YES WITHOUT_TESTS=3D YES WITHOUT_DEBUG_FILES=3D YES # WITHOUT_CLEAN=3D YES # WITHOUT_REPRODUCIBLE_BUILD=3D YES # # KERNCONF=3D THOR KERNCONFDIR=3D /etc/config/amd64/kernel_conf/ # PORTS_MODULES=3D PORTS_MODULES+=3D x11/nvidia-driver PORTS_MODULES+=3D emulators/virtualbox-ose-kmod Kind regards and thanks in advance, oh --Sig_/b7U+sqDA68er+geJHYt+r_A Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iHUEARYIAB0WIQSy8IBxAPDkqVBaTJ44N1ZZPba5RwUCX/WAwgAKCRA4N1ZZPba5 R1TAAP42LhMBeBlkZOsJWr53+yU4P/3uc+lYA8wSOTMzqpeuFQD/QKQBAh4Tu8Uh oNVpE7vInwlg+ZIGI735tspitYPfLw4= =qJbp -----END PGP SIGNATURE----- --Sig_/b7U+sqDA68er+geJHYt+r_A--