Continuing the revival of Oracle's work at
https://github.com/jpemartins/qemu/commits/xen-shim-rfc to work against
the Xen guest support as it was finally merged into the kernel, and
updated to today's QEMU. When complete, this will allow us to run native
Xen guests on top of Linux/KVM without them noticing that it's not Xen.
Thanks for the useful feedback in response to v1. Hopefully I've taken
it all on board correctly.
The main question I have right now is about the way the target KVM
code calls directly into things like xen_overlay_map_page() which
live in hw/i386/kvm/ — and the way that function uses a singleton
object. That can't be right, but I figured I should just keep typing
and get the actual code working to show what I'm trying to do...
v2:
• Attempt to implement migration support; every Xen enlightenment is
now recorded either from vmstate_x86_cpu or from a new sysdev device
created for that purpose. And — I believe — correctly restored, in
the right order, on vmload.
• The shared_info page is created as a proper overlay instead of abusing
the underlying guest page. This is important because Windows doesn't
even select a GPA which had RAM behind it beforehand. This will be
extended to handle the grant frames too, in the fullness of time.
• Set vCPU attributes from the correct vCPU thread to avoid deadlocks.
• Carefully copy the entire hypercall argument structure from userspace
instead of assuming that it's contiguous in HVA space.
• Distinguish between "handled but intentionally returns -ENOSYS" and
"no idea what that was" in hypercalls, allowing us to emit a
GUEST_ERROR (actually, shouldn't that change to UNIMP?) on the
latter. Experience shows that to we'll end up having to intentionally
return -ENOSYS to a bunch of weird crap that ancient guests still
attempt to use, including XenServer local hacks that nobody even
remembers what they were (hvmop 0x101, anyone? Some old Windows
PV driver appears to be trying to use it...).
* Drop the '+xen' CPU property and present Xen CPUID instead of KVM
unconditionally when running in Xen mode. Make the Xen CPUID coexist
with Hyper-V CPUID as it should, though.
• Add XEN_EMU and XENFV_MACHINE (the latter to be XEN_EMU||XEN) config
options. Some more work on this, and the incestuous relationships
between the KVM target code and the 'platform' code, is going to be
required but it's probably better to get on with implementing the
real code so we can see those interactions in all their glory,
before losing too much sleep over the details here.
• Drop the GSI-2 hack, and also the patch which made the PCI platform
device have real RAM (which isn't needed now we have overlays, qv).
• Drop the XenState and XenVcpuState from KVMState and CPUArchState
respectively. The Xen-specific fields are natively included in
CPUArchState now though, for migration purposes. And we don't
keep a host pointer to the shared_info or vcpu_info at all any
more. With the kernel doing everything for us, we don't actually
need them.
The guest boots as far as panicking when it can't register the timer
VIRQ because we haven't implemented event channel hypercalls yet.
The xen-platform-pci and pc_piix patches still need a little cleaning
up but I'll rework them when the dust settles on the config options and
how the target/machine components interact rather than bikeshedding them
too much early on. For now, we just need to be able to use the xenfv
machine in order to instantiate the shinfo and evtchn objects.
qemu-system-x86_64 -serial mon:stdio -machine xenfv,xen-version=0x4000a \
-cpu host,+xen-vapic -display none --trace "kvm_xen*" \
-kernel /boot/vmlinuz-5.17.8-200.fc35.x86_64 \
-append "console=ttyS0,115200 earlyprintk=ttyS0,115200"
Ankur Arora (2):
i386/xen: implement HVMOP_set_evtchn_upcall_vector
i386/xen: HVMOP_set_param / HVM_PARAM_CALLBACK_IRQ
David Woodhouse (3):
xen: add CONFIG_XENFV_MACHINE and CONFIG_XEN_EMU options for Xen emulation
i386/xen: Add xen-version machine property and init KVM Xen support
hw/xen: Add xen_overlay device for emulating shared xenheap pages
Joao Martins (17):
include: import xen public headers
i386/kvm: handle Xen HVM cpuid leaves
xen-platform-pci: allow its creation with XEN_EMULATE mode
hw/xen_backend: refactor xen_be_init()
pc_piix: handle XEN_EMULATE backend init
xen_platform: exclude vfio-pci from the PCI platform unplug
pc_piix: allow xenfv machine with XEN_EMULATE
i386/xen: handle guest hypercalls
i386/xen: implement HYPERCALL_xen_version
i386/xen: implement HYPERVISOR_memory_op
i386/xen: implement HYPERVISOR_hvm_op
i386/xen: implement HYPERVISOR_vcpu_op
i386/xen: handle VCPUOP_register_vcpu_info
i386/xen: handle VCPUOP_register_vcpu_time_info
i386/xen: handle VCPUOP_register_runstate_memory_area
i386/xen: implement HYPERVISOR_event_channel_op
i386/xen: implement HYPERVISOR_sched_op
accel/Kconfig | 1 +
hw/Kconfig | 1 +
hw/i386/kvm/meson.build | 4 +
hw/i386/kvm/xen_evtchn.c | 117 +++
hw/i386/kvm/xen_evtchn.h | 13 +
hw/i386/kvm/xen_overlay.c | 198 ++++
hw/i386/kvm/xen_overlay.h | 14 +
hw/i386/pc.c | 32 +
hw/i386/pc_piix.c | 29 +-
hw/i386/xen/xen_platform.c | 29 +-
hw/xen/Kconfig | 3 +
hw/xen/xen-legacy-backend.c | 62 +-
include/hw/i386/pc.h | 3 +
include/hw/xen/xen-legacy-backend.h | 5 +
include/standard-headers/xen/arch-x86/cpuid.h | 118 +++
include/standard-headers/xen/arch-x86/xen-x86_32.h | 194 ++++
include/standard-headers/xen/arch-x86/xen-x86_64.h | 241 +++++
include/standard-headers/xen/arch-x86/xen.h | 398 ++++++++
include/standard-headers/xen/event_channel.h | 388 ++++++++
include/standard-headers/xen/features.h | 143 +++
include/standard-headers/xen/grant_table.h | 686 +++++++++++++
include/standard-headers/xen/hvm/hvm_op.h | 395 ++++++++
include/standard-headers/xen/hvm/params.h | 318 ++++++
include/standard-headers/xen/memory.h | 754 ++++++++++++++
include/standard-headers/xen/physdev.h | 383 +++++++
include/standard-headers/xen/sched.h | 202 ++++
include/standard-headers/xen/trace.h | 341 +++++++
include/standard-headers/xen/vcpu.h | 248 +++++
include/standard-headers/xen/version.h | 113 +++
include/standard-headers/xen/xen-compat.h | 46 +
include/standard-headers/xen/xen.h | 1049 ++++++++++++++++++++
meson.build | 1 +
target/Kconfig | 4 +
target/i386/cpu.c | 1 +
target/i386/cpu.h | 7 +
target/i386/kvm/kvm.c | 147 ++-
target/i386/machine.c | 27 +
target/i386/meson.build | 1 +
target/i386/trace-events | 6 +
target/i386/xen.c | 594 +++++++++++
target/i386/xen.h | 30 +
41 files changed, 7312 insertions(+), 34 deletions(-)
