Merge pull request #3 from 915604903T/main

arceos-org · Aug 5, 2024 · 986e257 · 986e257
2 parents 91fcf12 + 867ddd4
commit 986e257
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 11 deletions.
diff --git a/page_table_entry/Cargo.toml b/page_table_entry/Cargo.toml
@@ -11,6 +11,9 @@ repository.workspace = true
 keywords.workspace = true
 categories.workspace = true
 
+[features]
+arm-el2 = []
+
 [dependencies]
 bitflags = "2.6"
 memory_addr = "0.2"

diff --git a/page_table_entry/src/arch/aarch64.rs b/page_table_entry/src/arch/aarch64.rs
@@ -120,13 +120,22 @@ impl From<DescriptorAttr> for MappingFlags {
         if !attr.contains(DescriptorAttr::AP_RO) {
             flags |= Self::WRITE;
         }
-        if attr.contains(DescriptorAttr::AP_EL0) {
-            flags |= Self::USER;
-            if !attr.contains(DescriptorAttr::UXN) {
+        #[cfg(not(feature = "arm-el2"))]
+        {
+            if attr.contains(DescriptorAttr::AP_EL0) {
+                flags |= Self::USER;
+                if !attr.contains(DescriptorAttr::UXN) {
+                    flags |= Self::EXECUTE;
+                }
+            } else if !attr.intersects(DescriptorAttr::PXN) {
+                flags |= Self::EXECUTE;
+            }
+        }
+        #[cfg(feature = "arm-el2")]
+        {
+            if !attr.intersects(DescriptorAttr::UXN) {
                 flags |= Self::EXECUTE;
             }
-        } else if !attr.intersects(DescriptorAttr::PXN) {
-            flags |= Self::EXECUTE;
         }
         match attr.mem_attr() {
             Some(MemAttr::Device) => flags |= Self::DEVICE,
@@ -155,15 +164,24 @@ impl From<MappingFlags> for DescriptorAttr {
         if !flags.contains(MappingFlags::WRITE) {
             attr |= Self::AP_RO;
         }
-        if flags.contains(MappingFlags::USER) {
-            attr |= Self::AP_EL0 | Self::PXN;
-            if !flags.contains(MappingFlags::EXECUTE) {
+        #[cfg(not(feature = "arm-el2"))]
+        {
+            if flags.contains(MappingFlags::USER) {
+                attr |= Self::AP_EL0 | Self::PXN;
+                if !flags.contains(MappingFlags::EXECUTE) {
+                    attr |= Self::UXN;
+                }
+            } else {
                 attr |= Self::UXN;
+                if !flags.contains(MappingFlags::EXECUTE) {
+                    attr |= Self::PXN;
+                }
             }
-        } else {
-            attr |= Self::UXN;
+        }
+        #[cfg(feature = "arm-el2")]
+        {
             if !flags.contains(MappingFlags::EXECUTE) {
-                attr |= Self::PXN;
+                attr |= Self::UXN;
             }
         }
         attr