diff options
| author | Tim Deegan <Tim.Deegan@citrix.com> | 2011-08-16 15:27:06 +0100 |
|---|---|---|
| committer | Tim Deegan <Tim.Deegan@citrix.com> | 2011-08-16 15:27:06 +0100 |
| commit | bdccfa0e13f4f9abdb6db639e25aedd4b1f1f37e (patch) | |
| tree | ad4ab3c1edcc6e0ec2aa2611f38bf4a77821149b | |
| parent | f9bb93fc8758a555df7bf5933729a1e89fcef371 (diff) | |
| download | xen-bdccfa0e13f4f9abdb6db639e25aedd4b1f1f37e.tar.gz xen-bdccfa0e13f4f9abdb6db639e25aedd4b1f1f37e.tar.bz2 xen-bdccfa0e13f4f9abdb6db639e25aedd4b1f1f37e.zip | |
VT-d: always clean up dpci timers.
If a VM has all its PCI devices deassigned, need_iommu(d) becomes
false but it might still have DPCI EOI timers that were init_timer()d
but not yet kill_timer()d. That causes xen to crash later because the
linked list of inactive timers gets corrupted, e.g.:
(XEN) Xen call trace:
(XEN) [<ffff82c480126256>] set_timer+0x1c2/0x24f
(XEN) [<ffff82c48011fbf8>] schedule+0x129/0x5dd
(XEN) [<ffff82c480122c1e>] __do_softirq+0x7e/0x89
(XEN) [<ffff82c480122c9d>] do_softirq+0x26/0x28
(XEN) [<ffff82c480153c85>] idle_loop+0x5a/0x5c
(XEN)
(XEN)
(XEN) ****************************************
(XEN) Panic on CPU 0:
(XEN) Assertion 'entry->next->prev == entry' failed at
/local/scratch/tdeegan/xen-unstable.hg/xen/include:172
(XEN) ****************************************
The following patch makes sure that the domain destruction path always
clears up the DPCI state even if !needs_iommu(d).
Signed-off-by: Tim Deegan <Tim.Deegan@citrix.com>
xen-unstable changeset: 23746:aa54b8175954
xen-unstable date: Mon Jul 25 16:41:33 2011 +0100
| -rw-r--r-- | xen/drivers/passthrough/pci.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c index 86f680d6a1..280309427b 100644 --- a/xen/drivers/passthrough/pci.c +++ b/xen/drivers/passthrough/pci.c @@ -249,9 +249,6 @@ static void pci_clean_dpci_irqs(struct domain *d) if ( !iommu_enabled ) return; - if ( !need_iommu(d) ) - return; - spin_lock(&d->event_lock); hvm_irq_dpci = domain_get_irq_dpci(d); if ( hvm_irq_dpci != NULL ) |