mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 18:50:05 +01:00
x86/vmx: always sync PIR to IRR before vmentry
When using posted interrupts on Intel hardware it's possible that the vCPU resumes execution with a stale local APIC IRR register because depending on the interrupts to be injected vlapic_has_pending_irq might not be called, and thus PIR won't be synced into IRR. Fix this by making sure PIR is always synced to IRR in hvm_vcpu_has_pending_irq regardless of what interrupts are pending. Reported-by: Joe Jin <joe.jin@oracle.com> Signed-off-by: Roger Pau Monné <roger.pau@citrix.com> Tested-by: Joe Jin <joe.jin@oracle.com> Acked-by: Jan Beulich <jbeulich@suse.com> Release-acked-by: Juergen Gross <jgross@suse.com>
This commit is contained in:
1 parent
9a400d1797
commit
56348df32b
3 files changed
+17
-8
No files matched your search
@@ -517,6 +517,15 @@ struct hvm_intack hvm_vcpu_has_pending_irq(struct vcpu *v)
|
||||
struct hvm_domain *plat = &v->domain->arch.hvm;
|
||||
int vector;
|
||||
|
||||
/*
|
||||
* Always call vlapic_sync_pir_to_irr so that PIR is synced into IRR when
|
||||
* using posted interrupts. Note this is also done by
|
||||
* vlapic_has_pending_irq but depending on which interrupts are pending
|
||||
* hvm_vcpu_has_pending_irq will return early without calling
|
||||
* vlapic_has_pending_irq.
|
||||
*/
|
||||
vlapic_sync_pir_to_irr(v);
|
||||
|
||||
if ( unlikely(v->nmi_pending) )
|
||||
return hvm_intack_nmi;
|
||||
|
||||
|
||||
@@ -106,15 +106,9 @@ static void vlapic_clear_irr(int vector, struct vlapic *vlapic)
|
||||
vlapic_clear_vector(vector, &vlapic->regs->data[APIC_IRR]);
|
||||
}
|
||||
|
||||
static void sync_pir_to_irr(struct vcpu *v)
|
||||
{
|
||||
if ( hvm_funcs.sync_pir_to_irr )
|
||||
alternative_vcall(hvm_funcs.sync_pir_to_irr, v);
|
||||
}
|
||||
|
||||
static int vlapic_find_highest_irr(struct vlapic *vlapic)
|
||||
{
|
||||
sync_pir_to_irr(vlapic_vcpu(vlapic));
|
||||
vlapic_sync_pir_to_irr(vlapic_vcpu(vlapic));
|
||||
|
||||
return vlapic_find_highest_vector(&vlapic->regs->data[APIC_IRR]);
|
||||
}
|
||||
@@ -1494,7 +1488,7 @@ static int lapic_save_regs(struct vcpu *v, hvm_domain_context_t *h)
|
||||
if ( !has_vlapic(v->domain) )
|
||||
return 0;
|
||||
|
||||
sync_pir_to_irr(v);
|
||||
vlapic_sync_pir_to_irr(v);
|
||||
|
||||
return hvm_save_entry(LAPIC_REGS, v->vcpu_id, h, vcpu_vlapic(v)->regs);
|
||||
}
|
||||
|
||||
@@ -150,4 +150,10 @@ bool_t vlapic_match_dest(
|
||||
const struct vlapic *target, const struct vlapic *source,
|
||||
int short_hand, uint32_t dest, bool_t dest_mode);
|
||||
|
||||
static inline void vlapic_sync_pir_to_irr(struct vcpu *v)
|
||||
{
|
||||
if ( hvm_funcs.sync_pir_to_irr )
|
||||
alternative_vcall(hvm_funcs.sync_pir_to_irr, v);
|
||||
}
|
||||
|
||||
#endif /* __ASM_X86_HVM_VLAPIC_H__ */
|
||||