[edk2,3/5] ArmPkg/ArmMmuLib: remove VirtualMask arg from ArmSetMemoryAttributes

Message ID 1488385903-30267-4-git-send-email-ard.biesheuvel@linaro.org
State New
Headers show
Series
  • ArmPkg, ArmVirtPkg ARM: enable non-executable stack
Related show

Commit Message

Ard Biesheuvel March 1, 2017, 4:31 p.m.
We no longer make use of the ArmMmuLib 'feature' to create aliased
memory ranges with mismatched attributes, and in fact, it was only
wired up in the ARM version to begin with.

So remove the VirtualMask argument from ArmSetMemoryAttributes()'s
prototype, and remove the dead code that referred to it.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

---
 ArmPkg/Drivers/CpuDxe/CpuMmuCommon.c             |  2 +-
 ArmPkg/Include/Library/ArmMmuLib.h               |  3 +--
 ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c |  3 +--
 ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibCore.c     | 25 +++++---------------
 4 files changed, 9 insertions(+), 24 deletions(-)

-- 
2.7.4

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Comments

Leif Lindholm March 6, 2017, 4:06 p.m. | #1
On Wed, Mar 01, 2017 at 04:31:41PM +0000, Ard Biesheuvel wrote:
> We no longer make use of the ArmMmuLib 'feature' to create aliased

> memory ranges with mismatched attributes, and in fact, it was only

> wired up in the ARM version to begin with.

> 

> So remove the VirtualMask argument from ArmSetMemoryAttributes()'s

> prototype, and remove the dead code that referred to it.

> 

> Contributed-under: TianoCore Contribution Agreement 1.0

> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>


Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>


> ---

>  ArmPkg/Drivers/CpuDxe/CpuMmuCommon.c             |  2 +-

>  ArmPkg/Include/Library/ArmMmuLib.h               |  3 +--

>  ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c |  3 +--

>  ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibCore.c     | 25 +++++---------------

>  4 files changed, 9 insertions(+), 24 deletions(-)

> 

> diff --git a/ArmPkg/Drivers/CpuDxe/CpuMmuCommon.c b/ArmPkg/Drivers/CpuDxe/CpuMmuCommon.c

> index d0a3fedd3aa7..8150486217cf 100644

> --- a/ArmPkg/Drivers/CpuDxe/CpuMmuCommon.c

> +++ b/ArmPkg/Drivers/CpuDxe/CpuMmuCommon.c

> @@ -210,7 +210,7 @@ CpuSetMemoryAttributes (

>    if (EFI_ERROR (Status) || (RegionArmAttributes != ArmAttributes) ||

>        ((BaseAddress + Length) > (RegionBaseAddress + RegionLength)))

>    {

> -    return ArmSetMemoryAttributes (BaseAddress, Length, EfiAttributes, 0);

> +    return ArmSetMemoryAttributes (BaseAddress, Length, EfiAttributes);

>    } else {

>      return EFI_SUCCESS;

>    }

> diff --git a/ArmPkg/Include/Library/ArmMmuLib.h b/ArmPkg/Include/Library/ArmMmuLib.h

> index d3a302fa8125..fb7fd006417c 100644

> --- a/ArmPkg/Include/Library/ArmMmuLib.h

> +++ b/ArmPkg/Include/Library/ArmMmuLib.h

> @@ -66,8 +66,7 @@ EFI_STATUS

>  ArmSetMemoryAttributes (

>    IN EFI_PHYSICAL_ADDRESS      BaseAddress,

>    IN UINT64                    Length,

> -  IN UINT64                    Attributes,

> -  IN EFI_PHYSICAL_ADDRESS      VirtualMask

> +  IN UINT64                    Attributes

>    );

>  

>  #endif

> diff --git a/ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c b/ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c

> index 77f108971f3e..8bd1c6fad95f 100644

> --- a/ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c

> +++ b/ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c

> @@ -450,8 +450,7 @@ EFI_STATUS

>  ArmSetMemoryAttributes (

>    IN EFI_PHYSICAL_ADDRESS      BaseAddress,

>    IN UINT64                    Length,

> -  IN UINT64                    Attributes,

> -  IN EFI_PHYSICAL_ADDRESS      VirtualMask

> +  IN UINT64                    Attributes

>    )

>  {

>    EFI_STATUS                   Status;

> diff --git a/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibCore.c b/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibCore.c

> index 93980d6d12db..1112660b434e 100644

> --- a/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibCore.c

> +++ b/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibCore.c

> @@ -469,8 +469,7 @@ EFI_STATUS

>  UpdatePageEntries (

>    IN EFI_PHYSICAL_ADDRESS      BaseAddress,

>    IN UINT64                    Length,

> -  IN UINT64                    Attributes,

> -  IN EFI_PHYSICAL_ADDRESS      VirtualMask

> +  IN UINT64                    Attributes

>    )

>  {

>    EFI_STATUS    Status;

> @@ -575,11 +574,6 @@ UpdatePageEntries (

>      // Mask in new attributes and/or permissions

>      PageTableEntry |= EntryValue;

>  

> -    if (VirtualMask != 0) {

> -      // Make this virtual address point at a physical page

> -      PageTableEntry &= ~VirtualMask;

> -    }

> -

>      if (CurrentPageTableEntry  != PageTableEntry) {

>        Mva = (VOID *)(UINTN)((((UINTN)FirstLevelIdx) << TT_DESCRIPTOR_SECTION_BASE_SHIFT) + (PageTableIndex << TT_DESCRIPTOR_PAGE_BASE_SHIFT));

>        if ((CurrentPageTableEntry & TT_DESCRIPTOR_PAGE_CACHEABLE_MASK) == TT_DESCRIPTOR_PAGE_CACHEABLE_MASK) {

> @@ -606,8 +600,7 @@ EFI_STATUS

>  UpdateSectionEntries (

>    IN EFI_PHYSICAL_ADDRESS      BaseAddress,

>    IN UINT64                    Length,

> -  IN UINT64                    Attributes,

> -  IN EFI_PHYSICAL_ADDRESS      VirtualMask

> +  IN UINT64                    Attributes

>    )

>  {

>    EFI_STATUS    Status = EFI_SUCCESS;

> @@ -680,7 +673,7 @@ UpdateSectionEntries (

>      // has this descriptor already been coverted to pages?

>      if (TT_DESCRIPTOR_SECTION_TYPE_IS_PAGE_TABLE(CurrentDescriptor)) {

>        // forward this 1MB range to page table function instead

> -      Status = UpdatePageEntries ((FirstLevelIdx + i) << TT_DESCRIPTOR_SECTION_BASE_SHIFT, TT_DESCRIPTOR_SECTION_SIZE, Attributes, VirtualMask);

> +      Status = UpdatePageEntries ((FirstLevelIdx + i) << TT_DESCRIPTOR_SECTION_BASE_SHIFT, TT_DESCRIPTOR_SECTION_SIZE, Attributes);

>      } else {

>        // still a section entry

>  

> @@ -689,9 +682,6 @@ UpdateSectionEntries (

>  

>        // mask in new attributes and/or permissions

>        Descriptor |= EntryValue;

> -      if (VirtualMask != 0) {

> -        Descriptor &= ~VirtualMask;

> -      }

>  

>        if (CurrentDescriptor  != Descriptor) {

>          Mva = (VOID *)(UINTN)(((UINTN)FirstLevelTable) << TT_DESCRIPTOR_SECTION_BASE_SHIFT);

> @@ -717,8 +707,7 @@ EFI_STATUS

>  ArmSetMemoryAttributes (

>    IN EFI_PHYSICAL_ADDRESS      BaseAddress,

>    IN UINT64                    Length,

> -  IN UINT64                    Attributes,

> -  IN EFI_PHYSICAL_ADDRESS      VirtualMask

> +  IN UINT64                    Attributes

>    )

>  {

>    EFI_STATUS    Status;

> @@ -736,8 +725,7 @@ ArmSetMemoryAttributes (

>          "SetMemoryAttributes(): MMU section 0x%lx length 0x%lx to %lx\n",

>          BaseAddress, ChunkLength, Attributes));

>  

> -      Status = UpdateSectionEntries (BaseAddress, ChunkLength, Attributes,

> -                 VirtualMask);

> +      Status = UpdateSectionEntries (BaseAddress, ChunkLength, Attributes);

>  

>        FlushTlbs = TRUE;

>      } else {

> @@ -756,8 +744,7 @@ ArmSetMemoryAttributes (

>          "SetMemoryAttributes(): MMU page 0x%lx length 0x%lx to %lx\n",

>          BaseAddress, ChunkLength, Attributes));

>  

> -      Status = UpdatePageEntries (BaseAddress, ChunkLength, Attributes,

> -                 VirtualMask);

> +      Status = UpdatePageEntries (BaseAddress, ChunkLength, Attributes);

>      }

>  

>      if (EFI_ERROR (Status)) {

> -- 

> 2.7.4

> 

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Patch hide | download patch | download mbox

diff --git a/ArmPkg/Drivers/CpuDxe/CpuMmuCommon.c b/ArmPkg/Drivers/CpuDxe/CpuMmuCommon.c
index d0a3fedd3aa7..8150486217cf 100644
--- a/ArmPkg/Drivers/CpuDxe/CpuMmuCommon.c
+++ b/ArmPkg/Drivers/CpuDxe/CpuMmuCommon.c
@@ -210,7 +210,7 @@  CpuSetMemoryAttributes (
   if (EFI_ERROR (Status) || (RegionArmAttributes != ArmAttributes) ||
       ((BaseAddress + Length) > (RegionBaseAddress + RegionLength)))
   {
-    return ArmSetMemoryAttributes (BaseAddress, Length, EfiAttributes, 0);
+    return ArmSetMemoryAttributes (BaseAddress, Length, EfiAttributes);
   } else {
     return EFI_SUCCESS;
   }
diff --git a/ArmPkg/Include/Library/ArmMmuLib.h b/ArmPkg/Include/Library/ArmMmuLib.h
index d3a302fa8125..fb7fd006417c 100644
--- a/ArmPkg/Include/Library/ArmMmuLib.h
+++ b/ArmPkg/Include/Library/ArmMmuLib.h
@@ -66,8 +66,7 @@  EFI_STATUS
 ArmSetMemoryAttributes (
   IN EFI_PHYSICAL_ADDRESS      BaseAddress,
   IN UINT64                    Length,
-  IN UINT64                    Attributes,
-  IN EFI_PHYSICAL_ADDRESS      VirtualMask
+  IN UINT64                    Attributes
   );
 
 #endif
diff --git a/ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c b/ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c
index 77f108971f3e..8bd1c6fad95f 100644
--- a/ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c
+++ b/ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c
@@ -450,8 +450,7 @@  EFI_STATUS
 ArmSetMemoryAttributes (
   IN EFI_PHYSICAL_ADDRESS      BaseAddress,
   IN UINT64                    Length,
-  IN UINT64                    Attributes,
-  IN EFI_PHYSICAL_ADDRESS      VirtualMask
+  IN UINT64                    Attributes
   )
 {
   EFI_STATUS                   Status;
diff --git a/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibCore.c b/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibCore.c
index 93980d6d12db..1112660b434e 100644
--- a/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibCore.c
+++ b/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibCore.c
@@ -469,8 +469,7 @@  EFI_STATUS
 UpdatePageEntries (
   IN EFI_PHYSICAL_ADDRESS      BaseAddress,
   IN UINT64                    Length,
-  IN UINT64                    Attributes,
-  IN EFI_PHYSICAL_ADDRESS      VirtualMask
+  IN UINT64                    Attributes
   )
 {
   EFI_STATUS    Status;
@@ -575,11 +574,6 @@  UpdatePageEntries (
     // Mask in new attributes and/or permissions
     PageTableEntry |= EntryValue;
 
-    if (VirtualMask != 0) {
-      // Make this virtual address point at a physical page
-      PageTableEntry &= ~VirtualMask;
-    }
-
     if (CurrentPageTableEntry  != PageTableEntry) {
       Mva = (VOID *)(UINTN)((((UINTN)FirstLevelIdx) << TT_DESCRIPTOR_SECTION_BASE_SHIFT) + (PageTableIndex << TT_DESCRIPTOR_PAGE_BASE_SHIFT));
       if ((CurrentPageTableEntry & TT_DESCRIPTOR_PAGE_CACHEABLE_MASK) == TT_DESCRIPTOR_PAGE_CACHEABLE_MASK) {
@@ -606,8 +600,7 @@  EFI_STATUS
 UpdateSectionEntries (
   IN EFI_PHYSICAL_ADDRESS      BaseAddress,
   IN UINT64                    Length,
-  IN UINT64                    Attributes,
-  IN EFI_PHYSICAL_ADDRESS      VirtualMask
+  IN UINT64                    Attributes
   )
 {
   EFI_STATUS    Status = EFI_SUCCESS;
@@ -680,7 +673,7 @@  UpdateSectionEntries (
     // has this descriptor already been coverted to pages?
     if (TT_DESCRIPTOR_SECTION_TYPE_IS_PAGE_TABLE(CurrentDescriptor)) {
       // forward this 1MB range to page table function instead
-      Status = UpdatePageEntries ((FirstLevelIdx + i) << TT_DESCRIPTOR_SECTION_BASE_SHIFT, TT_DESCRIPTOR_SECTION_SIZE, Attributes, VirtualMask);
+      Status = UpdatePageEntries ((FirstLevelIdx + i) << TT_DESCRIPTOR_SECTION_BASE_SHIFT, TT_DESCRIPTOR_SECTION_SIZE, Attributes);
     } else {
       // still a section entry
 
@@ -689,9 +682,6 @@  UpdateSectionEntries (
 
       // mask in new attributes and/or permissions
       Descriptor |= EntryValue;
-      if (VirtualMask != 0) {
-        Descriptor &= ~VirtualMask;
-      }
 
       if (CurrentDescriptor  != Descriptor) {
         Mva = (VOID *)(UINTN)(((UINTN)FirstLevelTable) << TT_DESCRIPTOR_SECTION_BASE_SHIFT);
@@ -717,8 +707,7 @@  EFI_STATUS
 ArmSetMemoryAttributes (
   IN EFI_PHYSICAL_ADDRESS      BaseAddress,
   IN UINT64                    Length,
-  IN UINT64                    Attributes,
-  IN EFI_PHYSICAL_ADDRESS      VirtualMask
+  IN UINT64                    Attributes
   )
 {
   EFI_STATUS    Status;
@@ -736,8 +725,7 @@  ArmSetMemoryAttributes (
         "SetMemoryAttributes(): MMU section 0x%lx length 0x%lx to %lx\n",
         BaseAddress, ChunkLength, Attributes));
 
-      Status = UpdateSectionEntries (BaseAddress, ChunkLength, Attributes,
-                 VirtualMask);
+      Status = UpdateSectionEntries (BaseAddress, ChunkLength, Attributes);
 
       FlushTlbs = TRUE;
     } else {
@@ -756,8 +744,7 @@  ArmSetMemoryAttributes (
         "SetMemoryAttributes(): MMU page 0x%lx length 0x%lx to %lx\n",
         BaseAddress, ChunkLength, Attributes));
 
-      Status = UpdatePageEntries (BaseAddress, ChunkLength, Attributes,
-                 VirtualMask);
+      Status = UpdatePageEntries (BaseAddress, ChunkLength, Attributes);
     }
 
     if (EFI_ERROR (Status)) {