* Re: [PATCH] KVM: x86: sync old tmr with ioapic to update
2014-08-26 16:27 [PATCH] KVM: x86: sync old tmr with ioapic to update Wei Wang
@ 2014-08-26 10:58 ` Paolo Bonzini
0 siblings, 0 replies; 2+ messages in thread
From: Paolo Bonzini @ 2014-08-26 10:58 UTC (permalink / raw)
To: Wei Wang, kvm; +Cc: alex.williamson, Yang Zhang
Il 26/08/2014 18:27, Wei Wang ha scritto:
> kvm_ioapic_scan_entry() needs to update tmr. The previous lapic tmr value
> (old_tmr) needs to sync with ioapic to get an accurate updated tmr
> value before the updating work.
> + u32 irr[8];
> + u32 isr[8];
> + u32 old_tmr[8];
These do not need to be arrays. You can use a single variable for each
of irr, isr and old_tmr.
> int i;
>
> - for (i = 0; i < 8; i++)
> + for (i = 0; i < 8; i++) {
> + irr[i] = kvm_apic_get_reg(apic, APIC_IRR + 0x10 * i);
> + isr[i] = kvm_apic_get_reg(apic, APIC_ISR + 0x10 * i);
> + old_tmr[i] = kvm_apic_get_reg(apic, APIC_TMR + 0x10 * i);
> + tmr[i] = (~(irr[i] | isr[i]) & tmr[i])
> + | ((irr[i] | isr[i]) & old_tmr[i]);
Please do not modify the tmr array. Instead, use kvm_apic_get_reg in
the next patch to read the TMR.
Also, please add a comment about how the code works and why the old TMR
is used if IRR=1 || ISR=1.
Paolo
> apic_set_reg(apic, APIC_TMR + 0x10 * i, tmr[i]);
^ permalink raw reply [flat|nested] 2+ messages in thread
* [PATCH] KVM: x86: sync old tmr with ioapic to update
@ 2014-08-26 16:27 Wei Wang
2014-08-26 10:58 ` Paolo Bonzini
0 siblings, 1 reply; 2+ messages in thread
From: Wei Wang @ 2014-08-26 16:27 UTC (permalink / raw)
To: kvm; +Cc: pbonzini, alex.williamson, Wei Wang, Yang Zhang
kvm_ioapic_scan_entry() needs to update tmr. The previous lapic tmr value
(old_tmr) needs to sync with ioapic to get an accurate updated tmr
value before the updating work.
Tested-by: Rongrong Liu <rongrongx.liu@intel.com>
Signed-off-by: Yang Zhang <yang.z.zhang@intel.com>
Signed-off-by: Wei Wang <wei.w.wang@intel.com>
---
arch/x86/kvm/lapic.c | 11 ++++++++++-
arch/x86/kvm/x86.c | 2 +-
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
index 08e8a89..93c2e93 100644
--- a/arch/x86/kvm/lapic.c
+++ b/arch/x86/kvm/lapic.c
@@ -518,10 +518,19 @@ static void pv_eoi_clr_pending(struct kvm_vcpu *vcpu)
void kvm_apic_update_tmr(struct kvm_vcpu *vcpu, u32 *tmr)
{
struct kvm_lapic *apic = vcpu->arch.apic;
+ u32 irr[8];
+ u32 isr[8];
+ u32 old_tmr[8];
int i;
- for (i = 0; i < 8; i++)
+ for (i = 0; i < 8; i++) {
+ irr[i] = kvm_apic_get_reg(apic, APIC_IRR + 0x10 * i);
+ isr[i] = kvm_apic_get_reg(apic, APIC_ISR + 0x10 * i);
+ old_tmr[i] = kvm_apic_get_reg(apic, APIC_TMR + 0x10 * i);
+ tmr[i] = (~(irr[i] | isr[i]) & tmr[i])
+ | ((irr[i] | isr[i]) & old_tmr[i]);
apic_set_reg(apic, APIC_TMR + 0x10 * i, tmr[i]);
+ }
}
static void apic_update_ppr(struct kvm_lapic *apic)
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 5f5edb6..d401684 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -5991,8 +5991,8 @@ static void vcpu_scan_ioapic(struct kvm_vcpu *vcpu)
memset(tmr, 0, 32);
kvm_ioapic_scan_entry(vcpu, eoi_exit_bitmap, tmr);
- kvm_x86_ops->load_eoi_exitmap(vcpu, eoi_exit_bitmap);
kvm_apic_update_tmr(vcpu, tmr);
+ kvm_x86_ops->load_eoi_exitmap(vcpu, eoi_exit_bitmap);
}
/*
--
1.7.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-08-26 10:59 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-08-26 16:27 [PATCH] KVM: x86: sync old tmr with ioapic to update Wei Wang
2014-08-26 10:58 ` Paolo Bonzini
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.