From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Suthikulpanit, Suravee" Subject: [PATCH 2/6] svm: Add AMD AVIC handlers for APIC ID, DFR and LDR update Date: Fri, 22 Mar 2019 11:57:28 +0000 Message-ID: <20190322115702.10166-3-suravee.suthikulpanit@amd.com> References: <20190322115702.10166-1-suravee.suthikulpanit@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Cc: "joro@8bytes.org" , "pbonzini@redhat.com" , "rkrcmar@redhat.com" , "Suthikulpanit, Suravee" To: "linux-kernel@vger.kernel.org" , "kvm@vger.kernel.org" Return-path: In-Reply-To: <20190322115702.10166-1-suravee.suthikulpanit@amd.com> Content-Language: en-US Sender: linux-kernel-owner@vger.kernel.org List-Id: kvm.vger.kernel.org During AVIC temporary deactivation, guest could update APIC ID, DFR and LDR registers, which would not be trapped by avic_unaccelerated_ccess_interception(). In this case, we need to update the AVIC logical APIC ID table accordingly. Signed-off-by: Suravee Suthikulpanit --- arch/x86/kvm/svm.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index f4fb766e474c..4cf93a729ad8 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -4705,6 +4705,24 @@ static void avic_handle_dfr_update(struct kvm_vcpu *= vcpu) svm->dfr_reg =3D dfr; } =20 +static void svm_hwapic_ldr_update(struct kvm_vcpu *vcpu) +{ + if (svm_get_enable_apicv(vcpu) && !kvm_vcpu_apicv_active(vcpu)) + avic_handle_ldr_update(vcpu); +} + +static void svm_hwapic_apic_id_update(struct kvm_vcpu *vcpu) +{ + if (svm_get_enable_apicv(vcpu) && !kvm_vcpu_apicv_active(vcpu)) + avic_handle_apic_id_update(vcpu); +} + +static void svm_hwapic_dfr_update(struct kvm_vcpu *vcpu) +{ + if (svm_get_enable_apicv(vcpu) && !kvm_vcpu_apicv_active(vcpu)) + avic_handle_dfr_update(vcpu); +} + static int avic_unaccel_trap_write(struct vcpu_svm *svm) { struct kvm_lapic *apic =3D svm->vcpu.arch.apic; @@ -7222,6 +7240,9 @@ static struct kvm_x86_ops svm_x86_ops __ro_after_init= =3D { .load_eoi_exitmap =3D svm_load_eoi_exitmap, .hwapic_irr_update =3D svm_hwapic_irr_update, .hwapic_isr_update =3D svm_hwapic_isr_update, + .hwapic_apic_id_update =3D svm_hwapic_apic_id_update, + .hwapic_dfr_update =3D svm_hwapic_dfr_update, + .hwapic_ldr_update =3D svm_hwapic_ldr_update, .sync_pir_to_irr =3D kvm_lapic_find_highest_irr, .apicv_post_state_restore =3D avic_post_state_restore, =20 --=20 2.17.1