mirror of
https://github.com/torvalds/linux
synced 2024-09-23 21:07:52 +00:00
KVM: SVM: Emulate next_rip svm feature
This patch implements the emulations of the svm next_rip feature in the nested svm implementation in kvm. Signed-off-by: Joerg Roedel <joerg.roedel@amd.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
This commit is contained in:
parent
3f6a9d1693
commit
7a190667bb
|
@ -1918,6 +1918,7 @@ static int nested_svm_vmexit(struct vcpu_svm *svm)
|
||||||
nested_vmcb->control.exit_info_2 = vmcb->control.exit_info_2;
|
nested_vmcb->control.exit_info_2 = vmcb->control.exit_info_2;
|
||||||
nested_vmcb->control.exit_int_info = vmcb->control.exit_int_info;
|
nested_vmcb->control.exit_int_info = vmcb->control.exit_int_info;
|
||||||
nested_vmcb->control.exit_int_info_err = vmcb->control.exit_int_info_err;
|
nested_vmcb->control.exit_int_info_err = vmcb->control.exit_int_info_err;
|
||||||
|
nested_vmcb->control.next_rip = vmcb->control.next_rip;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* If we emulate a VMRUN/#VMEXIT in the same host #vmexit cycle we have
|
* If we emulate a VMRUN/#VMEXIT in the same host #vmexit cycle we have
|
||||||
|
@ -3360,7 +3361,12 @@ static void svm_set_supported_cpuid(u32 func, struct kvm_cpuid_entry2 *entry)
|
||||||
entry->ebx = 8; /* Lets support 8 ASIDs in case we add proper
|
entry->ebx = 8; /* Lets support 8 ASIDs in case we add proper
|
||||||
ASID emulation to nested SVM */
|
ASID emulation to nested SVM */
|
||||||
entry->ecx = 0; /* Reserved */
|
entry->ecx = 0; /* Reserved */
|
||||||
entry->edx = 0; /* Do not support any additional features */
|
entry->edx = 0; /* Per default do not support any
|
||||||
|
additional features */
|
||||||
|
|
||||||
|
/* Support next_rip if host supports it */
|
||||||
|
if (svm_has(SVM_FEATURE_NRIP))
|
||||||
|
entry->edx |= SVM_FEATURE_NRIP;
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue