Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Andrea Arcangeli <aarcange@redhat.com>
To:     kvm@vger.kernel.org, linux-kernel@vger.kernel.org
Cc:     Paolo Bonzini <pbonzini@redhat.com>,
        Vitaly Kuznetsov <vkuznets@redhat.com>,
        Sean Christopherson <sean.j.christopherson@intel.com>
Subject: [PATCH 10/13] KVM: x86: optimize more exit handlers in vmx.c
Date:   Mon,  4 Nov 2019 17:59:58 -0500
Message-Id: <20191104230001.27774-11-aarcange@redhat.com>
In-Reply-To: <20191104230001.27774-1-aarcange@redhat.com>
References: <20191104230001.27774-1-aarcange@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=WINDOWS-1252
Content-Transfer-Encoding: quoted-printable
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

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 222467b2040e..a6afa5f4a01c 100644
--- a/arch/x86/kvm/vmx/vmx.c
+++ b/arch/x86/kvm/vmx/vmx.c
@@ -4694,7 +4694,7 @@ static int handle_exception_nmi(struct kvm_vcpu *vcpu=
)
 =09return 0;
 }
=20
-static int handle_external_interrupt(struct kvm_vcpu *vcpu)
+static __always_inline int handle_external_interrupt(struct kvm_vcpu *vcpu=
)
 {
 =09++vcpu->stat.irq_exits;
 =09return 1;
@@ -4965,21 +4965,6 @@ void kvm_x86_set_dr7(struct kvm_vcpu *vcpu, unsigned=
 long val)
 =09vmcs_writel(GUEST_DR7, val);
 }
=20
-static int handle_cpuid(struct kvm_vcpu *vcpu)
-{
-=09return kvm_emulate_cpuid(vcpu);
-}
-
-static int handle_rdmsr(struct kvm_vcpu *vcpu)
-{
-=09return kvm_emulate_rdmsr(vcpu);
-}
-
-static int handle_wrmsr(struct kvm_vcpu *vcpu)
-{
-=09return kvm_emulate_wrmsr(vcpu);
-}
-
 static int handle_tpr_below_threshold(struct kvm_vcpu *vcpu)
 {
 =09kvm_apic_update_ppr(vcpu);
@@ -4996,11 +4981,6 @@ static int handle_interrupt_window(struct kvm_vcpu *=
vcpu)
 =09return 1;
 }
=20
-static int handle_halt(struct kvm_vcpu *vcpu)
-{
-=09return kvm_emulate_halt(vcpu);
-}
-
 static int handle_vmcall(struct kvm_vcpu *vcpu)
 {
 =09return kvm_emulate_hypercall(vcpu);
@@ -5548,11 +5528,11 @@ static int (*kvm_vmx_exit_handlers[])(struct kvm_vc=
pu *vcpu) =3D {
 =09[EXIT_REASON_IO_INSTRUCTION]          =3D handle_io,
 =09[EXIT_REASON_CR_ACCESS]               =3D handle_cr,
 =09[EXIT_REASON_DR_ACCESS]               =3D handle_dr,
-=09[EXIT_REASON_CPUID]                   =3D handle_cpuid,
-=09[EXIT_REASON_MSR_READ]                =3D handle_rdmsr,
-=09[EXIT_REASON_MSR_WRITE]               =3D handle_wrmsr,
+=09[EXIT_REASON_CPUID]                   =3D kvm_emulate_cpuid,
+=09[EXIT_REASON_MSR_READ]                =3D kvm_emulate_rdmsr,
+=09[EXIT_REASON_MSR_WRITE]               =3D kvm_emulate_wrmsr,
 =09[EXIT_REASON_PENDING_INTERRUPT]       =3D handle_interrupt_window,
-=09[EXIT_REASON_HLT]                     =3D handle_halt,
+=09[EXIT_REASON_HLT]                     =3D kvm_emulate_halt,
 =09[EXIT_REASON_INVD]=09=09      =3D handle_invd,
 =09[EXIT_REASON_INVLPG]=09=09      =3D handle_invlpg,
 =09[EXIT_REASON_RDPMC]                   =3D handle_rdpmc,