Enabled host feature caching

core/cpu.c

@@ -43,12 +43,6 @@ static vmx_error_t cpu_vmentry_failed(struct vcpu_t *vcpu, vmx_error_t err);
 static int cpu_vmexit_handler(struct vcpu_t *vcpu, exit_reason_t exit_reason,
                               struct hax_tunnel *htun);
 
-static bool cpu_has_feature(uint32_t feature)
-{
-    // TODO: Use cache
-    return cpuid_host_has_feature_uncached(feature);
-}
-
 static int cpu_emt64_enable()
 {
     uint32 effer;
@@ -65,6 +59,17 @@ static int cpu_nx_enable()
     return effer & 0x800;
 }
 
+bool cpu_has_feature(uint32_t feature)
+{
+    static cpuid_cache_t cache = {
+        .initialized = 0
+    };
+    if (!cache.initialized) {
+        cpuid_host_init(&cache);
+    }
+    return cpuid_host_has_feature(&cache, feature);
+}
+
 void cpu_init_vmx(void *arg)
 {
     struct info_t vmx_info;

core/cpuid.c

@@ -48,20 +48,21 @@ typedef union cpuid_feature_t {
 void cpuid_query_leaf(cpuid_args_t *args, uint32_t leaf)
 {
     args->eax = leaf;
-    __handle_cpuid(&args);
+    __handle_cpuid(args);
 }
 
 void cpuid_query_subleaf(cpuid_args_t *args, uint32_t leaf, uint32_t subleaf)
 {
     args->eax = leaf;
     args->ecx = subleaf;
-    __handle_cpuid(&args);
+    __handle_cpuid(args);
 }
 
 void cpuid_host_init(cpuid_cache_t *cache)
 {
     cpuid_args_t res;
     uint32_t *data = cache->data;
+    cache->initialized = 1;
 
     cpuid_query_leaf(&res, 0x00000001);
     data[0] = res.ecx;

core/include/cpuid.h

@@ -42,6 +42,7 @@
 
 typedef struct cpuid_cache_t {
     uint32_t data[CPUID_CACHE_SIZE];
+    bool initialized;
 } cpuid_cache_t;
 
 typedef union cpuid_args_t {