From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marcelo Tosatti Subject: Re: [PATCH 5/8] KVM: Using gsi_msg mapping for MSI device assignment Date: Tue, 23 Dec 2008 16:05:15 -0200 Message-ID: <20081223180515.GC5449@amt.cnet> References: <1230019231-16543-1-git-send-email-sheng@linux.intel.com> <1230019231-16543-6-git-send-email-sheng@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Avi Kivity , kvm@vger.kernel.org To: Sheng Yang Return-path: Received: from mx2.redhat.com ([66.187.237.31]:49244 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751114AbYLWSFX (ORCPT ); Tue, 23 Dec 2008 13:05:23 -0500 Content-Disposition: inline In-Reply-To: <1230019231-16543-6-git-send-email-sheng@linux.intel.com> Sender: kvm-owner@vger.kernel.org List-ID: On Tue, Dec 23, 2008 at 04:00:28PM +0800, Sheng Yang wrote: > Convert MSI userspace interface to support gsi_msg mapping(and nobody should > be the user of the old interface...). > > Signed-off-by: Sheng Yang > --- > include/linux/kvm_host.h | 1 - > virt/kvm/kvm_main.c | 33 ++++++++++++++++++++------------- > 2 files changed, 20 insertions(+), 14 deletions(-) > > diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c > index db9de47..50b3ff6 100644 > --- a/virt/kvm/kvm_main.c > +++ b/virt/kvm/kvm_main.c > @@ -92,20 +92,28 @@ static void assigned_device_msi_dispatch(struct kvm_assigned_dev_kernel *dev) > int vcpu_id; > struct kvm_vcpu *vcpu; > struct kvm_ioapic *ioapic = ioapic_irqchip(dev->kvm); > - int dest_id = (dev->guest_msi.address_lo & MSI_ADDR_DEST_ID_MASK) > - >> MSI_ADDR_DEST_ID_SHIFT; > - int vector = (dev->guest_msi.data & MSI_DATA_VECTOR_MASK) > - >> MSI_DATA_VECTOR_SHIFT; > - int dest_mode = test_bit(MSI_ADDR_DEST_MODE_SHIFT, > - (unsigned long *)&dev->guest_msi.address_lo); > - int trig_mode = test_bit(MSI_DATA_TRIGGER_SHIFT, > - (unsigned long *)&dev->guest_msi.data); > - int delivery_mode = test_bit(MSI_DATA_DELIVERY_MODE_SHIFT, > - (unsigned long *)&dev->guest_msi.data); > + struct kvm_gsi_msg *gsi_msg = > + kvm_find_gsi_msg(dev->kvm, dev->guest_irq); kvm_find_gsi_msg requires the gsi_msg mutex held? > + delivery_mode = test_bit(MSI_DATA_DELIVERY_MODE_SHIFT, > + (unsigned long *)&gsi_msg->msg.data); > deliver_bitmask = kvm_ioapic_get_delivery_bitmask(ioapic, > dest_id, dest_mode); > /* IOAPIC delivery mode value is the same as MSI here */ Please unify the IOAPIC specific code in assigned_device_msi_dispatch with ioapic_deliver.