|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [PATCH v1 2/2] x86/nestedsvm: Handle L2 writing to the L1 APIC TPR
L1 may allow L2 to write to its APIC TPR. Handle these changes by always
syncing the APIC TPR to VMCB(0-1) rather than skipping the sync if in
guest mode. This ensures that subsequent L1 accesses to CR8 see the
correct value.
Signed-off-by: Ross Lagerwall <ross.lagerwall@xxxxxxxxxx>
---
xen/arch/x86/hvm/svm/svm.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c
index 1043f4a988a8..b691fd2ea6d6 100644
--- a/xen/arch/x86/hvm/svm/svm.c
+++ b/xen/arch/x86/hvm/svm/svm.c
@@ -944,6 +944,7 @@ static void noreturn cf_check svm_do_resume(void)
{
struct vcpu *v = current;
struct vmcb *vmcb = v->arch.hvm.svm.vmcb;
+ struct vmcb *n1_vmcb = vcpu_nestedhvm(v).nv_n1vmcx;
bool debug_state = (v->domain->debugger_attached ||
v->domain->arch.monitor.software_breakpoint_enabled ||
v->domain->arch.monitor.debug_exception_enabled);
@@ -974,8 +975,8 @@ static void noreturn cf_check svm_do_resume(void)
vmcb->cleanbits.raw = 0;
}
- if ( !vcpu_guestmode && !vlapic_hw_disabled(vlapic) )
- svm_update_tpr(vmcb, vlapic);
+ if ( !vlapic_hw_disabled(vlapic) )
+ svm_update_tpr(n1_vmcb, vlapic);
hvm_do_resume(v);
@@ -2521,6 +2522,7 @@ void asmlinkage svm_vmexit_handler(void)
uint64_t exit_reason;
struct vcpu *v = current;
struct vmcb *vmcb = v->arch.hvm.svm.vmcb;
+ struct vmcb *n1_vmcb = vcpu_nestedhvm(v).nv_n1vmcx;
int insn_len;
vintr_t intr;
bool vcpu_guestmode = false;
@@ -3075,10 +3077,10 @@ void asmlinkage svm_vmexit_handler(void)
}
out:
- if ( vcpu_guestmode || vlapic_hw_disabled(vlapic) )
+ if ( vlapic_hw_disabled(vlapic) )
return;
- svm_update_tpr(vmcb, vlapic);
+ svm_update_tpr(n1_vmcb, vlapic);
}
/*
--
2.56.0
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |