From mboxrd@z Thu Jan  1 00:00:00 1970
From: Gleb Natapov <gleb@redhat.com>
Subject: Re: [PATCH v3 5/8] KVM: Recalculate destination vcpu map
Date: Tue, 19 Mar 2013 09:46:36 +0200
Message-ID: <20130319074636.GU11223@redhat.com>
References: <1363610842-5878-1-git-send-email-yang.z.zhang@intel.com>
 <1363610842-5878-6-git-send-email-yang.z.zhang@intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: kvm@vger.kernel.org, mtosatti@redhat.com, xiantao.zhang@intel.com
To: Yang Zhang <yang.z.zhang@intel.com>
Return-path: <kvm-owner@vger.kernel.org>
Received: from mx1.redhat.com ([209.132.183.28]:1408 "EHLO mx1.redhat.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S933066Ab3CSHqm (ORCPT <rfc822;kvm@vger.kernel.org>);
	Tue, 19 Mar 2013 03:46:42 -0400
Content-Disposition: inline
In-Reply-To: <1363610842-5878-6-git-send-email-yang.z.zhang@intel.com>
Sender: kvm-owner@vger.kernel.org
List-ID: <kvm.vger.kernel.org>

On Mon, Mar 18, 2013 at 08:47:19PM +0800, Yang Zhang wrote:
> From: Yang Zhang <yang.z.zhang@Intel.com>
> 
> Update destination vcpu map when ioapic entry or apic(id, ldr, dfr) is changed
> 
> Signed-off-by: Yang Zhang <yang.z.zhang@Intel.com>
> ---
>  virt/kvm/ioapic.c |   40 ++++++++++++++++++++++++++++++++++++++--
>  1 files changed, 38 insertions(+), 2 deletions(-)
> 
> diff --git a/virt/kvm/ioapic.c b/virt/kvm/ioapic.c
> index 4296116..329efe1 100644
> --- a/virt/kvm/ioapic.c
> +++ b/virt/kvm/ioapic.c
> @@ -87,6 +87,38 @@ static unsigned long ioapic_read_indirect(struct kvm_ioapic *ioapic,
>  	return result;
>  }
>  
> +#ifdef CONFIG_X86
> +static void rtc_irq_get_dest_vcpu(struct kvm_ioapic *ioapic, int irq)
> +{
> +	union kvm_ioapic_redirect_entry *entry = &ioapic->redirtbl[irq];
> +	struct kvm_lapic_irq irqe;
> +
> +	if (irq != 8 || entry->fields.mask)
> +		return;
> +
> +	spin_lock(&ioapic->lock);
How does this not deadlock? The is called from kvm_scan_ioapic_entry()
and kvm_scan_ioapic_entry() is called from ioapic_write_indirect() with
the lock already taken. You should handle that the same way we handle
eoibitmap recalculation: signal vcpu and calculate there.

> +	irqe.dest_id = entry->fields.dest_id;
> +	irqe.vector = entry->fields.vector;
> +	irqe.dest_mode = entry->fields.dest_mode;
> +	irqe.trig_mode = entry->fields.trig_mode;
> +	irqe.delivery_mode = entry->fields.delivery_mode << 8;
> +	irqe.level = 1;
> +	irqe.shorthand = 0;
> +
> +	bitmap_zero(ioapic->rtc_status.vcpu_map, KVM_MAX_VCPUS);
> +
> +	kvm_get_dest_vcpu(ioapic->kvm, &irqe, ioapic->rtc_status.vcpu_map);
> +	spin_unlock(&ioapic->lock);
> +}
> +
> +#else
> +
> +static void rtc_irq_get_dest_vcpu(struct kvm_ioapic *ioapic, int irq)
> +{
> +	return;
> +}
> +#endif
> +
>  static int ioapic_service(struct kvm_ioapic *ioapic, unsigned int idx)
>  {
>  	union kvm_ioapic_redirect_entry *pent;
> @@ -147,9 +179,13 @@ void kvm_scan_ioapic_entry(struct kvm *kvm)
>  {
>  	struct kvm_ioapic *ioapic = kvm->arch.vioapic;
>  
> -	if (!kvm_apic_vid_enabled(kvm) || !ioapic)
> +	if (!ioapic)
>  		return;
> -	kvm_make_update_eoibitmap_request(kvm);
> +
> +	rtc_irq_get_dest_vcpu(ioapic, 8);
> +
> +	if (kvm_apic_vid_enabled(kvm))
> +		kvm_make_update_eoibitmap_request(kvm);
>  }
>  
>  static void ioapic_write_indirect(struct kvm_ioapic *ioapic, u32 val)
> -- 
> 1.7.1

--
			Gleb.