microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

KVM: Move kvm_exit tracepoint rip reading inside tracepoint 

Reading rip is expensive on vmx, so move it inside the tracepoint so we only
incur the cost if tracing is enabled.

Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Avi Kivity 2010-03-11 10:50:44 +02:00
Родитель d4f64b6cad
Коммит 5bfd8b5455
3 изменённых файлов: 5 добавлений и 5 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
arch/x86/kvm/svm.c
Просмотреть файл

@ -2686,7 +2686,7 @@ static int handle_exit(struct kvm_vcpu *vcpu)
struct kvm_run *kvm_run = vcpu->run; struct kvm_run *kvm_run = vcpu->run;
u32 exit_code = svm->vmcb->control.exit_code; u32 exit_code = svm->vmcb->control.exit_code;
trace_kvm_exit(exit_code, svm->vmcb->save.rip); trace_kvm_exit(exit_code, vcpu);
if (unlikely(svm->nested.exit_required)) { if (unlikely(svm->nested.exit_required)) {
nested_svm_vmexit(svm); nested_svm_vmexit(svm);

6
arch/x86/kvm/trace.h
Просмотреть файл

@ -182,8 +182,8 @@ TRACE_EVENT(kvm_apic,
* Tracepoint for kvm guest exit: * Tracepoint for kvm guest exit:
*/ */
TRACE_EVENT(kvm_exit, TRACE_EVENT(kvm_exit,
TP_PROTO(unsigned int exit_reason, unsigned long guest_rip), TP_PROTO(unsigned int exit_reason, struct kvm_vcpu *vcpu),
TP_ARGS(exit_reason, guest_rip), TP_ARGS(exit_reason, vcpu),
TP_STRUCT__entry( TP_STRUCT__entry(
__field( unsigned int, exit_reason ) __field( unsigned int, exit_reason )
@ -192,7 +192,7 @@ TRACE_EVENT(kvm_exit,
TP_fast_assign( TP_fast_assign(
__entry->exit_reason = exit_reason; __entry->exit_reason = exit_reason;
__entry->guest_rip = guest_rip; __entry->guest_rip = kvm_rip_read(vcpu);
), ),
TP_printk("reason %s rip 0x%lx", TP_printk("reason %s rip 0x%lx",

2
arch/x86/kvm/vmx.c
Просмотреть файл

@ -3612,7 +3612,7 @@ static int vmx_handle_exit(struct kvm_vcpu *vcpu)
u32 exit_reason = vmx->exit_reason; u32 exit_reason = vmx->exit_reason;
u32 vectoring_info = vmx->idt_vectoring_info; u32 vectoring_info = vmx->idt_vectoring_info;
trace_kvm_exit(exit_reason, kvm_rip_read(vcpu)); trace_kvm_exit(exit_reason, vcpu);
/* If guest state is invalid, start emulating */ /* If guest state is invalid, start emulating */
if (vmx->emulation_required && emulate_invalid_guest_state) if (vmx->emulation_required && emulate_invalid_guest_state)