浏览代码

Kernel: Rename OSPKU CPUID feature flag to OSPKE

Unlike "XSAVE enabled by OS" being indicated by the OSXSAVE flag, in
this case it's "PKU enabled by OS" being indicated by the OSPKE flag.
Linus Groh 3 年之前
父节点
当前提交
87aabb5ef7
共有 3 个文件被更改,包括 4 次插入4 次删除
  1. 1 1
      Kernel/Arch/x86/CPUID.h
  2. 2 2
      Kernel/Arch/x86/common/CPUID.cpp
  3. 1 1
      Kernel/Arch/x86/common/Processor.cpp

+ 1 - 1
Kernel/Arch/x86/CPUID.h

@@ -142,7 +142,7 @@ AK_MAKE_ARBITRARY_SIZED_ENUM(CPUFeature, u256,
     AVX512_VBMI = CPUFeature(1u) << 97u,              // AVX-512 Vector Bit Manipulation Instructions
     UMIP = CPUFeature(1u) << 98u,                     // UMIP
     PKU = CPUFeature(1u) << 99u,                      // Memory Protection Keys for User-mode pages
-    OSPKU = CPUFeature(1u) << 100u,                   // PKU enabled by OS
+    OSPKE = CPUFeature(1u) << 100u,                   // PKU enabled by OS
     WAITPKG = CPUFeature(1u) << 101u,                 // Timed pause and user-level monitor/wait
     AVX512_VBMI2 = CPUFeature(1u) << 102u,            // AVX-512 Vector Bit Manipulation Instructions 2
     CET_SS = CPUFeature(1u) << 103u,                  // Control Flow Enforcement (CET) Shadow Stack

+ 2 - 2
Kernel/Arch/x86/common/CPUID.cpp

@@ -206,8 +206,8 @@ StringView cpu_feature_to_string_view(CPUFeature::Type const& feature)
         return "umip"sv;
     if (feature == CPUFeature::PKU)
         return "pku"sv;
-    if (feature == CPUFeature::OSPKU)
-        return "ospku"sv;
+    if (feature == CPUFeature::OSPKE)
+        return "ospke"sv;
     if (feature == CPUFeature::WAITPKG)
         return "waitpkg"sv;
     if (feature == CPUFeature::AVX512_VBMI2)

+ 1 - 1
Kernel/Arch/x86/common/Processor.cpp

@@ -287,7 +287,7 @@ UNMAP_AFTER_INIT void Processor::cpu_detect()
     if (extended_features.ecx() & (1 << 3))
         m_features |= CPUFeature::PKU;
     if (extended_features.ecx() & (1 << 4))
-        m_features |= CPUFeature::OSPKU;
+        m_features |= CPUFeature::OSPKE;
     if (extended_features.ecx() & (1 << 5))
         m_features |= CPUFeature::WAITPKG;
     if (extended_features.ecx() & (1 << 6))