Commit dc1c4165 authored by Cédric Le Goater's avatar Cédric Le Goater Committed by Michael Ellerman

KVM: PPC: Book3S: fix XIVE migration of pending interrupts

When restoring a pending interrupt, we are setting the Q bit to force
a retrigger in xive_finish_unmask(). But we also need to force an EOI
in this case to reach the same initial state : P=1, Q=0.

This can be done by not setting 'old_p' for pending interrupts which
will inform xive_finish_unmask() that an EOI needs to be sent.

Fixes: 5af50993 ("KVM: PPC: Book3S HV: Native usage of the XIVE interrupt controller")
Cc: stable@vger.kernel.org # v4.12+
Suggested-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarCédric Le Goater <clg@kaod.org>
Reviewed-by: default avatarLaurent Vivier <lvivier@redhat.com>
Tested-by: default avatarLaurent Vivier <lvivier@redhat.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 182dc9c7
...@@ -1558,7 +1558,7 @@ static int xive_set_source(struct kvmppc_xive *xive, long irq, u64 addr) ...@@ -1558,7 +1558,7 @@ static int xive_set_source(struct kvmppc_xive *xive, long irq, u64 addr)
/* /*
* Restore P and Q. If the interrupt was pending, we * Restore P and Q. If the interrupt was pending, we
* force both P and Q, which will trigger a resend. * force Q and !P, which will trigger a resend.
* *
* That means that a guest that had both an interrupt * That means that a guest that had both an interrupt
* pending (queued) and Q set will restore with only * pending (queued) and Q set will restore with only
...@@ -1566,7 +1566,7 @@ static int xive_set_source(struct kvmppc_xive *xive, long irq, u64 addr) ...@@ -1566,7 +1566,7 @@ static int xive_set_source(struct kvmppc_xive *xive, long irq, u64 addr)
* is perfectly fine as coalescing interrupts that haven't * is perfectly fine as coalescing interrupts that haven't
* been presented yet is always allowed. * been presented yet is always allowed.
*/ */
if (val & KVM_XICS_PRESENTED || val & KVM_XICS_PENDING) if (val & KVM_XICS_PRESENTED && !(val & KVM_XICS_PENDING))
state->old_p = true; state->old_p = true;
if (val & KVM_XICS_QUEUED || val & KVM_XICS_PENDING) if (val & KVM_XICS_QUEUED || val & KVM_XICS_PENDING)
state->old_q = true; state->old_q = true;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment