From: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
To: <joro@8bytes.org>, <alex.williamson@redhat.com>,
<gleb@kernel.org>, <pbonzini@redhat.com>
Cc: <kvm@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<wei@redhat.com>, <sherry.hurwitz@amd.com>,
Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>
Subject: [PART1 RFC 8/9] svm: Do not intercept CR8 when enable AVIC
Date: Fri, 12 Feb 2016 20:59:33 +0700 [thread overview]
Message-ID: <1455285574-27892-9-git-send-email-suravee.suthikulpanit@amd.com> (raw)
In-Reply-To: <1455285574-27892-1-git-send-email-suravee.suthikulpanit@amd.com>
From: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>
When enable AVIC:
* Do not intercept CR8 since this should be handled by AVIC HW.
* Also update TPR in APIC backing page when syncing CR8 before VMRUN
Signed-off-by: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>
---
arch/x86/kvm/svm.c | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
index 0998e67..32da657 100644
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
@@ -981,6 +981,9 @@ static __init int svm_hardware_setup(void)
if (avic) {
printk(KERN_INFO "kvm: AVIC enabled\n");
+
+ /* Do not do cr8 intercept if AVIC is enabled. */
+ svm_x86_ops.update_cr8_intercept = NULL;
} else {
svm_x86_ops.deliver_posted_interrupt = NULL;
svm_x86_ops.apicv_intr_pending = NULL;
@@ -1098,7 +1101,8 @@ static void init_vmcb(struct vcpu_svm *svm)
set_cr_intercept(svm, INTERCEPT_CR0_WRITE);
set_cr_intercept(svm, INTERCEPT_CR3_WRITE);
set_cr_intercept(svm, INTERCEPT_CR4_WRITE);
- set_cr_intercept(svm, INTERCEPT_CR8_WRITE);
+ if (!avic)
+ set_cr_intercept(svm, INTERCEPT_CR8_WRITE);
set_dr_intercepts(svm);
@@ -4248,7 +4252,8 @@ static void update_cr8_intercept(struct kvm_vcpu *vcpu, int tpr, int irr)
{
struct vcpu_svm *svm = to_svm(vcpu);
- if (is_guest_mode(vcpu) && (vcpu->arch.hflags & HF_VINTR_MASK))
+ if ((is_guest_mode(vcpu) && (vcpu->arch.hflags & HF_VINTR_MASK)) ||
+ avic)
return;
clr_cr_intercept(svm, INTERCEPT_CR8_WRITE);
@@ -4440,8 +4445,10 @@ static inline void sync_lapic_to_cr8(struct kvm_vcpu *vcpu)
if (is_guest_mode(vcpu) && (vcpu->arch.hflags & HF_VINTR_MASK))
return;
- cr8 = kvm_get_cr8(vcpu);
- svm->vmcb->control.v_tpr = cr8 & V_TPR_MASK;
+ svm->vmcb->control.v_tpr = cr8 = kvm_get_cr8(vcpu) & V_TPR_MASK;
+
+ if (avic)
+ *(avic_get_bk_page_entry(svm, APIC_TASKPRI)) = (u32)cr8 << 4;
}
static void svm_complete_interrupts(struct vcpu_svm *svm)
--
1.9.1
next prev parent reply other threads:[~2016-02-12 14:01 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-12 13:59 [PART1 RFC 0/9] KVM: x86: Introduce SVM AVIC support Suravee Suthikulpanit
2016-02-12 13:59 ` [PART1 RFC 1/9] KVM: x86: Misc LAPIC changes to exposes helper functions Suravee Suthikulpanit
2016-02-12 13:59 ` [PART1 RFC 2/9] svm: Introduce new AVIC VMCB registers Suravee Suthikulpanit
2016-02-12 13:59 ` [PART1 RFC 3/9] svm: clean up V_TPR, V_IRQ, V_INTR_PRIO, and V_INTR_MASKING Suravee Suthikulpanit
2016-02-12 13:59 ` [PART1 RFC 4/9] KVM: x86: Detect and Initialize AVIC support Suravee Suthikulpanit
2016-02-12 14:13 ` Borislav Petkov
2016-02-12 15:46 ` Suravee Suthikulpanit
2016-02-12 13:59 ` [PART1 RFC 5/9] svm: Add VMEXIT handlers for AVIC Suravee Suthikulpanit
2016-02-12 15:38 ` Paolo Bonzini
2016-02-15 19:22 ` Radim Krčmář
2016-02-16 6:29 ` Suravee Suthikulpanit
2016-02-16 12:15 ` Paolo Bonzini
2016-02-16 14:13 ` Radim Krčmář
2016-02-16 16:56 ` Paolo Bonzini
2016-02-16 18:06 ` Radim Krčmář
2016-02-18 2:25 ` Suravee Suthikulpanit
2016-02-18 14:18 ` Radim Krčmář
2016-02-18 14:51 ` Paolo Bonzini
2016-02-18 15:43 ` Radim Krčmář
2016-02-18 15:53 ` Paolo Bonzini
2016-02-18 16:27 ` Radim Krčmář
2016-02-18 17:18 ` Paolo Bonzini
2016-02-19 11:39 ` Suravee Suthikulpanit
2016-02-19 11:44 ` Paolo Bonzini
2016-02-19 11:59 ` Suravee Suthikulpanit
2016-03-03 10:42 ` Suravee Suthikulpanit
2016-03-03 10:50 ` Paolo Bonzini
2016-02-19 11:32 ` Suravee Suthikulpanit
2016-02-12 13:59 ` [PART1 RFC 6/9] svm: Add interrupt injection via AVIC Suravee Suthikulpanit
2016-02-12 14:16 ` Borislav Petkov
2016-02-12 15:54 ` Suravee Suthikulpanit
2016-02-12 17:14 ` Borislav Petkov
2016-02-12 18:21 ` Paolo Bonzini
2016-02-12 18:30 ` Borislav Petkov
2016-02-12 18:56 ` Paolo Bonzini
2016-02-12 19:33 ` Borislav Petkov
2016-02-16 7:50 ` Ingo Molnar
2016-02-16 8:39 ` [PATCH] x86/msr: Document msr-index.h rule for addition Borislav Petkov
2016-02-12 15:55 ` [PART1 RFC 6/9] svm: Add interrupt injection via AVIC Paolo Bonzini
2016-02-12 16:21 ` Suravee Suthikulpanit
2016-02-12 18:19 ` Paolo Bonzini
2016-02-12 19:36 ` Suravee Suthikulpanit
2016-02-19 11:57 ` Suravee Suthikulpanit
2016-02-12 13:59 ` [PART1 RFC 7/9] svm: Do not expose x2APIC when enable AVIC Suravee Suthikulpanit
2016-02-12 13:59 ` Suravee Suthikulpanit [this message]
2016-02-12 15:48 ` [PART1 RFC 8/9] svm: Do not intercept CR8 " Paolo Bonzini
2016-02-12 13:59 ` [PART1 RFC 9/9] svm: Manage vcpu load/unload " Suravee Suthikulpanit
2016-02-12 15:46 ` Paolo Bonzini
2016-02-12 18:13 ` [PART1 RFC 0/9] KVM: x86: Introduce SVM AVIC support Paolo Bonzini
2016-02-12 19:55 ` Suravee Suthikulpanit
2016-02-12 20:05 ` Paolo Bonzini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1455285574-27892-9-git-send-email-suravee.suthikulpanit@amd.com \
--to=suravee.suthikulpanit@amd.com \
--cc=alex.williamson@redhat.com \
--cc=gleb@kernel.org \
--cc=joro@8bytes.org \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=sherry.hurwitz@amd.com \
--cc=wei@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).