Skip to content

Commit fdfe1e7

Browse files
dwmw2opsiff
authored andcommitted
KVM: x86/xen: Allow 'out of range' event channel ports in IRQ routing table.
commit a7f4dff21fd744d08fa956c243d2b1795f23cbf7 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: [email protected] Signed-off-by: David Woodhouse <[email protected]> Reviewed-by: Paul Durrant <[email protected]> Link: https://lore.kernel.org/r/[email protected] [sean: massage comment] Signed-off-by: Sean Christopherson <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> (cherry picked from commit 55f568521e0b27813a6394a02aee3e9c3ef181e7)
1 parent b48afc5 commit fdfe1e7

File tree

1 file changed

+13
-2
lines changed

1 file changed

+13
-2
lines changed

arch/x86/kvm/xen.c

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1916,8 +1916,19 @@ int kvm_xen_setup_evtchn(struct kvm *kvm,
19161916
{
19171917
struct kvm_vcpu *vcpu;
19181918

1919-
if (ue->u.xen_evtchn.port >= max_evtchn_port(kvm))
1920-
return -EINVAL;
1919+
/*
1920+
* Don't check for the port being within range of max_evtchn_port().
1921+
* Userspace can configure what ever targets it likes; events just won't
1922+
* be delivered if/while the target is invalid, just like userspace can
1923+
* configure MSIs which target non-existent APICs.
1924+
*
1925+
* This allow on Live Migration and Live Update, the IRQ routing table
1926+
* can be restored *independently* of other things like creating vCPUs,
1927+
* without imposing an ordering dependency on userspace. In this
1928+
* particular case, the problematic ordering would be with setting the
1929+
* Xen 'long mode' flag, which changes max_evtchn_port() to allow 4096
1930+
* instead of 1024 event channels.
1931+
*/
19211932

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

0 commit comments

Comments
 (0)