x86/pass-through: avoid double IRQ unbind during domain cleanup

XEN_DOMCTL_destroydomain creates a continuation if domain_kill -ERESTARTs.
In that scenario, it is possible to receive multiple _pirq_guest_unbind
calls for the same pirq from domain_kill, if the pirq has not yet been
removed from the domain's pirq_tree, as:
  domain_kill()
    -> domain_relinquish_resources()
      -> pci_release_devices()
        -> pci_clean_dpci_irq()
          -> pirq_guest_unbind()
            -> __pirq_guest_unbind()

Avoid recurring invocations of pirq_guest_unbind() by removing the pIRQ
from the tree being iterated after the first call there. In case such a
removed entry still has a softirq outstanding, record it and re-check
upon re-invocation.

Note that pirq_cleanup_check() gets relaxed beyond what's strictly
needed here, to avoid introducing an asymmetry there between HVM and PV
guests.

Reported-by: Varad Gautam <vrd@amazon.de>
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Tested-by: Varad Gautam <vrd@amazon.de>
Reviewed-by: Paul Durrant <paul@xen.org>
Reviewed-by: Roger Pau Monné <roger.pau@citrix.com>
This commit is contained in:
Jan Beulich committed 2020-04-30 10:40:59 +02:00
1 parent 5af040ef8b
commit 5b58dad089
3 files changed
+22 -3

No files matched your search

+1 -1
View File
@@ -1323,7 +1323,7 @@ void (pirq_cleanup_check)(struct pirq *pirq, struct domain *d)
}
if ( radix_tree_delete(&d->pirq_tree, pirq->pirq) != pirq )
BUG();
BUG_ON(!d->is_dying);
}
/* Flush all ready EOIs from the top of this CPU's pending-EOI stack. */
+19 -2
View File
@@ -873,7 +873,14 @@ static int pci_clean_dpci_irq(struct domain *d,
xfree(digl);
}
return pt_pirq_softirq_active(pirq_dpci) ? -ERESTART : 0;
radix_tree_delete(&d->pirq_tree, dpci_pirq(pirq_dpci)->pirq);
if ( !pt_pirq_softirq_active(pirq_dpci) )
return 0;
domain_get_irq_dpci(d)->pending_pirq_dpci = pirq_dpci;
return -ERESTART;
}
static int pci_clean_dpci_irqs(struct domain *d)
@@ -890,8 +897,18 @@ static int pci_clean_dpci_irqs(struct domain *d)
hvm_irq_dpci = domain_get_irq_dpci(d);
if ( hvm_irq_dpci != NULL )
{
int ret = pt_pirq_iterate(d, pci_clean_dpci_irq, NULL);
int ret = 0;
if ( hvm_irq_dpci->pending_pirq_dpci )
{
if ( pt_pirq_softirq_active(hvm_irq_dpci->pending_pirq_dpci) )
ret = -ERESTART;
else
hvm_irq_dpci->pending_pirq_dpci = NULL;
}
if ( !ret )
ret = pt_pirq_iterate(d, pci_clean_dpci_irq, NULL);
if ( ret )
{
spin_unlock(&d->event_lock);
+2
View File
@@ -158,6 +158,8 @@ struct hvm_irq_dpci {
DECLARE_BITMAP(isairq_map, NR_ISAIRQS);
/* Record of mapped Links */
uint8_t link_cnt[NR_LINK];
/* Clean up: Entry with a softirq invocation pending / in progress. */
struct hvm_pirq_dpci *pending_pirq_dpci;
};
/* Machine IRQ to guest device/intx mapping. */
Reference in new issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.