Skip to content

Commit 223ecac

Browse files
dwmw2gregkh
authored andcommitted
KVM: x86/xen: Allow 'out of range' event channel ports in IRQ routing table.
commit a7f4dff upstream. To avoid imposing an ordering constraint on userspace, allow 'invalid' event channel targets to be configured in the IRQ routing table. This is the same as accepting interrupts targeted at vCPUs which don't exist yet, which is already the case for both Xen event channels *and* for MSIs (which don't do any filtering of permitted APIC ID targets at all). If userspace actually *triggers* an IRQ with an invalid target, that will fail cleanly, as kvm_xen_set_evtchn_fast() also does the same range check. If KVM enforced that the IRQ target must be valid at the time it is *configured*, that would force userspace to create all vCPUs and do various other parts of setup (in this case, setting the Xen long_mode) before restoring the IRQ table. Cc: stable@vger.kernel.org Signed-off-by: David Woodhouse <dwmw@amazon.co.uk> Reviewed-by: Paul Durrant <paul@xen.org> Link: https://lore.kernel.org/r/e489252745ac4b53f1f7f50570b03fb416aa2065.camel@infradead.org [sean: massage comment] Signed-off-by: Sean Christopherson <seanjc@google.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 82ffa3c commit 223ecac

1 file changed

Lines changed: 13 additions & 2 deletions

File tree

arch/x86/kvm/xen.c

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1536,8 +1536,19 @@ int kvm_xen_setup_evtchn(struct kvm *kvm,
15361536
{
15371537
struct kvm_vcpu *vcpu;
15381538

1539-
if (ue->u.xen_evtchn.port >= max_evtchn_port(kvm))
1540-
return -EINVAL;
1539+
/*
1540+
* Don't check for the port being within range of max_evtchn_port().
1541+
* Userspace can configure what ever targets it likes; events just won't
1542+
* be delivered if/while the target is invalid, just like userspace can
1543+
* configure MSIs which target non-existent APICs.
1544+
*
1545+
* This allow on Live Migration and Live Update, the IRQ routing table
1546+
* can be restored *independently* of other things like creating vCPUs,
1547+
* without imposing an ordering dependency on userspace. In this
1548+
* particular case, the problematic ordering would be with setting the
1549+
* Xen 'long mode' flag, which changes max_evtchn_port() to allow 4096
1550+
* instead of 1024 event channels.
1551+
*/
15411552

15421553
/* We only support 2 level event channels for now */
15431554
if (ue->u.xen_evtchn.priority != KVM_IRQ_ROUTING_XEN_EVTCHN_PRIO_2LEVEL)

0 commit comments

Comments
 (0)