From owner-svn-src-head@freebsd.org Thu Oct 15 19:36:31 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 0862F445E87 for ; Thu, 15 Oct 2020 19:36:31 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qk1-x734.google.com (mail-qk1-x734.google.com [IPv6:2607:f8b0:4864:20::734]) (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 4CBzzy0QTjz3d5B for ; Thu, 15 Oct 2020 19:36:29 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qk1-x734.google.com with SMTP id x20so129743qkn.1 for ; Thu, 15 Oct 2020 12:36:29 -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=EwMnadgbV7PtG+nTXbnDAeZmvtEHHQUpRUgWBqcWugE=; b=bA54CozXuFTTH+buiyyUqC10pNOcZ5wXFxc5S+ePeJwdcNtF9D8sJi0FMXPeLxMuW+ 4iZrTH9gXGB2medLDc4kafK/94bMpsZxl+3Fji2GADhsbk2/NEdiRNQH8ZeQDD9wxDKv YkneGte8Nnm2PlzhLLYfNXBbTEsf/LTCeitvNds1M14LWc2gQriLnbOHKsO1lhjySVRh jKaMNREU6q2nGcdrcOh3CUvLqnACcjIhUbT1GH1z/a1xx36fxNKQvwJD5ABjP2vd2BfF xPbgirGEFiWeOi3dWMzvd1Qe7kmAvuBMa/88jeMF2KAD0o9BFh0h1Fsp39mo+OdFtiBz qpvg== 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=EwMnadgbV7PtG+nTXbnDAeZmvtEHHQUpRUgWBqcWugE=; b=e5YW3uRK3p70hZFhxToXin57JCEA8Ko/KCuB9r/oIE1HEnwA2/GKR+R0weJ9FT4YCk JfpCAlwRFjyJBO3/3CtlEPz6OHhFRGDPgCUQZBqOGZzJM9BLDs1edaMiOYJBFyYv5BZa bStfSK054t3MPAsGWckHM/wRTfN/taq0nma5XQ++NVACkJRW9xxuOyGCJ8TZEfbqT4La 5dSjiVRzonJRMRQu9GBpFaS1y+mmQ7Y+lRh0Jp/fX03d+vTjaumg/sbvV7f9Nq7Rqbeg vcU6bpLC1hW2maICzXJ6HPDhXqNiUuw70NKzx+HIzIWm5Ja2CGRqkpyQ5Af0yfuKS8uI Z4/g== X-Gm-Message-State: AOAM530EPTHSRRABysjVC2CH22Bd48znvs14auTcq51/uboHmywcCJPT SvBaL1nnoOp2R0aScAMiGKNHUbWFfjYwnpnQlNQ0iA== X-Google-Smtp-Source: ABdhPJy5MOAEqFb4kVHye1tfiwX17ZbQAfTqjGcKfaNsUIbDhR40V13Wzrnz/RXyvzAYsn2Va4ON67Kf1iQZdveiQqo= X-Received: by 2002:a05:620a:15a9:: with SMTP id f9mr351382qkk.359.1602790589099; Thu, 15 Oct 2020 12:36:29 -0700 (PDT) MIME-Version: 1.0 References: <202010151712.09FHCwA8091241@repo.freebsd.org> In-Reply-To: From: Warner Losh Date: Thu, 15 Oct 2020 13:36:18 -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: 4CBzzy0QTjz3d5B X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=bA54CozX; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::734) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-1.71 / 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.85)[-0.853]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; NEURAL_SPAM_SHORT(0.14)[0.139]; NEURAL_HAM_LONG(-1.00)[-0.999]; 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::734: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:36:31 -0000 And on a related note, I can make it so we can build w/o ZSTD in the CD boot loader because it's not needed there. I'd rather not, but if the 800k limit is a real thing in relevant places, we have that as an option. Warner On Thu, Oct 15, 2020 at 1:34 PM Warner Losh wrote: > 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" >> >>