From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=66.187.233.73; helo=mx1.redhat.com; envelope-from=lersek@redhat.com; receiver=edk2-devel@lists.01.org Received: from mx1.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id D5977209603D4 for ; Tue, 29 May 2018 00:25:36 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 46C02402178A; Tue, 29 May 2018 07:25:35 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-120-253.rdu2.redhat.com [10.10.120.253]) by smtp.corp.redhat.com (Postfix) with ESMTP id 03BA86401F; Tue, 29 May 2018 07:25:33 +0000 (UTC) To: "Gao, Liming" , edk2-devel-01 Cc: "Justen, Jordan L" , Gary Lin , Ard Biesheuvel References: <20180528184956.20448-1-lersek@redhat.com> <4A89E2EF3DFEDB4C8BFDE51014F606A14E28DCE4@SHSMSX104.ccr.corp.intel.com> From: Laszlo Ersek Message-ID: <6c4791f6-edd2-556d-3a4c-4108dab05b0b@redhat.com> Date: Tue, 29 May 2018 09:25:33 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 In-Reply-To: <4A89E2EF3DFEDB4C8BFDE51014F606A14E28DCE4@SHSMSX104.ccr.corp.intel.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Tue, 29 May 2018 07:25:35 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Tue, 29 May 2018 07:25:35 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'lersek@redhat.com' RCPT:'' Subject: Re: [PATCH] OvmfPkg: raise DXEFV size to 11 MB X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 May 2018 07:25:37 -0000 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Hi Liming, On 05/29/18 07:25, Gao, Liming wrote: > Laszlo: > OvmfPkgIa32.fdf, OvmfPkgX64.fdf and OvmfPkgIa32X64.fdf are almost same. I suggest to use the single FDF for them. If so, this change is only made once. > > For X64 only module in FDF, we can use below style to include it. > > !if $(E1000_ENABLE) && "X64" in $(ARCH) > FILE DRIVER = 5D695E11-9B3F-4b83-B25F-4A8D5D69BE07 { > SECTION PE32 = Intel3.5/EFIX64/E3522X2.EFI > } > !endif right, at some point in time -- "later" :) -- we should extract most common parts into shared include files. We already do that for a few things (see "DecomprScratchEnd.fdf.inc", "OvmfPkg.fdf.inc", "VarStore.fdf.inc"), but more would be possible to extract, indeed. For now, I prefer to push this patch, because I don't really have time to embark on the refactoring, and the patch fixes a build issue. Thanks! Laszlo >> -----Original Message----- >> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of >> Laszlo Ersek >> Sent: Tuesday, May 29, 2018 2:50 AM >> To: edk2-devel-01 >> Cc: Justen, Jordan L ; Gary Lin ; >> Ard Biesheuvel >> Subject: [edk2] [PATCH] OvmfPkg: raise DXEFV size to 11 MB >> >> Almost exactly two years after commit 2f7b34b20842f, we've grown out the >> 10MB DXEFV: >> >>> build -a IA32 -a X64 -p OvmfPkg/OvmfPkgIa32X64.dsc -b NOOPT -t GCC48 \ >>> -D SMM_REQUIRE -D SECURE_BOOT_ENABLE -D TLS_ENABLE -D >> E1000_ENABLE \ >>> -D HTTP_BOOT_ENABLE -D NETWORK_IP6_ENABLE >>> >>> [...] >>> >>> GenFv: ERROR 3000: Invalid >>> the required fv image size 0xa28d48 exceeds the set fv image size >>> 0xa00000 >> >> Raise the DXEFV size to 11MB. >> >> (For builds that don't need this DXEFV bump, I've checked the >> FVMAIN_COMPACT increase stemming from the additional 1MB padding, >> using >> NOOPT + GCC48 + FD_SIZE_2MB, and no other "-D" flags. In the IA32 build, >> FVMAIN_COMPACT grows by 232 bytes. In the IA32X64 build, >> FVMAIN_COMPACT >> shrinks by 64 bytes. In the X64 build, FVMAIN_COMPACT shrinks by 376 >> bytes.) >> >> Cc: Ard Biesheuvel >> Cc: Gary Lin >> Cc: Jordan Justen >> Contributed-under: TianoCore Contribution Agreement 1.1 >> Signed-off-by: Laszlo Ersek >> --- >> >> Notes: >> - repo & branch: https://github.com/lersek/edk2.git ; dxefv_11mb >> >> - regression-tested with the "crash" tool for vmcore analysis >> >> - regression-tested using S3 suspend/resume with my usual guests, >> including Linux, Windows, i440fx, q35, SMM etc >> >> OvmfPkg/OvmfPkgIa32.fdf | 6 +++--- >> OvmfPkg/OvmfPkgIa32X64.fdf | 6 +++--- >> OvmfPkg/OvmfPkgX64.fdf | 6 +++--- >> 3 files changed, 9 insertions(+), 9 deletions(-) >> >> diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf >> index 0427ded49239..b199713925fe 100644 >> --- a/OvmfPkg/OvmfPkgIa32.fdf >> +++ b/OvmfPkg/OvmfPkgIa32.fdf >> @@ -68,10 +68,10 @@ [FD.OVMF_CODE] >> >> [FD.MEMFD] >> BaseAddress = $(MEMFD_BASE_ADDRESS) >> -Size = 0xB00000 >> +Size = 0xC00000 >> ErasePolarity = 1 >> BlockSize = 0x10000 >> -NumBlocks = 0xB0 >> +NumBlocks = 0xC0 >> >> 0x000000|0x006000 >> >> gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPageTablesBase|gUefiOvmfPkgT >> okenSpaceGuid.PcdOvmfSecPageTablesSize >> @@ -89,7 +89,7 @@ [FD.MEMFD] >> >> gUefiOvmfPkgTokenSpaceGuid.PcdOvmfPeiMemFvBase|gUefiOvmfPkgToke >> nSpaceGuid.PcdOvmfPeiMemFvSize >> FV = PEIFV >> >> -0x100000|0xA00000 >> +0x100000|0xB00000 >> >> gUefiOvmfPkgTokenSpaceGuid.PcdOvmfDxeMemFvBase|gUefiOvmfPkgTok >> enSpaceGuid.PcdOvmfDxeMemFvSize >> FV = DXEFV >> >> diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf >> index 6df47f48cd2c..4ebf64b2b9dc 100644 >> --- a/OvmfPkg/OvmfPkgIa32X64.fdf >> +++ b/OvmfPkg/OvmfPkgIa32X64.fdf >> @@ -68,10 +68,10 @@ [FD.OVMF_CODE] >> >> [FD.MEMFD] >> BaseAddress = $(MEMFD_BASE_ADDRESS) >> -Size = 0xB00000 >> +Size = 0xC00000 >> ErasePolarity = 1 >> BlockSize = 0x10000 >> -NumBlocks = 0xB0 >> +NumBlocks = 0xC0 >> >> 0x000000|0x006000 >> >> gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPageTablesBase|gUefiOvmfPkgT >> okenSpaceGuid.PcdOvmfSecPageTablesSize >> @@ -89,7 +89,7 @@ [FD.MEMFD] >> >> gUefiOvmfPkgTokenSpaceGuid.PcdOvmfPeiMemFvBase|gUefiOvmfPkgToke >> nSpaceGuid.PcdOvmfPeiMemFvSize >> FV = PEIFV >> >> -0x100000|0xA00000 >> +0x100000|0xB00000 >> >> gUefiOvmfPkgTokenSpaceGuid.PcdOvmfDxeMemFvBase|gUefiOvmfPkgTok >> enSpaceGuid.PcdOvmfDxeMemFvSize >> FV = DXEFV >> >> diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf >> index 2e2a1749b5d2..9ca96f928287 100644 >> --- a/OvmfPkg/OvmfPkgX64.fdf >> +++ b/OvmfPkg/OvmfPkgX64.fdf >> @@ -68,10 +68,10 @@ [FD.OVMF_CODE] >> >> [FD.MEMFD] >> BaseAddress = $(MEMFD_BASE_ADDRESS) >> -Size = 0xB00000 >> +Size = 0xC00000 >> ErasePolarity = 1 >> BlockSize = 0x10000 >> -NumBlocks = 0xB0 >> +NumBlocks = 0xC0 >> >> 0x000000|0x006000 >> >> gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPageTablesBase|gUefiOvmfPkgT >> okenSpaceGuid.PcdOvmfSecPageTablesSize >> @@ -89,7 +89,7 @@ [FD.MEMFD] >> >> gUefiOvmfPkgTokenSpaceGuid.PcdOvmfPeiMemFvBase|gUefiOvmfPkgToke >> nSpaceGuid.PcdOvmfPeiMemFvSize >> FV = PEIFV >> >> -0x100000|0xA00000 >> +0x100000|0xB00000 >> >> gUefiOvmfPkgTokenSpaceGuid.PcdOvmfDxeMemFvBase|gUefiOvmfPkgTok >> enSpaceGuid.PcdOvmfDxeMemFvSize >> FV = DXEFV >> >> -- >> 2.14.1.3.gb7cf6e02401b >> >> _______________________________________________ >> edk2-devel mailing list >> edk2-devel@lists.01.org >> https://lists.01.org/mailman/listinfo/edk2-devel