public/qemu
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

hw/xen: select kernel mode for per-vCPU event channel upcall vector

Browse source 
A guest which has configured the per-vCPU upcall vector may set the
HVM_PARAM_CALLBACK_IRQ param to fairly much anything other than zero.

For example, Linux v6.0+ after commit b1c3497e604 ("x86/xen: Add support
for HVMOP_set_evtchn_upcall_vector") will just do this after setting the
vector:

       /* Trick toolstack to think we are enlightened. */
       if (!cpu)
               rc = xen_set_callback_via(1);

That's explicitly setting the delivery to GSI#1, but it's supposed to be
overridden by the per-vCPU vector setting. This mostly works in Qemu
*except* for the logic to enable the in-kernel handling of event channels,
which falsely determines that the kernel cannot accelerate GSI delivery
in this case.

Add a kvm_xen_has_vcpu_callback_vector() to report whether vCPU#0 has
the vector set, and use that in xen_evtchn_set_callback_param() to
enable the kernel acceleration features even when the param *appears*
to be set to target a GSI.

Preserve the Xen behaviour that when HVM_PARAM_CALLBACK_IRQ is set to
*zero* the event channel delivery is disabled completely. (Which is
what that bizarre guest behaviour is working round in the first place.)

Cc: qemu-stable@nongnu.org
Fixes: 91cce75617 ("hw/xen: Add xen_evtchn device for event channel emulation")
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Paul Durrant <paul@xen.org>
(cherry picked from commit 18e83f28bf39ffd2784aeb2e4e229096a86d349b)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
This commit is contained in:
David Woodhouse 2023-10-12 00:06:26 +01:00 committed by Michael Tokarev
parent 91d789a891
commit 5450203719
3 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
hw/i386/kvm/xen_evtchn.c
View file

@ -490,6 +490,12 @@ int xen_evtchn_set_callback_param(uint64_t param)
break; break;
} }
/* If the guest has set a per-vCPU callback vector, prefer that. */
if (gsi && kvm_xen_has_vcpu_callback_vector()) {
in_kernel = kvm_xen_has_cap(EVTCHN_SEND);
gsi = 0;
}
if (!ret) { if (!ret) {
/* If vector delivery was turned *off* then tell the kernel */ /* If vector delivery was turned *off* then tell the kernel */
if ((s->callback_param >> CALLBACK_VIA_TYPE_SHIFT) == if ((s->callback_param >> CALLBACK_VIA_TYPE_SHIFT) ==

1
include/sysemu/kvm_xen.h
View file

@ -22,6 +22,7 @@
int kvm_xen_soft_reset(void); int kvm_xen_soft_reset(void);
uint32_t kvm_xen_get_caps(void); uint32_t kvm_xen_get_caps(void);
void *kvm_xen_get_vcpu_info_hva(uint32_t vcpu_id); void *kvm_xen_get_vcpu_info_hva(uint32_t vcpu_id);
bool kvm_xen_has_vcpu_callback_vector(void);
void kvm_xen_inject_vcpu_callback_vector(uint32_t vcpu_id, int type); void kvm_xen_inject_vcpu_callback_vector(uint32_t vcpu_id, int type);
void kvm_xen_set_callback_asserted(void); void kvm_xen_set_callback_asserted(void);
int kvm_xen_set_vcpu_virq(uint32_t vcpu_id, uint16_t virq, uint16_t port); int kvm_xen_set_vcpu_virq(uint32_t vcpu_id, uint16_t virq, uint16_t port);

7
target/i386/kvm/xen-emu.c
View file

@ -424,6 +424,13 @@ void kvm_xen_set_callback_asserted(void)
} }
} }
bool kvm_xen_has_vcpu_callback_vector(void)
{
CPUState *cs = qemu_get_cpu(0);
return cs && !!X86_CPU(cs)->env.xen_vcpu_callback_vector;
}
void kvm_xen_inject_vcpu_callback_vector(uint32_t vcpu_id, int type) void kvm_xen_inject_vcpu_callback_vector(uint32_t vcpu_id, int type)
{ {
CPUState *cs = qemu_get_cpu(vcpu_id); CPUState *cs = qemu_get_cpu(vcpu_id);