From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.24; helo=mga09.intel.com; envelope-from=liming.gao@intel.com; receiver=edk2-devel@lists.01.org Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) (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 7E40F207E4E1F for ; Mon, 28 May 2018 22:25:08 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 28 May 2018 22:25:07 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,455,1520924400"; d="scan'208";a="43570084" Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by fmsmga008.fm.intel.com with ESMTP; 28 May 2018 22:25:07 -0700 Received: from fmsmsx119.amr.corp.intel.com (10.18.124.207) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.319.2; Mon, 28 May 2018 22:25:07 -0700 Received: from shsmsx103.ccr.corp.intel.com (10.239.4.69) by FMSMSX119.amr.corp.intel.com (10.18.124.207) with Microsoft SMTP Server (TLS) id 14.3.319.2; Mon, 28 May 2018 22:25:07 -0700 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.87]) by SHSMSX103.ccr.corp.intel.com ([169.254.4.51]) with mapi id 14.03.0319.002; Tue, 29 May 2018 13:25:03 +0800 From: "Gao, Liming" To: Laszlo Ersek , edk2-devel-01 CC: "Justen, Jordan L" , Gary Lin , Ard Biesheuvel Thread-Topic: [edk2] [PATCH] OvmfPkg: raise DXEFV size to 11 MB Thread-Index: AQHT9rS9l+GRn2s6vE6EZLkUMESIWqRGKVBQ Date: Tue, 29 May 2018 05:25:02 +0000 Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14E28DCE4@SHSMSX104.ccr.corp.intel.com> References: <20180528184956.20448-1-lersek@redhat.com> In-Reply-To: <20180528184956.20448-1-lersek@redhat.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 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 05:25:08 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable 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 on= ce.=20 For X64 only module in FDF, we can use below style to include it.=20 !if $(E1000_ENABLE) && "X64" in $(ARCH) FILE DRIVER =3D 5D695E11-9B3F-4b83-B25F-4A8D5D69BE07 { SECTION PE32 =3D Intel3.5/EFIX64/E3522X2.EFI } !endif Thanks Liming >-----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 =3D $(MEMFD_BASE_ADDRESS) >-Size =3D 0xB00000 >+Size =3D 0xC00000 > ErasePolarity =3D 1 > BlockSize =3D 0x10000 >-NumBlocks =3D 0xB0 >+NumBlocks =3D 0xC0 > > 0x000000|0x006000 > >gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPageTablesBase|gUefiOvmfPkgT >okenSpaceGuid.PcdOvmfSecPageTablesSize >@@ -89,7 +89,7 @@ [FD.MEMFD] > >gUefiOvmfPkgTokenSpaceGuid.PcdOvmfPeiMemFvBase|gUefiOvmfPkgToke >nSpaceGuid.PcdOvmfPeiMemFvSize > FV =3D PEIFV > >-0x100000|0xA00000 >+0x100000|0xB00000 > >gUefiOvmfPkgTokenSpaceGuid.PcdOvmfDxeMemFvBase|gUefiOvmfPkgTok >enSpaceGuid.PcdOvmfDxeMemFvSize > FV =3D 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 =3D $(MEMFD_BASE_ADDRESS) >-Size =3D 0xB00000 >+Size =3D 0xC00000 > ErasePolarity =3D 1 > BlockSize =3D 0x10000 >-NumBlocks =3D 0xB0 >+NumBlocks =3D 0xC0 > > 0x000000|0x006000 > >gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPageTablesBase|gUefiOvmfPkgT >okenSpaceGuid.PcdOvmfSecPageTablesSize >@@ -89,7 +89,7 @@ [FD.MEMFD] > >gUefiOvmfPkgTokenSpaceGuid.PcdOvmfPeiMemFvBase|gUefiOvmfPkgToke >nSpaceGuid.PcdOvmfPeiMemFvSize > FV =3D PEIFV > >-0x100000|0xA00000 >+0x100000|0xB00000 > >gUefiOvmfPkgTokenSpaceGuid.PcdOvmfDxeMemFvBase|gUefiOvmfPkgTok >enSpaceGuid.PcdOvmfDxeMemFvSize > FV =3D 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 =3D $(MEMFD_BASE_ADDRESS) >-Size =3D 0xB00000 >+Size =3D 0xC00000 > ErasePolarity =3D 1 > BlockSize =3D 0x10000 >-NumBlocks =3D 0xB0 >+NumBlocks =3D 0xC0 > > 0x000000|0x006000 > >gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPageTablesBase|gUefiOvmfPkgT >okenSpaceGuid.PcdOvmfSecPageTablesSize >@@ -89,7 +89,7 @@ [FD.MEMFD] > >gUefiOvmfPkgTokenSpaceGuid.PcdOvmfPeiMemFvBase|gUefiOvmfPkgToke >nSpaceGuid.PcdOvmfPeiMemFvSize > FV =3D PEIFV > >-0x100000|0xA00000 >+0x100000|0xB00000 > >gUefiOvmfPkgTokenSpaceGuid.PcdOvmfDxeMemFvBase|gUefiOvmfPkgTok >enSpaceGuid.PcdOvmfDxeMemFvSize > FV =3D DXEFV > >-- >2.14.1.3.gb7cf6e02401b > >_______________________________________________ >edk2-devel mailing list >edk2-devel@lists.01.org >https://lists.01.org/mailman/listinfo/edk2-devel