1. Patchew
  2. EDK2
  3. View series

[edk2-devel] [Patch V2] MdePkg: Code optimization to SMM InternalAllocateAlignedPages

duntan posted 1 patch 1 week, 3 days ago
Failed in applying to current master (apply log)
MdePkg/Library/SmmMemoryAllocationLib/MemoryAllocationLib.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[edk2-devel] [Patch V2] MdePkg: Code optimization to SMM InternalAllocateAlignedPages
Posted by duntan 1 week, 3 days ago 
This commit is code optimization to InternalAllocateAlignedPages of
SmmMemoryAllocationLib which can reduce free memory fragments. Also
it can reduce one pre-allocation page.

Let's take a simple example:
The expected pages size is 8KB, Alignment value is 8KB.

In original InternalAllocateAlignedPages(), the first step is to
allocate 4 pages and then find the first 8KB-aligned address in
allocated 4 pages. If the upper limit address of allocated 4 pages
is already 8KB aligned, then the allocated 4 pages contains two
8KB-aligned 8KB ranges. The lower 2 pages will be selected and
removed from free pages. Then the higher 2 pages will be free.
Since the whole memory allocation is from high address to low
address, then the higher 2 pages cann't be merged with other free
pages, causing the free memory fragments.

However, when only allocate 3(2+2-1) pages, we can avoid the free
memory fragments in specific case. Also 3 pages must contain a
8KB-aligned 8KB range, which meets the requirement. If the upper
limit address of allocated 3 pages is 8KB-aligned, then the higher
2 pages range of allocated 3 pages is 8KB-aligned and will be
selected and removed from free pages. The remaining lower one page
of allocated 3 pages will be free and merged with left lower free
memory. This can reduce free memory fragments in smm.

Signed-off-by: Dun Tan <dun.tan@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Zhiguang Liu <zhiguang.liu@intel.com>
---
 MdePkg/Library/SmmMemoryAllocationLib/MemoryAllocationLib.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MdePkg/Library/SmmMemoryAllocationLib/MemoryAllocationLib.c b/MdePkg/Library/SmmMemoryAllocationLib/MemoryAllocationLib.c
index 3ab2c1ebfd..99a8259325 100644
--- a/MdePkg/Library/SmmMemoryAllocationLib/MemoryAllocationLib.c
+++ b/MdePkg/Library/SmmMemoryAllocationLib/MemoryAllocationLib.c
@@ -322,7 +322,7 @@ InternalAllocateAlignedPages (
     // Calculate the total number of pages since alignment is larger than page size.
     //
     AlignmentMask = Alignment - 1;
-    RealPages     = Pages + EFI_SIZE_TO_PAGES (Alignment);
+    RealPages     = Pages + EFI_SIZE_TO_PAGES (Alignment) - 1;
     //
     // Make sure that Pages plus EFI_SIZE_TO_PAGES (Alignment) does not overflow.
     //
-- 
2.31.1.windows.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#105012): https://edk2.groups.io/g/devel/message/105012
Mute This Topic: https://groups.io/mt/98986911/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [Patch V2] MdePkg: Code optimization to SMM InternalAllocateAlignedPages
Posted by Ni, Ray 1 week, 3 days ago 
Reviewed-by: Ray Ni <ray.ni@intel.com>

> -----Original Message-----
> From: Tan, Dun <dun.tan@intel.com>
> Sent: Thursday, May 18, 2023 3:31 PM
> To: devel@edk2.groups.io
> Cc: Ni, Ray <ray.ni@intel.com>; Kinney, Michael D
> <michael.d.kinney@intel.com>; Gao, Liming <gaoliming@byosoft.com.cn>; Liu,
> Zhiguang <zhiguang.liu@intel.com>
> Subject: [Patch V2] MdePkg: Code optimization to SMM
> InternalAllocateAlignedPages
> 
> This commit is code optimization to InternalAllocateAlignedPages of
> SmmMemoryAllocationLib which can reduce free memory fragments. Also
> it can reduce one pre-allocation page.
> 
> Let's take a simple example:
> The expected pages size is 8KB, Alignment value is 8KB.
> 
> In original InternalAllocateAlignedPages(), the first step is to
> allocate 4 pages and then find the first 8KB-aligned address in
> allocated 4 pages. If the upper limit address of allocated 4 pages
> is already 8KB aligned, then the allocated 4 pages contains two
> 8KB-aligned 8KB ranges. The lower 2 pages will be selected and
> removed from free pages. Then the higher 2 pages will be free.
> Since the whole memory allocation is from high address to low
> address, then the higher 2 pages cann't be merged with other free
> pages, causing the free memory fragments.
> 
> However, when only allocate 3(2+2-1) pages, we can avoid the free
> memory fragments in specific case. Also 3 pages must contain a
> 8KB-aligned 8KB range, which meets the requirement. If the upper
> limit address of allocated 3 pages is 8KB-aligned, then the higher
> 2 pages range of allocated 3 pages is 8KB-aligned and will be
> selected and removed from free pages. The remaining lower one page
> of allocated 3 pages will be free and merged with left lower free
> memory. This can reduce free memory fragments in smm.
> 
> Signed-off-by: Dun Tan <dun.tan@intel.com>
> Cc: Ray Ni <ray.ni@intel.com>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Cc: Liming Gao <gaoliming@byosoft.com.cn>
> Cc: Zhiguang Liu <zhiguang.liu@intel.com>
> ---
>  MdePkg/Library/SmmMemoryAllocationLib/MemoryAllocationLib.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/MdePkg/Library/SmmMemoryAllocationLib/MemoryAllocationLib.c
> b/MdePkg/Library/SmmMemoryAllocationLib/MemoryAllocationLib.c
> index 3ab2c1ebfd..99a8259325 100644
> --- a/MdePkg/Library/SmmMemoryAllocationLib/MemoryAllocationLib.c
> +++ b/MdePkg/Library/SmmMemoryAllocationLib/MemoryAllocationLib.c
> @@ -322,7 +322,7 @@ InternalAllocateAlignedPages (
>      // Calculate the total number of pages since alignment is larger than page size.
>      //
>      AlignmentMask = Alignment - 1;
> -    RealPages     = Pages + EFI_SIZE_TO_PAGES (Alignment);
> +    RealPages     = Pages + EFI_SIZE_TO_PAGES (Alignment) - 1;
>      //
>      // Make sure that Pages plus EFI_SIZE_TO_PAGES (Alignment) does not
> overflow.
>      //
> --
> 2.31.1.windows.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#105014): https://edk2.groups.io/g/devel/message/105014
Mute This Topic: https://groups.io/mt/98986911/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/leave/3901457/1787277/102458076/xyzzy [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [Patch V2] MdePkg: Code optimization to SMM InternalAllocateAlignedPages
Posted by Michael D Kinney 1 week, 3 days ago 
Is this considered a critical bug for stable tag release?

Is there are HSD and if it is critical, all memory allocation lobs should be fixed.  Right?

Mike

> -----Original Message-----
> From: Ni, Ray <ray.ni@intel.com>
> Sent: Thursday, May 18, 2023 1:55 AM
> To: Tan, Dun <dun.tan@intel.com>; devel@edk2.groups.io
> Cc: Kinney, Michael D <michael.d.kinney@intel.com>; Gao, Liming
> <gaoliming@byosoft.com.cn>; Liu, Zhiguang <zhiguang.liu@intel.com>
> Subject: RE: [Patch V2] MdePkg: Code optimization to SMM
> InternalAllocateAlignedPages
> 
> Reviewed-by: Ray Ni <ray.ni@intel.com>
> 
> > -----Original Message-----
> > From: Tan, Dun <dun.tan@intel.com>
> > Sent: Thursday, May 18, 2023 3:31 PM
> > To: devel@edk2.groups.io
> > Cc: Ni, Ray <ray.ni@intel.com>; Kinney, Michael D
> > <michael.d.kinney@intel.com>; Gao, Liming <gaoliming@byosoft.com.cn>;
> Liu,
> > Zhiguang <zhiguang.liu@intel.com>
> > Subject: [Patch V2] MdePkg: Code optimization to SMM
> > InternalAllocateAlignedPages
> >
> > This commit is code optimization to InternalAllocateAlignedPages of
> > SmmMemoryAllocationLib which can reduce free memory fragments. Also
> > it can reduce one pre-allocation page.
> >
> > Let's take a simple example:
> > The expected pages size is 8KB, Alignment value is 8KB.
> >
> > In original InternalAllocateAlignedPages(), the first step is to
> > allocate 4 pages and then find the first 8KB-aligned address in
> > allocated 4 pages. If the upper limit address of allocated 4 pages
> > is already 8KB aligned, then the allocated 4 pages contains two
> > 8KB-aligned 8KB ranges. The lower 2 pages will be selected and
> > removed from free pages. Then the higher 2 pages will be free.
> > Since the whole memory allocation is from high address to low
> > address, then the higher 2 pages cann't be merged with other free
> > pages, causing the free memory fragments.
> >
> > However, when only allocate 3(2+2-1) pages, we can avoid the free
> > memory fragments in specific case. Also 3 pages must contain a
> > 8KB-aligned 8KB range, which meets the requirement. If the upper
> > limit address of allocated 3 pages is 8KB-aligned, then the higher
> > 2 pages range of allocated 3 pages is 8KB-aligned and will be
> > selected and removed from free pages. The remaining lower one page
> > of allocated 3 pages will be free and merged with left lower free
> > memory. This can reduce free memory fragments in smm.
> >
> > Signed-off-by: Dun Tan <dun.tan@intel.com>
> > Cc: Ray Ni <ray.ni@intel.com>
> > Cc: Michael D Kinney <michael.d.kinney@intel.com>
> > Cc: Liming Gao <gaoliming@byosoft.com.cn>
> > Cc: Zhiguang Liu <zhiguang.liu@intel.com>
> > ---
> >  MdePkg/Library/SmmMemoryAllocationLib/MemoryAllocationLib.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git
> a/MdePkg/Library/SmmMemoryAllocationLib/MemoryAllocationLib.c
> > b/MdePkg/Library/SmmMemoryAllocationLib/MemoryAllocationLib.c
> > index 3ab2c1ebfd..99a8259325 100644
> > --- a/MdePkg/Library/SmmMemoryAllocationLib/MemoryAllocationLib.c
> > +++ b/MdePkg/Library/SmmMemoryAllocationLib/MemoryAllocationLib.c
> > @@ -322,7 +322,7 @@ InternalAllocateAlignedPages (
> >      // Calculate the total number of pages since alignment is larger than
> page size.
> >      //
> >      AlignmentMask = Alignment - 1;
> > -    RealPages     = Pages + EFI_SIZE_TO_PAGES (Alignment);
> > +    RealPages     = Pages + EFI_SIZE_TO_PAGES (Alignment) - 1;
> >      //
> >      // Make sure that Pages plus EFI_SIZE_TO_PAGES (Alignment) does not
> > overflow.
> >      //
> > --
> > 2.31.1.windows.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#105037): https://edk2.groups.io/g/devel/message/105037
Mute This Topic: https://groups.io/mt/98986911/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/leave/3901457/1787277/102458076/xyzzy [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [Patch V2] MdePkg: Code optimization to SMM InternalAllocateAlignedPages
Posted by Ni, Ray 1 week, 2 days ago 
Mike,
No. The code is there for couple years. With that fact, I don't think it's a critical bug.

Yes. all memory allocation libs should be fixed. We start with the SMM one first to see feedbacks.

Thanks,
Ray

> -----Original Message-----
> From: Kinney, Michael D <michael.d.kinney@intel.com>
> Sent: Thursday, May 18, 2023 11:38 PM
> To: Ni, Ray <ray.ni@intel.com>; Tan, Dun <dun.tan@intel.com>;
> devel@edk2.groups.io
> Cc: Gao, Liming <gaoliming@byosoft.com.cn>; Liu, Zhiguang
> <zhiguang.liu@intel.com>; Kinney, Michael D <michael.d.kinney@intel.com>
> Subject: RE: [Patch V2] MdePkg: Code optimization to SMM
> InternalAllocateAlignedPages
> 
> Is this considered a critical bug for stable tag release?
> 
> Is there are HSD and if it is critical, all memory allocation lobs should be fixed.
> Right?
> 
> Mike
> 
> > -----Original Message-----
> > From: Ni, Ray <ray.ni@intel.com>
> > Sent: Thursday, May 18, 2023 1:55 AM
> > To: Tan, Dun <dun.tan@intel.com>; devel@edk2.groups.io
> > Cc: Kinney, Michael D <michael.d.kinney@intel.com>; Gao, Liming
> > <gaoliming@byosoft.com.cn>; Liu, Zhiguang <zhiguang.liu@intel.com>
> > Subject: RE: [Patch V2] MdePkg: Code optimization to SMM
> > InternalAllocateAlignedPages
> >
> > Reviewed-by: Ray Ni <ray.ni@intel.com>
> >
> > > -----Original Message-----
> > > From: Tan, Dun <dun.tan@intel.com>
> > > Sent: Thursday, May 18, 2023 3:31 PM
> > > To: devel@edk2.groups.io
> > > Cc: Ni, Ray <ray.ni@intel.com>; Kinney, Michael D
> > > <michael.d.kinney@intel.com>; Gao, Liming <gaoliming@byosoft.com.cn>;
> > Liu,
> > > Zhiguang <zhiguang.liu@intel.com>
> > > Subject: [Patch V2] MdePkg: Code optimization to SMM
> > > InternalAllocateAlignedPages
> > >
> > > This commit is code optimization to InternalAllocateAlignedPages of
> > > SmmMemoryAllocationLib which can reduce free memory fragments. Also
> > > it can reduce one pre-allocation page.
> > >
> > > Let's take a simple example:
> > > The expected pages size is 8KB, Alignment value is 8KB.
> > >
> > > In original InternalAllocateAlignedPages(), the first step is to
> > > allocate 4 pages and then find the first 8KB-aligned address in
> > > allocated 4 pages. If the upper limit address of allocated 4 pages
> > > is already 8KB aligned, then the allocated 4 pages contains two
> > > 8KB-aligned 8KB ranges. The lower 2 pages will be selected and
> > > removed from free pages. Then the higher 2 pages will be free.
> > > Since the whole memory allocation is from high address to low
> > > address, then the higher 2 pages cann't be merged with other free
> > > pages, causing the free memory fragments.
> > >
> > > However, when only allocate 3(2+2-1) pages, we can avoid the free
> > > memory fragments in specific case. Also 3 pages must contain a
> > > 8KB-aligned 8KB range, which meets the requirement. If the upper
> > > limit address of allocated 3 pages is 8KB-aligned, then the higher
> > > 2 pages range of allocated 3 pages is 8KB-aligned and will be
> > > selected and removed from free pages. The remaining lower one page
> > > of allocated 3 pages will be free and merged with left lower free
> > > memory. This can reduce free memory fragments in smm.
> > >
> > > Signed-off-by: Dun Tan <dun.tan@intel.com>
> > > Cc: Ray Ni <ray.ni@intel.com>
> > > Cc: Michael D Kinney <michael.d.kinney@intel.com>
> > > Cc: Liming Gao <gaoliming@byosoft.com.cn>
> > > Cc: Zhiguang Liu <zhiguang.liu@intel.com>
> > > ---
> > >  MdePkg/Library/SmmMemoryAllocationLib/MemoryAllocationLib.c | 2 +-
> > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git
> > a/MdePkg/Library/SmmMemoryAllocationLib/MemoryAllocationLib.c
> > > b/MdePkg/Library/SmmMemoryAllocationLib/MemoryAllocationLib.c
> > > index 3ab2c1ebfd..99a8259325 100644
> > > --- a/MdePkg/Library/SmmMemoryAllocationLib/MemoryAllocationLib.c
> > > +++ b/MdePkg/Library/SmmMemoryAllocationLib/MemoryAllocationLib.c
> > > @@ -322,7 +322,7 @@ InternalAllocateAlignedPages (
> > >      // Calculate the total number of pages since alignment is larger than
> > page size.
> > >      //
> > >      AlignmentMask = Alignment - 1;
> > > -    RealPages     = Pages + EFI_SIZE_TO_PAGES (Alignment);
> > > +    RealPages     = Pages + EFI_SIZE_TO_PAGES (Alignment) - 1;
> > >      //
> > >      // Make sure that Pages plus EFI_SIZE_TO_PAGES (Alignment) does not
> > > overflow.
> > >      //
> > > --
> > > 2.31.1.windows.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#105052): https://edk2.groups.io/g/devel/message/105052
Mute This Topic: https://groups.io/mt/98986911/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/leave/3901457/1787277/102458076/xyzzy [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Patchew 2.1-devel-0870f84

© 2016 - 2023 Red Hat, Inc.