From nobody Tue Jun 04 06:39:16 2024 X-Original-To: dev-commits-src-all@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 4VtgtH1G6vz5MZhn; Tue, 04 Jun 2024 06:39:19 +0000 (UTC) (envelope-from se@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VtgtH0kWrz4mDj; Tue, 4 Jun 2024 06:39:19 +0000 (UTC) (envelope-from se@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717483159; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=sJ5VHpqhi+8E1vHcgmePZc7hbraaiUcNiiFAIg5hHUE=; b=ttcEo4cGXgazDKhRiW7OjvQQxvvFv1sQJmw+0NcaY1nG4j83q9f/xqFWXRb+3v9CdCZlrY f1LVjg/O8vuJPtCq27yXXAcXDCk7k40xIqa8rZKZsjaLyNtDkDx7zuHEiJI3mXVq72BE0B BOKlPdbJ4/QiTzk16LC4TqyUKAWqiOZFFgEmLvJyrX4JAAQ+M503sWocNl8Av4isKHXnab lm1KVNm3OZxdZaL0tkcsJJddrbKPxfpIa6EotUU/3iQLX3bKX77vdQGsJh6KPusBw9Kcme oozMunMs3RRI5vxoZgLdwMLJJoGvDjMpydR9W9WTsKX3szAAeF2QRjT7yLLzcg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717483159; a=rsa-sha256; cv=none; b=u8zpA83Syf1knxCyQn1olpx7BIRN82qJt+8LfL1vxvuJ/jt1Ct0wUaUGGfTljzDOOwn62O aGnbz1Vbq2KqDKq7jnSZEe6ZUZrlSlbUvjFf67dT3fS28f97dI/srLni9ClpV1P+gzgVJU MNzYKsCPnOSQVpj/FUx0HDTvyjRWOP52qbPVFn0XxSKDR7PKu03qEvZQS/p9O+ExhXTcXo TD5DPM2TFWxlUnW7Eth8DfLACvEiP/4LdwHG9OExN37BmqkARIlR6G+A7MJ/oQOuTWbdK3 h6amDV415wRSGprxIBa1gJuvTviqL1n11sMfRrGKME81jQS5bKKFZbSI9YGyqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717483159; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=sJ5VHpqhi+8E1vHcgmePZc7hbraaiUcNiiFAIg5hHUE=; b=d5+1Z1e+hK97RaLfOBi43LtCunwT7iwYpx4s7lJREoGM9cEfmR10xurn5CwtxTh/My/+UR 64F+3cs7Am+1ikfvByVa4kVTXmH5EI9AKrYhaOTyQ3/ECvnP3FV113UH9dD8/NrVj7D0Qo NsV3PV5IMG9W2fHmycBYEwrtN1GmloHKsMPH85Ti0aTaz5iVu2nsVzHkXGFhSHE6UvI6HP w+YHGnCozB48urFwsFQdtdXOOwmteNJxyU6pxyJj57LBbzuJZTE2iNL6Zax2RkXwQw4/uJ EEfvMEvyEsO/9ygvz9z4XR5jdnRKsGCBuDhf+kq2/NdkOKBfCa2eLPpJ4HJRCQ== Received: from [192.168.119.168] (p5dc83c4c.dip0.t-ipconnect.de [93.200.60.76]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: se/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4VtgtG2PtQz1HFZ; Tue, 4 Jun 2024 06:39:18 +0000 (UTC) (envelope-from se@FreeBSD.org) Message-ID: Date: Tue, 4 Jun 2024 08:39:16 +0200 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird From: =?UTF-8?Q?Stefan_E=C3=9Fer?= Subject: Re: git: 077f757d72e5 - main - newfs_msdos: align data area to VM page boundary by default To: Jessica Clarke Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" References: <202406021227.452CRx8I007470@gitrepo.freebsd.org> <6D077B35-48BA-4516-BAB7-0B23CD3AB042@freebsd.org> Content-Language: de-DE, en-US In-Reply-To: <6D077B35-48BA-4516-BAB7-0B23CD3AB042@freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit 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: 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