Re: [edk2-devel] [PATCH v2 1/3] MdeModulePkg: ImagePropertiesRecordLib: Use SectionAlignment for CodeSize
Reviewed-by: Marvin Häuser On Mon, Mar 11, 2024 at 02:29 PM, Oliver Smith-Denny wrote: > > When an ImageRecord is stored by ImagePropertiesRecordLib, it reports the > CodeSegmentSize as the SizeOfRawData from the image. However, the image > as loaded into memory is aligned to the SectionAlignment, so > SizeOfRawData is under the actual size in memory. This is important, > because the memory attributes table uses these image records to create > its entries and it will report that the alignment of an image is > incorrect, even though the actual image is correct. > > This was discovered on ARM64, which has a 64k runtime page granularity > alignment, which is backed by a 64k section alignment for > DXE_RUNTIME_DRIVERs. The runtime code and data was correctly being > loaded into memory, however the memory attribute table was incorrectly > reporting misaligned ranges to the OS, causing attributes to be > ignored for these sections for OSes using greater than 4k pages. > > This patch correctly aligns the CodeSegmentSize to the SectionAlignment > and the corresponding memory attribute table entries are now correctly > aligned and pointing to the right places in memory. > > Cc: Liming Gao > Cc: Leif Lindholm > Cc: Ard Biesheuvel > Cc: Sami Mujawar > Cc: Taylor Beebe > > Signed-off-by: Oliver Smith-Denny > --- > MdeModulePkg/Library/ImagePropertiesRecordLib/ImagePropertiesRecordLib.c= > | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/MdeModulePkg/Library/ImagePropertiesRecordLib/ImagePropertie= > > sRecordLib.c b/MdeModulePkg/Library/ImagePropertiesRecordLib/ImagePropert= > > iesRecordLib.c > index e53ce086c54c..763a8d65d565 100644 > --- a/MdeModulePkg/Library/ImagePropertiesRecordLib/ImagePropertiesRecord= > > Lib.c > +++ b/MdeModulePkg/Library/ImagePropertiesRecordLib/ImagePropertiesRecord= > > Lib.c > @@ -1090,7 +1090,9 @@ CreateImagePropertiesRecord ( > ImageRecordCodeSection->Signature =3D IMAGE_PROPERTIES_RECORD_CODE= > _SECTION_SIGNATURE; > =20 > ImageRecordCodeSection->CodeSegmentBase =3D (UINTN)ImageBase + Sec= > tion[Index].VirtualAddress; > - ImageRecordCodeSection->CodeSegmentSize =3D Section[Index].SizeOfR= > awData; > + // We still need to align the VirtualSize to the SectionAlignment = > because MSVC does not do > + // this when creating a PE image. It expects the loader to do this= > . > + ImageRecordCodeSection->CodeSegmentSize =3D ALIGN_VALUE (Section[I= > ndex].Misc.VirtualSize, SectionAlignment); > =20 > InsertTailList (>CodeSegmentList, = > tion->Link); > ImageRecord->CodeSegmentCount++; > --=20 > 2.40.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#116822): https://edk2.groups.io/g/devel/message/116822 Mute This Topic: https://groups.io/mt/104873193/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH v2 1/3] MdeModulePkg: ImagePropertiesRecordLib: Use SectionAlignment for CodeSize
On Mon, 11 Mar 2024 at 22:29, Oliver Smith-Denny wrote: > > When an ImageRecord is stored by ImagePropertiesRecordLib, it reports the > CodeSegmentSize as the SizeOfRawData from the image. However, the image > as loaded into memory is aligned to the SectionAlignment, so > SizeOfRawData is under the actual size in memory. This is important, > because the memory attributes table uses these image records to create > its entries and it will report that the alignment of an image is > incorrect, even though the actual image is correct. > > This was discovered on ARM64, which has a 64k runtime page granularity > alignment, which is backed by a 64k section alignment for > DXE_RUNTIME_DRIVERs. The runtime code and data was correctly being > loaded into memory, however the memory attribute table was incorrectly > reporting misaligned ranges to the OS, causing attributes to be > ignored for these sections for OSes using greater than 4k pages. > > This patch correctly aligns the CodeSegmentSize to the SectionAlignment > and the corresponding memory attribute table entries are now correctly > aligned and pointing to the right places in memory. > > Cc: Liming Gao > Cc: Leif Lindholm > Cc: Ard Biesheuvel > Cc: Sami Mujawar > Cc: Taylor Beebe > > Signed-off-by: Oliver Smith-Denny > --- > MdeModulePkg/Library/ImagePropertiesRecordLib/ImagePropertiesRecordLib.c | 4 > +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > Reviewed-by: Ard Biesheuvel > diff --git > a/MdeModulePkg/Library/ImagePropertiesRecordLib/ImagePropertiesRecordLib.c > b/MdeModulePkg/Library/ImagePropertiesRecordLib/ImagePropertiesRecordLib.c > index e53ce086c54c..763a8d65d565 100644 > --- a/MdeModulePkg/Library/ImagePropertiesRecordLib/ImagePropertiesRecordLib.c > +++ b/MdeModulePkg/Library/ImagePropertiesRecordLib/ImagePropertiesRecordLib.c > @@ -1090,7 +1090,9 @@ CreateImagePropertiesRecord ( >ImageRecordCodeSection->Signature = > IMAGE_PROPERTIES_RECORD_CODE_SECTION_SIGNATURE; > >ImageRecordCodeSection->CodeSegmentBase = (UINTN)ImageBase + > Section[Index].VirtualAddress; > - ImageRecordCodeSection->CodeSegmentSize = Section[Index].SizeOfRawData; > + // We still need to align the VirtualSize to the SectionAlignment > because MSVC does not do > + // this when creating a PE image. It expects the loader to do this. > + ImageRecordCodeSection->CodeSegmentSize = ALIGN_VALUE > (Section[Index].Misc.VirtualSize, SectionAlignment); > >InsertTailList (>CodeSegmentList, > >Link); >ImageRecord->CodeSegmentCount++; > -- > 2.40.1 > -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#116672): https://edk2.groups.io/g/devel/message/116672 Mute This Topic: https://groups.io/mt/104873193/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
