github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-23 05:57:33 +00:00
Code Issues Projects Releases Wiki Activity

hv: vmsr: emulate IA32_FEATURE_CONTORL MSR for nested virtualization

Browse Source 
In order to support nested virtualization, need to expose the "Enable VMX
outside SMX operation" bit to L1 hypervisor.

Tracked-On: #5923
Signed-off-by: Zide Chen <zide.chen@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
Zide Chen 2021-05-08 11:37:32 -07:00 committed by wenlingz
parent 6ba4ac58cd
commit 97df220f49
1 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
hypervisor/arch/x86/guest/vmsr.c
View File

@ -316,7 +316,7 @@ static void intercept_x2apic_msrs(uint8_t *msr_bitmap_arg, uint32_t mode)
/** /**
* @pre vcpu != NULL * @pre vcpu != NULL
*/ */
static void init_msr_area(struct acrn_vcpu *vcpu) static void prepare_auto_msr_area (struct acrn_vcpu *vcpu)
{ {
struct acrn_vm_config *cfg = get_vm_config(vcpu->vm->vm_id); struct acrn_vm_config *cfg = get_vm_config(vcpu->vm->vm_id);
uint16_t vcpu_clos = cfg->clos[vcpu->vcpu_id]; uint16_t vcpu_clos = cfg->clos[vcpu->vcpu_id];
@ -341,6 +341,27 @@ static void init_msr_area(struct acrn_vcpu *vcpu)
} }
} }
/**
* @pre vcpu != NULL
*/
void init_emulated_msrs(struct acrn_vcpu *vcpu)
{
uint64_t val64 = 0UL;
/* MSR_IA32_FEATURE_CONTROL */
if (is_nvmx_configured(vcpu->vm)) {
/* currently support VMX outside SMX only */
val64 |= MSR_IA32_FEATURE_CONTROL_VMX_NO_SMX;
}
val64 |= MSR_IA32_FEATURE_CONTROL_LOCK;
if (is_vsgx_supported(vcpu->vm->vm_id)) {
val64 |= MSR_IA32_FEATURE_CONTROL_SGX_GE;
}
vcpu_set_guest_msr(vcpu, MSR_IA32_FEATURE_CONTROL, val64);
}
/** /**
* @pre vcpu != NULL * @pre vcpu != NULL
*/ */
@ -379,7 +400,10 @@ void init_msr_emulation(struct acrn_vcpu *vcpu)
pr_dbg("VMX_MSR_BITMAP: 0x%016lx ", value64); pr_dbg("VMX_MSR_BITMAP: 0x%016lx ", value64);
/* Initialize the MSR save/store area */ /* Initialize the MSR save/store area */
init_msr_area(vcpu); prepare_auto_msr_area (vcpu);
/* Setup initial value for emulated MSRs */
init_emulated_msrs(vcpu);
} }
static int32_t write_pat_msr(struct acrn_vcpu *vcpu, uint64_t value) static int32_t write_pat_msr(struct acrn_vcpu *vcpu, uint64_t value)
@ -507,10 +531,7 @@ int32_t rdmsr_vmexit_handler(struct acrn_vcpu *vcpu)
} }
case MSR_IA32_FEATURE_CONTROL: case MSR_IA32_FEATURE_CONTROL:
{ {
v = MSR_IA32_FEATURE_CONTROL_LOCK; v = vcpu_get_guest_msr(vcpu, MSR_IA32_FEATURE_CONTROL);
if (is_vsgx_supported(vcpu->vm->vm_id)) {
v |= MSR_IA32_FEATURE_CONTROL_SGX_GE;
}
break; break;
} }
case MSR_IA32_MCG_CAP: case MSR_IA32_MCG_CAP: