Marcelo Tosatti wrote on 2013-03-22:
> On Thu, Mar 21, 2013 at 06:49:22PM +0800, Yang Zhang wrote:
>> From: Yang Zhang <yang.z.zhang@xxxxxxxxx>
>>
>> Signed-off-by: Yang Zhang <yang.z.zhang@xxxxxxxxx>
>> ---
>> arch/x86/kvm/lapic.c | 8 ++++++++
>> arch/x86/kvm/lapic.h | 2 ++
>> virt/kvm/ioapic.c | 35 +++++++++++++++++++++++++++++++++++
>> 3 files changed, 45 insertions(+), 0 deletions(-)
>> diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
>> index 5f6b1d0..158e0a3 100644
>> --- a/arch/x86/kvm/lapic.c
>> +++ b/arch/x86/kvm/lapic.c
>> @@ -94,6 +94,14 @@ static inline int apic_test_vector(int vec, void *bitmap)
>> return test_bit(VEC_POS(vec), (bitmap) + REG_POS(vec));
>> }
>> +bool kvm_apic_pending_eoi(struct kvm_vcpu *vcpu, int vector)
>> +{
>> + struct kvm_lapic *apic = vcpu->arch.apic;
>> +
>> + return apic_test_vector(vector, apic->regs + APIC_ISR) ||
>> + apic_test_vector(vector, apic->regs + APIC_IRR);
>> +}
>> +
>> static inline void apic_set_vector(int vec, void *bitmap)
>> {
>> set_bit(VEC_POS(vec), (bitmap) + REG_POS(vec));
>> diff --git a/arch/x86/kvm/lapic.h b/arch/x86/kvm/lapic.h
>> index 967519c..004d2ad 100644
>> --- a/arch/x86/kvm/lapic.h
>> +++ b/arch/x86/kvm/lapic.h
>> @@ -170,4 +170,6 @@ static inline bool kvm_apic_has_events(struct
> kvm_vcpu *vcpu)
>> return vcpu->arch.apic->pending_events;
>> }
>> +bool kvm_apic_pending_eoi(struct kvm_vcpu *vcpu, int vector);
>> +
>> #endif
>> diff --git a/virt/kvm/ioapic.c b/virt/kvm/ioapic.c
>> index 4767fa6..8f9c62b 100644
>> --- a/virt/kvm/ioapic.c
>> +++ b/virt/kvm/ioapic.c
>> @@ -87,6 +87,39 @@ static unsigned long ioapic_read_indirect(struct
> kvm_ioapic *ioapic,
>> return result;
>> }
>> +#ifdef CONFIG_X86
>> +static void rtc_irq_reset(struct kvm_ioapic *ioapic)
>> +{
>> + ioapic->rtc_status.pending_eoi = 0;
>> + bitmap_zero(ioapic->rtc_status.dest_map, KVM_MAX_VCPUS);
>> +}
>> +
>> +static void rtc_irq_restore(struct kvm_ioapic *ioapic)
>> +{
>> + struct kvm_vcpu *vcpu;
>> + int vector, i, pending_eoi = 0, rtc_pin = 8;
>> +
>> + vector = ioapic->redirtbl[rtc_pin].fields.vector;
>> + kvm_for_each_vcpu(i, vcpu, ioapic->kvm) {
>> + if (kvm_apic_pending_eoi(vcpu, vector)) {
>> + pending_eoi++;
>> + set_bit(vcpu->vcpu_id, ioapic->rtc_status.dest_map);
>> + }
>> + }
>> + ioapic->rtc_status.pending_eoi = pending_eoi;
>> +}
>
> Userspace can load the IOAPIC before loading VCPUS LAPIC via
> KVM_SET_LAPIC. So kvm_lapic_reset / kvm_apic_post_state_restore should
> also update ioapic->rtc_status.dest_map (checking whether ioapic is
> initialized, of course).
Yes, this does happen.
>
> Please add a comment explaining why dest_map is necessary (or explain it
> in the changelog).
Sure.
Best regards,
Yang
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
