Gleb Natapov wrote on 2013-04-10:
> On Wed, Apr 10, 2013 at 09:22:57PM +0800, Yang Zhang wrote:
>> From: Yang Zhang <[email protected]>
>>
>> If posted interrupt is avaliable, then uses it to inject virtual
>> interrupt to guest.
>>
>> Signed-off-by: Yang Zhang <[email protected]>
>> ---
>> arch/x86/kvm/lapic.c | 32 +++++++++++++++++++++-----------
>> arch/x86/kvm/vmx.c | 2 +-
>> arch/x86/kvm/x86.c | 1 +
>> 3 files changed, 23 insertions(+), 12 deletions(-)
>> diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
>> index 42a87ac..4fdb984 100644
>> --- a/arch/x86/kvm/lapic.c
>> +++ b/arch/x86/kvm/lapic.c
>> @@ -349,6 +349,7 @@ static inline int apic_find_highest_irr(struct kvm_lapic
> *apic)
>> if (!apic->irr_pending)
>> return -1;
>> + kvm_x86_ops->sync_pir_to_irr(apic->vcpu);
>> result = apic_search_irr(apic);
>> ASSERT(result == -1 || result >= 16);
>> @@ -679,18 +680,27 @@ static int __apic_accept_irq(struct kvm_lapic *apic,
>> int
> delivery_mode,
>> if (dest_map)
>> __set_bit(vcpu->vcpu_id, dest_map);
>> - result = !apic_test_and_set_irr(vector, apic);
>> - trace_kvm_apic_accept_irq(vcpu->vcpu_id, delivery_mode,
>> - trig_mode, vector, !result);
>> - if (!result) {
>> - if (trig_mode)
>> - apic_debug("level trig mode repeatedly for "
>> - "vector %d", vector);
>> - break;
>> - }
>> + if (kvm_x86_ops->deliver_posted_interrupt) {
>> + result = 1;
>> + kvm_x86_ops->deliver_posted_interrupt(vcpu, vector);
>> + } else {
>> + result = !apic_test_and_set_irr(vector, apic);
>> +
>> + trace_kvm_apic_accept_irq(vcpu->vcpu_id, delivery_mode,
>> + trig_mode, vector, !result);
>> + if (!result) {
>> + if (trig_mode)
>> + apic_debug("level trig mode repeatedly "
>> + "for vector %d", vector);
>> + goto out;
>> + }
>>
>> - kvm_make_request(KVM_REQ_EVENT, vcpu);
>> - kvm_vcpu_kick(vcpu);
>> + kvm_make_request(KVM_REQ_EVENT, vcpu);
>> + kvm_vcpu_kick(vcpu);
>> + }
>> +out:
>> + trace_kvm_apic_accept_irq(vcpu->vcpu_id, delivery_mode,
>> + trig_mode, vector, !result);
> Sigh, now you trace it twice.
Yes. Forget to remove the old one. :(
>
>> break;
>>
>> case APIC_DM_REMRD:
>> diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
>> index 314b2ed..52b21da 100644
>> --- a/arch/x86/kvm/vmx.c
>> +++ b/arch/x86/kvm/vmx.c
>> @@ -84,7 +84,7 @@ module_param(vmm_exclusive, bool, S_IRUGO);
>> static bool __read_mostly fasteoi = 1;
>> module_param(fasteoi, bool, S_IRUGO);
>> -static bool __read_mostly enable_apicv;
>> +static bool __read_mostly enable_apicv = 1;
>> module_param(enable_apicv, bool, S_IRUGO);
>>
>> /*
>> diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
>> index 72be079..486f627 100644
>> --- a/arch/x86/kvm/x86.c
>> +++ b/arch/x86/kvm/x86.c
>> @@ -2685,6 +2685,7 @@ void kvm_arch_vcpu_put(struct kvm_vcpu *vcpu)
>> static int kvm_vcpu_ioctl_get_lapic(struct kvm_vcpu *vcpu,
>>
>> struct kvm_lapic_state *s) { + kvm_x86_ops->sync_pir_to_irr(vcpu);
>> memcpy(s->regs, vcpu->arch.apic->regs, sizeof *s);
>>
>> return 0;
>> --
>> 1.7.1
>
> --
> Gleb.
Best regards,
Yang
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
