From owner-svn-src-head@freebsd.org Thu Oct 15 19:34:48 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 16173445BAA for ; Thu, 15 Oct 2020 19:34:48 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qv1-xf35.google.com (mail-qv1-xf35.google.com [IPv6:2607:f8b0:4864:20::f35]) (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-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CBzxz0N8dz3cyk for ; Thu, 15 Oct 2020 19:34:47 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qv1-xf35.google.com with SMTP id o25so86450qvf.7 for ; Thu, 15 Oct 2020 12:34:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=wrONjLbvc/CAyS60Q49pke0gfokyV/zmL0Fq+0Us6k4=; b=UWyX3HGqLHq3DYxm9x00PJQ3AD3Xee9OizI6sqsNeJC4rZk6iRD3/Rn/YaiZnW/drN Pvve3/reDFDC2W8qgxctvPuqwbKI6lR3OxEkA96Rwnzw7SXwUO11Smip0fRv+OPjQUPI o9CCzRV7NeAlfrRJWQNeYp9UP0SaWbEaCg+CBPK9AgEVMJCKmX8GK+ZyZZR4qWF9bPpS VlSRqLBq28anq4swC2fwIRicfxkS5wjSw7qmPaQSkzVWUZIPbDh9nLyqsa1v+5P2ARRv qo1SMbRBY47RmEm9s0f6qPrrW7j0hboW8JjZ07IVc0DqRA1zoFT85LDXo/loujncWma2 DEaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=wrONjLbvc/CAyS60Q49pke0gfokyV/zmL0Fq+0Us6k4=; b=YiNIAwz6ZTbX1fRHmNjq8pxwoGlX9pQHLy8fPAzBnHmk9yf0ClEOhPuZ9GqaAxcns9 1ZZiJDlv31/4TTX9TNkV9mKG49+NT4+65znmezuNVIHIYiDXP2g49YaKVyhfJmu/qDBq 0TSG45+hUVvQvaqZG367iFVMEpi5rhCfpZrubiPhBCSqh+ZVX8921nN4+9KH/chCzwfF Ll8a4834vHdJAhDSxxXzOM7IcObWOdsFCOnmet6JWGip/xDqVaPXoyCHcDqt+5iTSfMZ xAnE3NdzrsWbPu2527iooxIneFedR+kbBvibwrgBkinoM4bGqjRwJMbNp7ROyAeaPKZy 5qTg== X-Gm-Message-State: AOAM532SLP3S3UR29v00FCdCpvtkqfuG4SQVpjMQpaG6zKuxwAuFKhs3 ftcfZfoA/G8/cCGbtbG6WA2eRwGJTvUe5jCS4Q0FtQ== X-Google-Smtp-Source: ABdhPJxIWkztsHSgzKP0Iivpp56fzykl4sRPo5yZxyTf49N8n2jvF3bUgm+9z4SqRiUzN3qjR9glrP7egCCLXuIAnnY= X-Received: by 2002:a05:6214:10c4:: with SMTP id r4mr133950qvs.62.1602790485592; Thu, 15 Oct 2020 12:34:45 -0700 (PDT) MIME-Version: 1.0 References: <202010151712.09FHCwA8091241@repo.freebsd.org> In-Reply-To: <202010151712.09FHCwA8091241@repo.freebsd.org> From: Warner Losh Date: Thu, 15 Oct 2020 13:34:34 -0600 Message-ID: Subject: Re: svn commit: r366732 - in head/release: amd64 arm64 To: Glen Barber Cc: src-committers , svn-src-all , svn-src-head X-Rspamd-Queue-Id: 4CBzxz0N8dz3cyk X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=UWyX3HGq; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::f35) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-1.72 / 15.00]; RCVD_TLS_ALL(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; NEURAL_HAM_MEDIUM(-0.86)[-0.856]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; NEURAL_SPAM_SHORT(0.14)[0.140]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[svn-src-head@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::f35:from]; R_SPF_NA(0.00)[no SPF record]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; MAILMAN_DEST(0.00)[svn-src-head]; RCVD_COUNT_TWO(0.00)[2] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.33 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: Thu, 15 Oct 2020 19:34:48 -0000 I'd recommend bumping this to 2MB or larger. This most likely is from the zstd landing which pushed arm64's size over the 1MB limit in memory, so it's only a matter of time before the file grows past 1MB in size. Warner On Thu, Oct 15, 2020 at 11:13 AM Glen Barber wrote: > Author: gjb > Date: Thu Oct 15 17:12:58 2020 > New Revision: 366732 > URL: https://svnweb.freebsd.org/changeset/base/366732 > > Log: > Increase the amd64 ISO ESP file size from 800KB to 1024KB. > > At some poing over the last week, the bootx64.efi file has grown > past the 800KB threshold, resulting in being unable to copy it to > the EFI/BOOT directory. > > # stat -f %z efiboot.znWo7m > 819200 > # stat -f %z stand-test.PIEugN/EFI/BOOT/bootx64.efi > 842752 > > The comment in the script that creates the ISOs suggests that 800KB > is the maximum allowed for the boot code, however I was able to > boot an ISO with a 1024KB boot partition. Additionally, I verified > against an ISO from OtherOS, where the boot EFI partition is 2.4MB. > > Sponsored by: Rubicon Communications, LLC (netgate.com) > > Modified: > head/release/amd64/mkisoimages.sh > head/release/arm64/mkisoimages.sh > > Modified: head/release/amd64/mkisoimages.sh > > ============================================================================== > --- head/release/amd64/mkisoimages.sh Thu Oct 15 17:05:21 2020 > (r366731) > +++ head/release/amd64/mkisoimages.sh Thu Oct 15 17:12:58 2020 > (r366732) > @@ -46,10 +46,10 @@ if [ "$1" = "-b" ]; then > bootable="-o bootimage=i386;$BASEBITSDIR/boot/cdboot -o > no-emul-boot" > > # Make EFI system partition. > - # The ISO file is a special case, in that it only has a maximum of > - # 800 KB available for the boot code. So make an 800 KB ESP > espfilename=$(mktemp /tmp/efiboot.XXXXXX) > - make_esp_file ${espfilename} 800 ${BASEBITSDIR}/boot/loader.efi > + # ESP file size in KB. > + espsize="1024" > + make_esp_file ${espfilename} ${espsize} > ${BASEBITSDIR}/boot/loader.efi > bootable="$bootable -o bootimage=i386;${espfilename} -o > no-emul-boot -o platformid=efi" > > shift > > Modified: head/release/arm64/mkisoimages.sh > > ============================================================================== > --- head/release/arm64/mkisoimages.sh Thu Oct 15 17:05:21 2020 > (r366731) > +++ head/release/arm64/mkisoimages.sh Thu Oct 15 17:12:58 2020 > (r366732) > @@ -40,10 +40,10 @@ if [ "$1" = "-b" ]; then > BASEBITSDIR="$4" > > # Make an EFI system partition. > - # The ISO file is a special case, in that it only has a maximum of > - # 800 KB available for the boot code. So make an 800 KB ESP > espfilename=$(mktemp /tmp/efiboot.XXXXXX) > - make_esp_file ${espfilename} 800 ${BASEBITSDIR}/boot/loader.efi > + # ESP file size in KB. > + espsize="1024" > + make_esp_file ${espfilename} ${espsize} > ${BASEBITSDIR}/boot/loader.efi > > bootable="-o bootimage=efi;${espfilename} -o no-emul-boot -o > platformid=efi" > >