Re: [edk2-devel] [edk2-test][PATCH v1 1/1] uefi-sct/SctPkg: Check for memory below 4G

2023-07-20 Thread Ard Biesheuvel 
On Thu, 20 Jul 2023 at 16:30, G Edhaya Chandran  wrote:
>
> The patch is upstreamed by: 
> https://github.com/tianocore/edk2-test/commit/315e3a56a6d9261d4fad4c1950f2d01a052eeba4

Checking the memory map for memory below 4G only makes sense if the
system has no IOMMU and does not use translation for inbound PCI
transactions.

So the patch seems rather dubious to me.


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#107105): https://edk2.groups.io/g/devel/message/107105
Mute This Topic: https://groups.io/mt/94228672/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [edk2-test][PATCH v1 1/1] uefi-sct/SctPkg: Check for memory below 4G

2023-07-20 Thread G Edhaya Chandran 
The patch is upstreamed by: 
https://github.com/tianocore/edk2-test/commit/315e3a56a6d9261d4fad4c1950f2d01a052eeba4


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#107101): https://edk2.groups.io/g/devel/message/107101
Mute This Topic: https://groups.io/mt/94228672/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [edk2-test][PATCH v1 1/1] uefi-sct/SctPkg: Check for memory below 4G

2022-12-01 Thread Sunny Wang 
Reviewed the patch with Stuart and Edhaya in edk2-test monthly meeting. The 
patch looks good to me. Thanks, Dimitrije.

Reviewed-by: Sunny Wang 

-Original Message-
From: Dimitrije Pavlov 
Sent: 10 October 2022 03:06
To: devel@edk2.groups.io
Cc: G Edhaya Chandran ; Jeff Booher-Kaeding 
; Samer El-Haj-Mahmoud 
; Sunny Wang 
Subject: [edk2-test][PATCH v1 1/1] uefi-sct/SctPkg: Check for memory below 4G

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4009

Check if there is usable memory below 4 GiB before testing for
allocation without the EFI_PCI_ATTRIBUTE_DUAL_ADDRESS_CYCLE attribute.

Cc: G Edhaya Chandran 
Cc: Jeff Booher-Kaeding 
Cc: Samer El-Haj-Mahmoud 
Cc: Sunny Wang 

Signed-off-by: Dimitrije Pavlov 
---
 
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciRootBridgeIo/BlackBoxTest/PciRootBridgeIoBBTestFunction_2.c
 | 142 +++-
 1 file changed, 140 insertions(+), 2 deletions(-)

diff --git 
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciRootBridgeIo/BlackBoxTest/PciRootBridgeIoBBTestFunction_2.c
 
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciRootBridgeIo/BlackBoxTest/PciRootBridgeIoBBTestFunction_2.c
index 89adcba91e70..fafbf62f77c6 100644
--- 
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciRootBridgeIo/BlackBoxTest/PciRootBridgeIoBBTestFunction_2.c
+++ 
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciRootBridgeIo/BlackBoxTest/PciRootBridgeIoBBTestFunction_2.c
@@ -4118,7 +4118,69 @@ AllocateBuffer_Func (
   UINTNAttributesNum;
   EFI_PCI_ROOT_BRIDGE_IO_DEVICE*RBDev;
   EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL  *RootBridgeIo;
+  EFI_MEMORY_DESCRIPTOR*MemoryMap;
+  EFI_MEMORY_DESCRIPTOR*Entry;
+  UINTNMemoryMapSize;
+  UINTNMapKey;
+  UINTNDescriptorSize;
+  UINT32   DescriptorVersion;
+  UINTNIterator;
+  BOOLEAN  UsableMemoryBelow4G;

+  //
+  // Obtain the memory map size
+  //
+  MemoryMapSize = 0;
+  Status = gBS->GetMemoryMap (
+  &MemoryMapSize,
+  NULL,
+  &MapKey,
+  &DescriptorSize,
+  &DescriptorVersion
+  );
+  ASSERT (Status == EFI_BUFFER_TOO_SMALL);
+  //
+  // Allocating a buffer for the memory map will change
+  // the memory map, so we increase the size here just in case
+  //
+  MemoryMapSize += EFI_PAGE_SIZE;
+  Status = gBS->AllocatePool (
+  EfiLoaderData,
+  MemoryMapSize,
+  (VOID **)&MemoryMap
+  );
+  if (EFI_ERROR (Status)) {
+return Status;
+  }
+  //
+  // Get the actual memory map
+  //
+  Status = gBS->GetMemoryMap (
+  &MemoryMapSize,
+  MemoryMap,
+  &MapKey,
+  &DescriptorSize,
+  &DescriptorVersion
+  );
+  if (EFI_ERROR (Status)) {
+gBS->FreePool (MemoryMap);
+  }
+
+  //
+  // Check each entry in the memory map for free memory below 4 GiB and set
+  // UsableMemoryBelow4G accordingly
+  //
+  UsableMemoryBelow4G = FALSE;
+  for (Iterator = 0; Iterator < MemoryMapSize; Iterator += DescriptorSize) {
+Entry = (EFI_MEMORY_DESCRIPTOR *)((UINTN)MemoryMap + Iterator);
+if ( Entry->PhysicalStart < (EFI_PHYSICAL_ADDRESS)SIZE_4GB
+  && ( Entry->Type == EfiConventionalMemory || Entry->Type == 
EfiPersistentMemory))
+{
+  UsableMemoryBelow4G = TRUE;
+  break;
+}
+  }
+  gBS->FreePool (MemoryMap);

   AllocateType = 0;

@@ -4188,7 +4250,14 @@ AllocateBuffer_Func (

   for (MemoryTypeNum = 0; MemoryTypeNum < 2; MemoryTypeNum++) {
 for (AttributesNum = 0; AttributesNum < 8; AttributesNum++) {
-
+  //
+  // If there is no usable memory below 4 GiB, skip 32-bit allocations
+  //
+  if ( !UsableMemoryBelow4G
+&& !(Attributes[AttributesNum] & EFI_PCI_ATTRIBUTE_DUAL_ADDRESS_CYCLE))
+  {
+continue;
+  }
   Status = RootBridgeIo->AllocateBuffer (
RootBridgeIo,
AllocateType,
@@ -4298,7 +4367,69 @@ FreeBuffer_Func (
   UINTNAttributesNum;
   EFI_PCI_ROOT_BRIDGE_IO_DEVICE*RBDev;
   EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL  *RootBridgeIo;
+  EFI_MEMORY_DESCRIPTOR*MemoryMap;
+  EFI_MEMORY_DESCRIPTOR*Entry;
+  UINTNMemoryMapSize;
+  UINTNMapKey;
+  UINTNDescriptorSize;
+  UINT32   DescriptorVersion;
+  UINTNIterator;
+  BOOLEAN

Re: [edk2-devel] [edk2-test][PATCH v1 1/1] uefi-sct/SctPkg: Check for memory below 4G

2022-12-01 Thread G Edhaya Chandran 
Reviewed-by: G Edhaya Chandran 

Refactoring suggestion: Can the code for checking of the UsableMemoryBelow4G 
moved to a function? Since it is used in two places.


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#96831): https://edk2.groups.io/g/devel/message/96831
Mute This Topic: https://groups.io/mt/94228672/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [edk2-test][PATCH v1 1/1] uefi-sct/SctPkg: Check for memory below 4G

2022-11-29 Thread G Edhaya Chandran 
Hi Dimitrije,

For some cases, the above solution may not scale for a system that is capable 
of allocating 64 bit addresses (> 4 GiB).
This may prevent the test from running the full coverage on 64 bit system.

A possible case:
The UEFI-SCT is executing this test on a 64 bit machine.
So far, the memory map contains the ranges only within 4 GB (however this does 
not prevent AllocateBuffer to allocate further higher memory).
After the fix the test will not exercise the cases of AllocateBuffer with 
attribute EFI_PCI_ATTRIBUTE_DUAL_ADDRESS_CYCLE

With Warm Regards,

Edhay


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#96670): https://edk2.groups.io/g/devel/message/96670
Mute This Topic: https://groups.io/mt/94228672/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[edk2-devel] [edk2-test][PATCH v1 1/1] uefi-sct/SctPkg: Check for memory below 4G

2022-10-09 Thread Dimitrije Pavlov 
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4009

Check if there is usable memory below 4 GiB before testing for
allocation without the EFI_PCI_ATTRIBUTE_DUAL_ADDRESS_CYCLE attribute.

Cc: G Edhaya Chandran 
Cc: Jeff Booher-Kaeding 
Cc: Samer El-Haj-Mahmoud 
Cc: Sunny Wang 

Signed-off-by: Dimitrije Pavlov 
---
 
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciRootBridgeIo/BlackBoxTest/PciRootBridgeIoBBTestFunction_2.c
 | 142 +++-
 1 file changed, 140 insertions(+), 2 deletions(-)

diff --git 
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciRootBridgeIo/BlackBoxTest/PciRootBridgeIoBBTestFunction_2.c
 
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciRootBridgeIo/BlackBoxTest/PciRootBridgeIoBBTestFunction_2.c
index 89adcba91e70..fafbf62f77c6 100644
--- 
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciRootBridgeIo/BlackBoxTest/PciRootBridgeIoBBTestFunction_2.c
+++ 
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciRootBridgeIo/BlackBoxTest/PciRootBridgeIoBBTestFunction_2.c
@@ -4118,7 +4118,69 @@ AllocateBuffer_Func (
   UINTNAttributesNum;
   EFI_PCI_ROOT_BRIDGE_IO_DEVICE*RBDev;
   EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL  *RootBridgeIo;
+  EFI_MEMORY_DESCRIPTOR*MemoryMap;
+  EFI_MEMORY_DESCRIPTOR*Entry;
+  UINTNMemoryMapSize;
+  UINTNMapKey;
+  UINTNDescriptorSize;
+  UINT32   DescriptorVersion;
+  UINTNIterator;
+  BOOLEAN  UsableMemoryBelow4G;
 
+  //
+  // Obtain the memory map size
+  //
+  MemoryMapSize = 0;
+  Status = gBS->GetMemoryMap (
+  &MemoryMapSize,
+  NULL,
+  &MapKey,
+  &DescriptorSize,
+  &DescriptorVersion
+  );
+  ASSERT (Status == EFI_BUFFER_TOO_SMALL);
+  //
+  // Allocating a buffer for the memory map will change
+  // the memory map, so we increase the size here just in case
+  //
+  MemoryMapSize += EFI_PAGE_SIZE;
+  Status = gBS->AllocatePool (
+  EfiLoaderData,
+  MemoryMapSize,
+  (VOID **)&MemoryMap
+  );
+  if (EFI_ERROR (Status)) {
+return Status;
+  }
+  //
+  // Get the actual memory map
+  //
+  Status = gBS->GetMemoryMap (
+  &MemoryMapSize,
+  MemoryMap,
+  &MapKey,
+  &DescriptorSize,
+  &DescriptorVersion
+  );
+  if (EFI_ERROR (Status)) {
+gBS->FreePool (MemoryMap);
+  }
+
+  //
+  // Check each entry in the memory map for free memory below 4 GiB and set
+  // UsableMemoryBelow4G accordingly
+  //
+  UsableMemoryBelow4G = FALSE;
+  for (Iterator = 0; Iterator < MemoryMapSize; Iterator += DescriptorSize) {
+Entry = (EFI_MEMORY_DESCRIPTOR *)((UINTN)MemoryMap + Iterator);
+if ( Entry->PhysicalStart < (EFI_PHYSICAL_ADDRESS)SIZE_4GB
+  && ( Entry->Type == EfiConventionalMemory || Entry->Type == 
EfiPersistentMemory))
+{
+  UsableMemoryBelow4G = TRUE;
+  break;
+}
+  }
+  gBS->FreePool (MemoryMap);
 
   AllocateType = 0;
 
@@ -4188,7 +4250,14 @@ AllocateBuffer_Func (
 
   for (MemoryTypeNum = 0; MemoryTypeNum < 2; MemoryTypeNum++) {
 for (AttributesNum = 0; AttributesNum < 8; AttributesNum++) {
-
+  //
+  // If there is no usable memory below 4 GiB, skip 32-bit allocations
+  //
+  if ( !UsableMemoryBelow4G
+&& !(Attributes[AttributesNum] & EFI_PCI_ATTRIBUTE_DUAL_ADDRESS_CYCLE))
+  {
+continue;
+  }
   Status = RootBridgeIo->AllocateBuffer (
RootBridgeIo,
AllocateType,
@@ -4298,7 +4367,69 @@ FreeBuffer_Func (
   UINTNAttributesNum;
   EFI_PCI_ROOT_BRIDGE_IO_DEVICE*RBDev;
   EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL  *RootBridgeIo;
+  EFI_MEMORY_DESCRIPTOR*MemoryMap;
+  EFI_MEMORY_DESCRIPTOR*Entry;
+  UINTNMemoryMapSize;
+  UINTNMapKey;
+  UINTNDescriptorSize;
+  UINT32   DescriptorVersion;
+  UINTNIterator;
+  BOOLEAN  UsableMemoryBelow4G;
 
+  //
+  // Obtain the memory map size
+  //
+  MemoryMapSize = 0;
+  Status = gBS->GetMemoryMap (
+  &MemoryMapSize,
+  NULL,
+  &MapKey,
+  &DescriptorSize,
+  &DescriptorVersion
+  );
+  ASSERT (Status == EFI_BUFFER_TOO_SMALL);
+  //
+  // Allocating a buffer fo