From: Vincent Palatin <vpalatin@chromium.org>
To: qemu-devel <qemu-devel@nongnu.org>
Cc: Yu Ning <yu.ning@linux.intel.com>, Stefan Weil <sw@weilnetz.de>,
Paolo Bonzini <pbonzini@redhat.com>,
"Michael S . Tsirkin" <mst@redhat.com>,
Eduardo Habkost <ehabkost@redhat.com>,
Marcelo Tosatti <mtosatti@redhat.com>,
Vincent Palatin <vpalatin@chromium.org>
Subject: [Qemu-devel] [PATCH v5 0/4] Add HAX support
Date: Mon, 19 Dec 2016 17:24:41 +0100 [thread overview]
Message-ID: <cover.1482164622.git.vpalatin@chromium.org> (raw)
I took a stab at trying to rebase/upstream the support for Intel HAXM.
(Hardware Accelerated Execution Manager).
Intel HAX is kernel-based hardware acceleration module for Windows and MacOSX.
I have based my work on the last version of the source code I found:
the emu-2.2-release branch in the external/qemu-android repository as used by
the Android emulator.
In patch 2/4, I have forward-ported the core HAX code from there.
It has been modified to build and run along with the current code base.
It has been simplifying by removing non-UG hardware support / Darwin support /
Android-specific leftovers.
Intel nicely fixed the 2 remaining issues on the kernel side:
- the spurious request to emulate MMIO access in un-paged mode is no longer
happening (as seen in iPXE).
- the kernel API now provides a way to remove a memory mapping, so we can
do a proper MemoryListener implementation.
They will publish soon a new version 6.1.0 of the HAX kernel module including
the fixes once their QA cycle is completed.
Thanks Yu Ning for making this happen.
In patch 3/4, I have put the plumbing into the QEMU code base, I did some clean
up there and it is reasonably intrusive: i.e.
Makefile.target | 1 +
configure | 18 ++++++++++
cpus.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++-
exec.c | 16 +++++++++
hw/intc/apic_common.c | 3 +-
include/qom/cpu.h | 5 +++
include/sysemu/hw_accel.h | 9 +++++
qemu-options.hx | 11 ++++++
target-i386/Makefile.objs | 4 +++
vl.c | 15 ++++++--
10 files changed, 164 insertions(+), 5 deletions(-)
The patch 1/4 just extracts from KVM specific header the cpu_synchronize_
functions that HAX is also using.
The patch 4/4 is the Darwin support. This part is only lightly tested for now,
so it can be considered as 'experimental'.
I have tested the end result on a Windows 10 Pro machine (with UG support)
with the Intel HAXM module dev version and a large ChromiumOS x86_64 image to
exercise various code paths. It looks stable.
I also did a quick regression testing of the integration by running a Linux
build with KVM enabled.
Changes from v4 to v5:
- update HAX fastmmio API with the new MMIO to MMIO transfer.
Changes from v3 to v4:
- add RAM unmapping in the MemoryListener thanks to new API in HAX module 6.1.0
and re-wrote the memory mappings management to deal with this.
- marked no longer used MMIO emulation as unsupported.
- clean-up a few left-overs from removed code.
- re-add an experimental version of the Darwin support.
Changes from v2 to v3:
- fix saving/restoring FPU registers as suggested by Paolo.
- fix Windows build on all targets as contributed by Stefan Weil.
- clean-up IO / MMIO emulation.
- more clean-up of emulation leftovers.
Changes from v1 to v2:
- fix all style issues in the original code to get it through checkpatch.pl.
- remove Darwin support, it was barely tested and not fully functional.
- remove the support for CPU without UG mode.
- fix most review comments
Vincent Palatin (4):
kvm: move cpu synchronization code
target-i386: Add Intel HAX files
Plumb the HAXM-based hardware acceleration support
hax: add Darwin support
Makefile.target | 1 +
configure | 18 +
cpus.c | 93 +++-
exec.c | 16 +
gdbstub.c | 1 +
hax-stub.c | 39 ++
hw/i386/kvm/apic.c | 1 +
hw/i386/kvmvapic.c | 1 +
hw/intc/apic_common.c | 3 +-
hw/misc/vmport.c | 2 +-
hw/ppc/pnv_xscom.c | 2 +-
hw/ppc/ppce500_spin.c | 4 +-
hw/ppc/spapr.c | 2 +-
hw/ppc/spapr_hcall.c | 2 +-
hw/s390x/s390-pci-inst.c | 1 +
include/qom/cpu.h | 5 +
include/sysemu/hax.h | 56 +++
include/sysemu/hw_accel.h | 48 ++
include/sysemu/kvm.h | 23 -
monitor.c | 2 +-
qemu-options.hx | 11 +
qom/cpu.c | 2 +-
target-arm/cpu.c | 2 +-
target-i386/Makefile.objs | 7 +
target-i386/hax-all.c | 1155 +++++++++++++++++++++++++++++++++++++++++++
target-i386/hax-darwin.c | 316 ++++++++++++
target-i386/hax-darwin.h | 63 +++
target-i386/hax-i386.h | 94 ++++
target-i386/hax-interface.h | 361 ++++++++++++++
target-i386/hax-mem.c | 271 ++++++++++
target-i386/hax-windows.c | 479 ++++++++++++++++++
target-i386/hax-windows.h | 89 ++++
target-i386/helper.c | 1 +
target-i386/kvm.c | 1 +
target-ppc/mmu-hash64.c | 2 +-
target-ppc/translate_init.c | 2 +-
target-s390x/gdbstub.c | 1 +
vl.c | 15 +-
38 files changed, 3153 insertions(+), 39 deletions(-)
create mode 100644 hax-stub.c
create mode 100644 include/sysemu/hax.h
create mode 100644 include/sysemu/hw_accel.h
create mode 100644 target-i386/hax-all.c
create mode 100644 target-i386/hax-darwin.c
create mode 100644 target-i386/hax-darwin.h
create mode 100644 target-i386/hax-i386.h
create mode 100644 target-i386/hax-interface.h
create mode 100644 target-i386/hax-mem.c
create mode 100644 target-i386/hax-windows.c
create mode 100644 target-i386/hax-windows.h
--
2.8.0.rc3.226.g39d4020
next reply other threads:[~2016-12-19 16:24 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-19 16:24 Vincent Palatin [this message]
2016-12-19 16:24 ` [Qemu-devel] [PATCH v5 1/4] kvm: move cpu synchronization code Vincent Palatin
2016-12-19 16:24 ` [Qemu-devel] [PATCH v5 2/4] target-i386: Add Intel HAX files Vincent Palatin
2016-12-19 16:24 ` [Qemu-devel] [PATCH v5 3/4] Plumb the HAXM-based hardware acceleration support Vincent Palatin
2016-12-22 9:57 ` Paolo Bonzini
2017-01-05 13:50 ` Vincent Palatin
2017-01-05 14:01 ` Paolo Bonzini
2017-01-05 21:38 ` Paolo Bonzini
2017-01-06 14:08 ` Vincent Palatin
2017-01-09 13:03 ` Paolo Bonzini
2017-01-09 16:54 ` Vincent Palatin
2017-01-09 6:17 ` Yu Ning
2016-12-19 16:24 ` [Qemu-devel] [PATCH v5 4/4] hax: add Darwin support Vincent Palatin
2016-12-22 9:49 ` Paolo Bonzini
2017-01-05 13:50 ` Vincent Palatin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=cover.1482164622.git.vpalatin@chromium.org \
--to=vpalatin@chromium.org \
--cc=ehabkost@redhat.com \
--cc=mst@redhat.com \
--cc=mtosatti@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=sw@weilnetz.de \
--cc=yu.ning@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).