From nobody Tue Jun 4 22:25:29 2024 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 4Vv4t90W51z5MmM4; Tue, 04 Jun 2024 22:25:37 +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 4Vv4t84Stkz43lG; Tue, 4 Jun 2024 22:25:36 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: from tom.home (kib@localhost [127.0.0.1] (may be forged)) by kib.kiev.ua (8.18.1/8.18.1) with ESMTP id 454MPTIP045768; Wed, 5 Jun 2024 01:25:32 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 454MPTIP045768 Received: (from kostik@localhost) by tom.home (8.18.1/8.18.1/Submit) id 454MPTx4045766; Wed, 5 Jun 2024 01:25:29 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Wed, 5 Jun 2024 01:25:29 +0300 From: Konstantin Belousov To: Stefan =?utf-8?B?RcOfZXI=?= Cc: Jessica Clarke , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Subject: Re: git: 077f757d72e5 - main - newfs_msdos: align data area to VM page boundary by default Message-ID: References: <202406021227.452CRx8I007470@gitrepo.freebsd.org> <6D077B35-48BA-4516-BAB7-0B23CD3AB042@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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.1 X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on tom.home X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated 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-Queue-Id: 4Vv4t84Stkz43lG On Tue, Jun 04, 2024 at 08:39:16AM +0200, Stefan Eßer wrote: > Am 03.06.24 um 19:25 schrieb Jessica Clarke: > > On 2 Jun 2024, at 13:27, Stefan Eßer wrote: > > > > > > The branch main has been updated by se: > > > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=077f757d72e561eb84193d8e58f63e96e69b8096 > > > > > > commit 077f757d72e561eb84193d8e58f63e96e69b8096 > > > Author: Stefan Eßer > > > AuthorDate: 2024-06-02 12:07:52 +0000 > > > Commit: Stefan Eßer > > > CommitDate: 2024-06-02 12:07:52 +0000 > > > > > > newfs_msdos: align data area to VM page boundary by default > [...] > > > > Hi, > > This has completely broken[1] all of the Linux and macOS cross-build CI > > jobs (which pass -DWITH_DISK_IMAGE_TOOLS_BOOTSTRAP). Please either fix > > this promptly or back it out until you can do so. > > > > Jess > > > > [1] See https://github.com/freebsd/freebsd-src/actions/runs/9338256762 > > Thank you for the report and sorry for the breakage. > > This should be fixed in commit 41ee91c64f47faaa by skipping the > alignment of the data area, if PAGE_SIZE is not defined. > > An alternative approach would have been to define PAGE_SIZE to a > sane default value of 4096 (as used on most current architectures > by default), if not set in the build environment. > > If there is consensus that this would be more appropriate (since > it matches what the man page says), I'd revert the latest commit > and instead of it commit the following change: I believe this is a better approach. It does not unexpectedly hide some code. > > index 1bca560a59e1..c4f18a28ec39 100644 > --- a/sbin/newfs_msdos/mkfs_msdos.c > +++ b/sbin/newfs_msdos/mkfs_msdos.c > @@ -55,6 +55,10 @@ > > #include "mkfs_msdos.h" > > +#ifndef PAGE_SIZE > +#define PAGE_SIZE 4096 > +#endif > + > #define MAXU16 0xffff /* maximum unsigned 16-bit quantity */ > #define BPN 4 /* bits per nibble */ > #define NPB 2 /* nibbles per byte */ > > Regards, STefan