Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

xen/events: fix unmask_evtchn for PV on HVM guests

Browse source 
When unmask_evtchn is called, if we already have an event pending, we
just set evtchn_pending_sel waiting for local_irq_enable to be called.
That is because PV guests set the irq_enable pvops to
xen_irq_enable_direct in xen_setup_vcpu_info_placement:
xen_irq_enable_direct is implemented in assembly in
arch/x86/xen/xen-asm.S and call xen_force_evtchn_callback if
XEN_vcpu_info_pending is set.

However HVM guests (and ARM guests) do not change or do not have the
irq_enable pvop, so evtchn_unmask cannot work properly for them.

Considering that having the pending_irq bit set when unmask_evtchn is
called is not very common, and it is simpler to keep the
native_irq_enable implementation for HVM guests (and ARM guests), the
best thing to do is just use the EVTCHNOP_unmask hypercall (Xen
re-injects pending events in response).

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
This commit is contained in:
Stefano Stabellini 2012-08-22 17:20:11 +01:00 committed by Konrad Rzeszutek Wilk
parent 5c13f80677
commit b5e579232d
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
drivers/xen/events.c
View file

@ -373,11 +373,22 @@ static void unmask_evtchn(int port)
{ {
struct shared_info *s = HYPERVISOR_shared_info; struct shared_info *s = HYPERVISOR_shared_info;
unsigned int cpu = get_cpu(); unsigned int cpu = get_cpu();
int do_hypercall = 0, evtchn_pending = 0;
BUG_ON(!irqs_disabled()); BUG_ON(!irqs_disabled());
/* Slow path (hypercall) if this is a non-local port. */ if (unlikely((cpu != cpu_from_evtchn(port))))
if (unlikely(cpu != cpu_from_evtchn(port))) { do_hypercall = 1;
else
evtchn_pending = sync_test_bit(port, &s->evtchn_pending[0]);
if (unlikely(evtchn_pending && xen_hvm_domain()))
do_hypercall = 1;
/* Slow path (hypercall) if this is a non-local port or if this is
* an hvm domain and an event is pending (hvm domains don't have
* their own implementation of irq_enable). */
if (do_hypercall) {
struct evtchn_unmask unmask = { .port = port }; struct evtchn_unmask unmask = { .port = port };
(void)HYPERVISOR_event_channel_op(EVTCHNOP_unmask, &unmask); (void)HYPERVISOR_event_channel_op(EVTCHNOP_unmask, &unmask);
} else { } else {
@ -390,7 +401,7 @@ static void unmask_evtchn(int port)
* 'hw_resend_irq'. Just like a real IO-APIC we 'lose * 'hw_resend_irq'. Just like a real IO-APIC we 'lose
* the interrupt edge' if the channel is masked. * the interrupt edge' if the channel is masked.
*/ */
if (sync_test_bit(port, &s->evtchn_pending[0]) && if (evtchn_pending &&
!sync_test_and_set_bit(port / BITS_PER_LONG, !sync_test_and_set_bit(port / BITS_PER_LONG,
&vcpu_info->evtchn_pending_sel)) &vcpu_info->evtchn_pending_sel))
vcpu_info->evtchn_upcall_pending = 1; vcpu_info->evtchn_upcall_pending = 1;