disable async pf for intel

src/cpuid/src/transformer/amd.rs

@@ -147,8 +147,7 @@ impl CpuidTransformer for AmdCpuidTransformer {
             leaf_0x8000001d::LEAF_NUM => Some(amd::update_extended_cache_topology_entry),
             leaf_0x8000001e::LEAF_NUM => Some(amd::update_extended_apic_id_entry),
             0x8000_0002..=0x8000_0004 => Some(common::update_brand_string_entry),
-
-            // hypervisor stuff
+            // Disable async PF, as it hangs the VM for some reason when loading from snapshot/uffd.
             0x4000_0001 => Some(common::disable_kvm_feature_async_pf),
             _ => None,
         }

src/cpuid/src/transformer/intel.rs

@@ -126,8 +126,8 @@ impl CpuidTransformer for IntelCpuidTransformer {
             leaf_0xa::LEAF_NUM => Some(intel::update_perf_mon_entry),
             leaf_0xb::LEAF_NUM => Some(intel::update_extended_topology_entry),
             0x8000_0002..=0x8000_0004 => Some(common::update_brand_string_entry),
-            // // hypervisor stuff
-            // 0x4000_0001 => Some(common::disable_kvm_feature_async_pf),
+            // Disable async PF, as it hangs the VM for some reason when loading from snapshot/uffd.
+            0x4000_0001 => Some(common::disable_kvm_feature_async_pf),
             _ => None,
         }
     }