lkml.org 
[lkml]   [2019]   [Sep]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 11/14] KVM: x86: optimize more exit handlers in vmx.c
    Date
    Eliminate wasteful call/ret non RETPOLINE case and unnecessary fentry
    dynamic tracing hooking points.

    Signed-off-by: Andrea Arcangeli <aarcange@redhat.com>
    ---
    arch/x86/kvm/vmx/vmx.c | 30 +++++-------------------------
    1 file changed, 5 insertions(+), 25 deletions(-)

    diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
    index 6e995e37a8c8..de3ae2246205 100644
    --- a/arch/x86/kvm/vmx/vmx.c
    +++ b/arch/x86/kvm/vmx/vmx.c
    @@ -4589,7 +4589,7 @@ static int handle_exception_nmi(struct kvm_vcpu *vcpu)
    return 0;
    }

    -static int handle_external_interrupt(struct kvm_vcpu *vcpu)
    +static __always_inline int handle_external_interrupt(struct kvm_vcpu *vcpu)
    {
    ++vcpu->stat.irq_exits;
    return 1;
    @@ -4860,21 +4860,6 @@ void kvm_x86_set_dr7(struct kvm_vcpu *vcpu, unsigned long val)
    vmcs_writel(GUEST_DR7, val);
    }

    -static int handle_cpuid(struct kvm_vcpu *vcpu)
    -{
    - return kvm_emulate_cpuid(vcpu);
    -}
    -
    -static int handle_rdmsr(struct kvm_vcpu *vcpu)
    -{
    - return kvm_emulate_rdmsr(vcpu);
    -}
    -
    -static int handle_wrmsr(struct kvm_vcpu *vcpu)
    -{
    - return kvm_emulate_wrmsr(vcpu);
    -}
    -
    static int handle_tpr_below_threshold(struct kvm_vcpu *vcpu)
    {
    kvm_apic_update_ppr(vcpu);
    @@ -4891,11 +4876,6 @@ static int handle_interrupt_window(struct kvm_vcpu *vcpu)
    return 1;
    }

    -static int handle_halt(struct kvm_vcpu *vcpu)
    -{
    - return kvm_emulate_halt(vcpu);
    -}
    -
    static int handle_vmcall(struct kvm_vcpu *vcpu)
    {
    return kvm_emulate_hypercall(vcpu);
    @@ -5487,11 +5467,11 @@ static int (*kvm_vmx_exit_handlers[])(struct kvm_vcpu *vcpu) = {
    [EXIT_REASON_IO_INSTRUCTION] = handle_io,
    [EXIT_REASON_CR_ACCESS] = handle_cr,
    [EXIT_REASON_DR_ACCESS] = handle_dr,
    - [EXIT_REASON_CPUID] = handle_cpuid,
    - [EXIT_REASON_MSR_READ] = handle_rdmsr,
    - [EXIT_REASON_MSR_WRITE] = handle_wrmsr,
    + [EXIT_REASON_CPUID] = kvm_emulate_cpuid,
    + [EXIT_REASON_MSR_READ] = kvm_emulate_rdmsr,
    + [EXIT_REASON_MSR_WRITE] = kvm_emulate_wrmsr,
    [EXIT_REASON_PENDING_INTERRUPT] = handle_interrupt_window,
    - [EXIT_REASON_HLT] = handle_halt,
    + [EXIT_REASON_HLT] = kvm_emulate_halt,
    [EXIT_REASON_INVD] = handle_invd,
    [EXIT_REASON_INVLPG] = handle_invlpg,
    [EXIT_REASON_RDPMC] = handle_rdpmc,
    \
     
     \ /
      Last update: 2019-09-28 19:25    [W:2.620 / U:0.140 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site