kata-containers/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2026-08-05 02:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

arch, vmm: Clear AMX CPUID bits if the feature is not enabled

Browse Source 
Fixes: #5833

Signed-off-by: Bo Chen <chen.bo@intel.com>
This commit is contained in:
Bo Chen
2023-10-11 15:06:27 -07:00
committed by Bo Chen
parent 7dd260f82f
commit 0b4c153d4d
4 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vmm/src/cpu.rs
+1
View File
@@ -745,6 +745,7 @@ impl CpuManager {
kvm_hyperv: self.config.kvm_hyperv,
#[cfg(feature = "tdx")]
tdx,
amx: self.config.features.amx,
},
)
.map_err(Error::CommonCpuId)?
vmm/src/lib.rs
+3
View File
@@ -1665,6 +1665,7 @@ impl Vmm {
let common_cpuid = {
#[cfg(feature = "tdx")]
let tdx = vm_config.lock().unwrap().is_tdx_enabled();
let amx = vm_config.lock().unwrap().cpus.features.amx;
let phys_bits =
vm::physical_bits(&hypervisor, vm_config.lock().unwrap().cpus.max_phys_bits);
arch::generate_common_cpuid(
@@ -1675,6 +1676,7 @@ impl Vmm {
kvm_hyperv: vm_config.lock().unwrap().cpus.kvm_hyperv,
#[cfg(feature = "tdx")]
tdx,
amx,
},
)
.map_err(|e| {
@@ -1866,6 +1868,7 @@ impl Vmm {
kvm_hyperv: vm_config.cpus.kvm_hyperv,
#[cfg(feature = "tdx")]
tdx: vm_config.is_tdx_enabled(),
amx: vm_config.cpus.features.amx,
},
)
.map_err(|e| {
vmm/src/vm.rs
+2
View File
@@ -2409,6 +2409,7 @@ impl Snapshottable for Vm {
#[cfg(all(feature = "kvm", target_arch = "x86_64"))]
let common_cpuid = {
let amx = self.config.lock().unwrap().cpus.features.amx;
let phys_bits = physical_bits(
&self.hypervisor,
self.config.lock().unwrap().cpus.max_phys_bits,
@@ -2421,6 +2422,7 @@ impl Snapshottable for Vm {
kvm_hyperv: self.config.lock().unwrap().cpus.kvm_hyperv,
#[cfg(feature = "tdx")]
tdx: tdx_enabled,
amx,
},
)
.map_err(|e| {