mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 10:11:27 +01:00
x86/upcall: inject a spurious event after setting upcall vector
In case the vCPU has pending events to inject. This fixes a bug that happened if the guest mapped the vcpu info area using VCPUOP_register_vcpu_info without having setup the event channel upcall, and then setup the upcall vector. In this scenario the guest would not receive any upcalls, because the call to VCPUOP_register_vcpu_info would have marked the vCPU as having pending events, but the vector could not be injected because it was not yet setup. This has not caused issues so far because all the consumers first setup the vector callback and then map the vcpu info page, but there's no limitation that prevents doing it in the inverse order. Signed-off-by: Roger Pau Monné <roger.pau@citrix.com> Reviewed-by: Jan Beulich <jbeulich@suse.com>
This commit is contained in:
1 parent
b55f6c299d
commit
7b5b8ca7df
2 files changed
+6
No files matched your search
@@ -4075,6 +4075,7 @@ static int hvmop_set_evtchn_upcall_vector(
|
||||
printk(XENLOG_G_INFO "%pv: upcall vector %02x\n", v, op.vector);
|
||||
|
||||
v->arch.hvm_vcpu.evtchn_upcall_vector = op.vector;
|
||||
hvm_assert_evtchn_irq(v);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -385,6 +385,7 @@ void hvm_set_callback_via(struct domain *d, uint64_t via)
|
||||
struct hvm_irq *hvm_irq = hvm_domain_irq(d);
|
||||
unsigned int gsi=0, pdev=0, pintx=0;
|
||||
uint8_t via_type;
|
||||
struct vcpu *v;
|
||||
|
||||
via_type = (uint8_t)MASK_EXTR(via, HVM_PARAM_CALLBACK_IRQ_TYPE_MASK) + 1;
|
||||
if ( ((via_type == HVMIRQ_callback_gsi) && (via == 0)) ||
|
||||
@@ -447,6 +448,10 @@ void hvm_set_callback_via(struct domain *d, uint64_t via)
|
||||
|
||||
spin_unlock(&d->arch.hvm_domain.irq_lock);
|
||||
|
||||
for_each_vcpu ( d, v )
|
||||
if ( is_vcpu_online(v) )
|
||||
hvm_assert_evtchn_irq(v);
|
||||
|
||||
#ifndef NDEBUG
|
||||
printk(XENLOG_G_INFO "Dom%u callback via changed to ", d->domain_id);
|
||||
switch ( via_type )
|
||||
|
||||