@@ -144,7 +144,37 @@ bool vlapic_test_irq(const struct vlapic *vlapic, uint8_t vec)
return vlapic_test_vector(vec, &vlapic->regs->data[APIC_IRR]);
}
-void vlapic_set_irq(struct vlapic *vlapic, uint8_t vec, uint8_t trig)
+void vlapic_set_callback(struct vlapic *vlapic, unsigned int vec,
+ vlapic_eoi_callback_t *callback, void *data)
+{
+ unsigned long flags;
+ unsigned int index = vec - 16;
+
+ if ( !callback || vec < 16 || vec >= X86_NR_VECTORS )
+ {
+ ASSERT_UNREACHABLE();
+ return;
+ }
+
+ spin_lock_irqsave(&vlapic->callback_lock, flags);
+ if ( vlapic->callbacks[index].callback &&
+ (vlapic->callbacks[index].callback != callback ||
+ vlapic->callbacks[index].data != data) &&
+ (vlapic_test_vector(vec, &vlapic->regs->data[APIC_IRR]) ||
+ vlapic_test_vector(vec, &vlapic->regs->data[APIC_ISR])) )
+ printk(XENLOG_G_WARNING
+ "%pv overriding vector %#x callback %ps (%p) data %p "
+ "with %ps (%p) data %p\n",
+ vlapic_vcpu(vlapic), vec, vlapic->callbacks[index].callback,
+ vlapic->callbacks[index].callback, vlapic->callbacks[index].data,
+ callback, callback, data);
+ vlapic->callbacks[index].callback = callback;
+ vlapic->callbacks[index].data = data;
+ spin_unlock_irqrestore(&vlapic->callback_lock, flags);
+}
+
+void vlapic_set_irq_callback(struct vlapic *vlapic, uint8_t vec, uint8_t trig,
+ vlapic_eoi_callback_t *callback, void *data)
{
struct vcpu *target = vlapic_vcpu(vlapic);
@@ -159,8 +189,12 @@ void vlapic_set_irq(struct vlapic *vlapic, uint8_t vec, uint8_t trig)
else
vlapic_clear_vector(vec, &vlapic->regs->data[APIC_TMR]);
+ if ( callback )
+ vlapic_set_callback(vlapic, vec, callback, data);
+
if ( hvm_funcs.update_eoi_exit_bitmap )
- alternative_vcall(hvm_funcs.update_eoi_exit_bitmap, target, vec, trig);
+ alternative_vcall(hvm_funcs.update_eoi_exit_bitmap, target, vec,
+ trig || callback);
if ( hvm_funcs.deliver_posted_intr )
alternative_vcall(hvm_funcs.deliver_posted_intr, target, vec);
@@ -461,11 +495,24 @@ void vlapic_handle_EOI(struct vlapic *vlapic, u8 vector)
{
struct vcpu *v = vlapic_vcpu(vlapic);
struct domain *d = v->domain;
+ vlapic_eoi_callback_t *callback;
+ void *data;
+ unsigned long flags;
+ unsigned int index = vector - 16;
if ( vlapic_test_vector(vector, &vlapic->regs->data[APIC_TMR]) )
vioapic_update_EOI(d, vector);
hvm_dpci_msi_eoi(d, vector);
+
+ spin_lock_irqsave(&vlapic->callback_lock, flags);
+ callback = vlapic->callbacks[index].callback;
+ vlapic->callbacks[index].callback = NULL;
+ data = vlapic->callbacks[index].data;
+ spin_unlock_irqrestore(&vlapic->callback_lock, flags);
+
+ if ( callback )
+ callback(v, vector, data);
}
static bool_t is_multicast_dest(struct vlapic *vlapic, unsigned int short_hand,
@@ -1623,9 +1670,19 @@ int vlapic_init(struct vcpu *v)
clear_page(vlapic->regs);
+ vlapic->callbacks = xzalloc_array(typeof(*vlapic->callbacks),
+ X86_NR_VECTORS - 16);
+ if ( !vlapic->callbacks )
+ {
+ unmap_domain_page_global(vlapic->regs);
+ free_domheap_page(vlapic->regs_page);
+ return -ENOMEM;
+ }
+
vlapic_reset(vlapic);
spin_lock_init(&vlapic->esr_lock);
+ spin_lock_init(&vlapic->callback_lock);
tasklet_init(&vlapic->init_sipi.tasklet, vlapic_init_sipi_action, v);
@@ -1647,6 +1704,7 @@ void vlapic_destroy(struct vcpu *v)
destroy_periodic_time(&vlapic->pt);
unmap_domain_page_global(vlapic->regs);
free_domheap_page(vlapic->regs_page);
+ XFREE(vlapic->callbacks);
}
/*
@@ -73,6 +73,9 @@
#define vlapic_clear_vector(vec, bitmap) \
clear_bit(VEC_POS(vec), (uint32_t *)((bitmap) + REG_POS(vec)))
+typedef void vlapic_eoi_callback_t(struct vcpu *v, unsigned int vector,
+ void *data);
+
struct vlapic {
struct hvm_hw_lapic hw;
struct hvm_hw_lapic_regs *regs;
@@ -89,6 +92,11 @@ struct vlapic {
uint32_t icr, dest;
struct tasklet tasklet;
} init_sipi;
+ struct {
+ vlapic_eoi_callback_t *callback;
+ void *data;
+ } *callbacks;
+ spinlock_t callback_lock;
};
/* vlapic's frequence is 100 MHz */
@@ -111,7 +119,16 @@ void vlapic_reg_write(struct vcpu *v, unsigned int reg, uint32_t val);
bool_t is_vlapic_lvtpc_enabled(struct vlapic *vlapic);
bool vlapic_test_irq(const struct vlapic *vlapic, uint8_t vec);
-void vlapic_set_irq(struct vlapic *vlapic, uint8_t vec, uint8_t trig);
+void vlapic_set_callback(struct vlapic *vlapic, unsigned int vec,
+ vlapic_eoi_callback_t *callback, void *data);
+void vlapic_set_irq_callback(struct vlapic *vlapic, uint8_t vec, uint8_t trig,
+ vlapic_eoi_callback_t *callback, void *data);
+
+static inline void vlapic_set_irq(struct vlapic *vlapic, uint8_t vec,
+ uint8_t trig)
+{
+ vlapic_set_irq_callback(vlapic, vec, trig, NULL, NULL);
+}
int vlapic_has_pending_irq(struct vcpu *v);
int vlapic_ack_pending_irq(struct vcpu *v, int vector, bool_t force_ack);
Add a new vlapic_set_irq_callback helper in order to inject a vector and set a callback to be executed when the guest performs the end of interrupt acknowledgment. Such functionality will be used to migrate the current ad hoc handling done in vlapic_handle_EOI for the vectors that require some logic to be executed when the end of interrupt is performed. The setter of the callback will be in charge for setting the callback again on guest restore, as callbacks are not saved as part of the vlapic state. That is the reason why vlapic_set_callback is not a static function. No current users are migrated to use this new functionality yet, so no functional change expected as a result. Signed-off-by: Roger Pau Monné <roger.pau@citrix.com> --- Changes since v3: - Use xzalloc. - Drop printk on ENOMEM. - Add vcpu parameter to vlapic EOI callback. - Check that the vector is pending in ISR or IRR when printing a warning message because of an overriding callback. - Fix commit message regarding resume mention. Changes since v2: - Fix commit message typo. - Expand commit message. - Also print a warning if the callback data is overridden. - Properly free memory in case of error in vlapic_init. Changes since v1: - Make vlapic_set_irq an inline function on the header. - Clear the callback hook in vlapic_handle_EOI. - Introduce a helper to set the callback without injecting a vector. - Remove unneeded parentheses. - Reduce callback table by 16. - Use %pv to print domain/vcpu ID. --- xen/arch/x86/hvm/vlapic.c | 62 ++++++++++++++++++++++++++++++-- xen/include/asm-x86/hvm/vlapic.h | 19 +++++++++- 2 files changed, 78 insertions(+), 3 deletions(-)