From nobody Tue Feb 28 19:48:14 2023 X-Original-To: dev-commits-src-main@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 4PR7Fy5xQvz3trsd; Tue, 28 Feb 2023 19:48:22 +0000 (UTC) (envelope-from mike@karels.net) Received: from mail2.karels.net (mail2.karels.net [3.19.118.201]) (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 (2048 bits) client-digest SHA256) (Client CN "freebsd", Issuer "freebsd" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PR7Fy41YBz3t3b; Tue, 28 Feb 2023 19:48:22 +0000 (UTC) (envelope-from mike@karels.net) Authentication-Results: mx1.freebsd.org; none Received: from mail2.karels.net (localhost [IPv6:0:0:0:0:0:0:0:1]) by mail2.karels.net (8.16.1/8.16.1) with ESMTP id 31SJmFcg084561; Tue, 28 Feb 2023 13:48:15 -0600 (CST) (envelope-from mike@karels.net) Received: from [10.0.2.130] ([73.62.165.147]) by mail2.karels.net with ESMTPSA id VtqELH9a/mNPSgEAs/W3XQ (envelope-from ); Tue, 28 Feb 2023 13:48:15 -0600 From: Mike Karels To: John Baldwin Cc: Konstantin Belousov , Mateusz Guzik , markj@freebsd.org, src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 68912701700c - main - ffs_suspend.c: clean up includes Date: Tue, 28 Feb 2023 13:48:14 -0600 X-Mailer: MailMate (1.14r5937) Message-ID: In-Reply-To: <8ceb993e-1589-fd24-1786-4438acb9a07f@FreeBSD.org> References: <202212292056.2BTKuOIu047460@gitrepo.freebsd.org> <8ceb993e-1589-fd24-1786-4438acb9a07f@FreeBSD.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4PR7Fy41YBz3t3b X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.16.0.0/14, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On 28 Feb 2023, at 12:55, John Baldwin wrote: > On 1/3/23 3:53 AM, Konstantin Belousov wrote: >> On Mon, Jan 02, 2023 at 06:29:57PM +0100, Mateusz Guzik wrote: >>> On 12/29/22, Konstantin Belousov wrote: >>>> The branch main has been updated by kib: >>>> >>>> URL: >>>> https://cgit.FreeBSD.org/src/commit/?id=3D68912701700ca3230f3e2d4b78= 58a038f884a327 >>>> >>>> commit 68912701700ca3230f3e2d4b7858a038f884a327 >>>> Author: Konstantin Belousov >>>> AuthorDate: 2022-12-28 18:17:53 +0000 >>>> Commit: Konstantin Belousov >>>> CommitDate: 2022-12-29 20:55:39 +0000 >>>> >>>> ffs_suspend.c: clean up includes >>>> >>>> Order includes alphabetically. >>>> Remove unneeded sys/param.h, it is already included by sys/syst= m.h. >>>> >>>> Reviewed by: mckusick >>>> Sponsored by: The FreeBSD Foundation >>>> MFC after: 1 week >>>> Differential revision: https://reviews.freebsd.org/D37896 >>>> --- >>>> sys/ufs/ffs/ffs_suspend.c | 7 +++---- >>>> 1 file changed, 3 insertions(+), 4 deletions(-) >>>> >>>> diff --git a/sys/ufs/ffs/ffs_suspend.c b/sys/ufs/ffs/ffs_suspend.c >>>> index d13097109758..e7c976b6e921 100644 >>>> --- a/sys/ufs/ffs/ffs_suspend.c >>>> +++ b/sys/ufs/ffs/ffs_suspend.c >>>> @@ -33,15 +33,14 @@ >>>> #include >>>> __FBSDID("$FreeBSD$"); >>>> >>>> -#include >>>> #include >>>> #include >>>> -#include >>>> -#include >>>> -#include >>>> #include >>>> +#include >>>> #include >>>> +#include >>>> #include >>>> +#include >>>> >>>> #include >>>> >>>> >>> >>> tinderbox fails the KCSAN et al kernels: >>> >>> In file included from /usr/src/sys/ufs/ffs/ffs_suspend.c:36: >>> In file included from /usr/src/sys/sys/systm.h:44: >>> In file included from ./machine/atomic.h:73: >>> /usr/src/sys/sys/atomic_san.h:117:24: error: unknown type name 'uint8= _t' >>> ATOMIC_SAN_FUNCS(char, uint8_t); >>> ^ >>> it bisects to this commit >>> >> So the problem is that sys/systm.h includes machine/atomic.h which alw= ays >> had the pre-requisite sys/types.h, and this is documented in atomic(9)= =2E >> But sys/atomic_san.h uses C89 types in prototypes, not just macros, an= d >> this breaks for real. >> >> I can >> 1. Just add sys/types.h to ufs_suspend.c (I prefer not) >> 2. Add sys/types.h to sys/atomic_san.h. >> 3. Add sys/types.h to sys/systm.h. >> >> IMO #2 is not the best solution, since it pollutes systm.h only someti= mes, >> when the right kernel options are used. I would prefer #3, it seems, = but >> want to ensure that there is a consensus about the addition to sys/sys= tm.h. > > FYI, I got a different ream of breakages downstream in CheriBSD due to = this > commit removing param.h as well. I also only ever recalled Bruce telli= ng me > to do either or first (and only one of them= ). > I don't recall any special rules for . > > CheriBSD has a local diff that tries to sort headers in systm.h which i= s why > we get larger breakage: > > --- a/sys/sys/systm.h > +++ b/sys/sys/systm.h > @@ -41,13 +41,22 @@ > #define _SYS_SYSTM_H_ > #include > -#include > -#include > #include > #include > #include > #include /* for people using printf main= ly */ > +#include > +#include > > I think if we want to be self-contained we should swap > for . I think moving the includes down would = also be > more consistent with style(9) as well. I prefer retaining or to be the first include= in kernel files, as has long been traditional. systm.h didn=E2=80=99t originally i= nclude param.h, and param.h isn=E2=80=99t anywhere near the top of systm.h. I=E2=80=99m = sure it was just added to unbreak some file that didn=E2=80=99t include param.h when a dependenc= y on MAXCPU crept in. It looks like 15 or more headers in sys/ include ; syst= m.h is not really special in that regard. Finally, style(9) documents use of ei= ther or first, then if needed. Mike