Skip to content

Commit

Permalink
xen/events: Handle VIRQ_TIMER before any other hardirq in event loop.
Browse files Browse the repository at this point in the history
This avoids any other hardirq handler seeing a very stale jiffies
value immediately after wakeup from a long idle period. The one
observable symptom of this was a USB keyboard, with software keyboard
repeat, which would always repeat a key immediately that it was
pressed. This is due to the key press waking the guest, the key
handler immediately runs, sees an old jiffies value, and then that
jiffies value significantly updated, before the key is unpressed.

Reviewed-by: David Vrabel <david.vrabel@citrix.com>
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
  • Loading branch information
Keir Fraser authored and Konrad Rzeszutek Wilk committed Apr 2, 2013
1 parent c26377e commit bee980d
Showing 1 changed file with 15 additions and 4 deletions.
19 changes: 15 additions & 4 deletions drivers/xen/events.c
Original file line number Diff line number Diff line change
Expand Up @@ -1316,14 +1316,16 @@ static void __xen_evtchn_do_upcall(void)
{
int start_word_idx, start_bit_idx;
int word_idx, bit_idx;
int i;
int i, irq;
int cpu = get_cpu();
struct shared_info *s = HYPERVISOR_shared_info;
struct vcpu_info *vcpu_info = __this_cpu_read(xen_vcpu);
unsigned count;

do {
xen_ulong_t pending_words;
xen_ulong_t pending_bits;
struct irq_desc *desc;

vcpu_info->evtchn_upcall_pending = 0;

Expand All @@ -1335,6 +1337,17 @@ static void __xen_evtchn_do_upcall(void)
* selector flag. xchg_xen_ulong must contain an
* appropriate barrier.
*/
if ((irq = per_cpu(virq_to_irq, cpu)[VIRQ_TIMER]) != -1) {
int evtchn = evtchn_from_irq(irq);
word_idx = evtchn / BITS_PER_LONG;
pending_bits = evtchn % BITS_PER_LONG;
if (active_evtchns(cpu, s, word_idx) & (1ULL << pending_bits)) {
desc = irq_to_desc(irq);
if (desc)
generic_handle_irq_desc(irq, desc);
}
}

pending_words = xchg_xen_ulong(&vcpu_info->evtchn_pending_sel, 0);

start_word_idx = __this_cpu_read(current_word_idx);
Expand All @@ -1343,7 +1356,6 @@ static void __xen_evtchn_do_upcall(void)
word_idx = start_word_idx;

for (i = 0; pending_words != 0; i++) {
xen_ulong_t pending_bits;
xen_ulong_t words;

words = MASK_LSBS(pending_words, word_idx);
Expand Down Expand Up @@ -1372,8 +1384,7 @@ static void __xen_evtchn_do_upcall(void)

do {
xen_ulong_t bits;
int port, irq;
struct irq_desc *desc;
int port;

bits = MASK_LSBS(pending_bits, bit_idx);

Expand Down

0 comments on commit bee980d

Please sign in to comment.