ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-01-29 15:44:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

vbox5: fpu support via new vm_session

Browse Source 
Issue #3111
This commit is contained in:
Alexander Boettcher 2019-05-21 09:25:17 +02:00 committed by Christian Helmuth
parent ab6315d6b4
commit b3a9ad2215
3 changed files with 46 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
repos/ports/run/vbox5_vm_win10_64.run Normal file
View File

@ -0,0 +1,28 @@
#
# Windows 10 in VirtualBox 5
#
assert_spec nova
assert_spec 64bit
set flavor "win10"
set vm_ram "1280M"
set use_vbox5 1
set use_rumpfs 1
# Write overlay only into ram
set use_ram_fs 1
# However read initial overlay from disk
set use_overlay_from_disk 1
set use_usb 1
set use_ps2 [have_spec ps2]
set use_vms 1
set use_cpu_load 0
# use generic vbox5 VMM version
set use_vbox5_nova 0
source ${genode_dir}/repos/ports/run/vbox_win.inc

47
repos/ports/src/virtualbox5/vcpu.h
View File

@ -112,8 +112,6 @@ class Vcpu_handler : public Genode::List<Vcpu_handler>::Element,
private:
X86FXSTATE _guest_fpu_state __attribute__((aligned(0x10)));
bool _irq_win = false;
unsigned const _cpu_id;
@ -123,16 +121,6 @@ class Vcpu_handler : public Genode::List<Vcpu_handler>::Element,
unsigned int _last_inj_info = 0;
unsigned int _last_inj_error = 0;
void fpu_save(char * data) {
Assert(!(reinterpret_cast<Genode::addr_t>(data) & 0xF));
asm volatile ("fxsave %0" : "=m" (*data));
}
void fpu_load(char * data) {
Assert(!(reinterpret_cast<Genode::addr_t>(data) & 0xF));
asm volatile ("fxrstor %0" : : "m" (*data));
}
enum {
REQ_IRQWIN_EXIT = 0x1000U,
IRQ_INJ_VALID_MASK = 0x80000000UL,
@ -149,15 +137,6 @@ class Vcpu_handler : public Genode::List<Vcpu_handler>::Element,
INTERRUPT_STATE_NONE = 0U,
};
/*
* 'longjmp()' restores some FPU registers saved by 'setjmp()',
* so we need to save the guest FPU state before calling 'longjmp()'
*/
__attribute__((noreturn)) void _fpu_save_and_longjmp()
{
fpu_save(reinterpret_cast<char *>(&_guest_fpu_state));
}
protected:
int map_memory(Genode::Vm_connection &vm_session,
@ -181,15 +160,29 @@ class Vcpu_handler : public Genode::List<Vcpu_handler>::Element,
Genode::uint64_t * pdpte_map(VM *pVM, RTGCPHYS cr3);
void switch_to_hw()
void switch_to_hw(PCPUMCTX pCtx)
{
again:
/* write FPU state */
_state->fpu.value([&] (uint8_t *fpu, size_t const size) {
if (size < sizeof(X86FXSTATE))
Genode::error("fpu state too small");
Genode::memcpy(fpu, pCtx->pXStateR3, sizeof(X86FXSTATE));
});
_ep_emt.resume();
/* wait for next exit */
_lock.lock();
/* write FPU state of vCPU to pCtx */
_state->fpu.value([&] (uint8_t *fpu, size_t const size) {
if (size < sizeof(X86FXSTATE))
Genode::error("fpu state too small");
Genode::memcpy(pCtx->pXStateR3, fpu, sizeof(X86FXSTATE));
});
if (_vm_state == IRQ_WIN) {
*_state = Genode::Vm_state {}; /* reset */
_irq_window_pthread();
@ -711,9 +704,6 @@ class Vcpu_handler : public Genode::List<Vcpu_handler>::Element,
{
PCPUMCTX pCtx = CPUMQueryGuestCtxPtr(_vcpu);
/* write FPU state from pCtx to FPU registers */
// fpu_load(reinterpret_cast<char *>(pCtx->pXStateR3));
Assert(_vm_state == IRQ_WIN || _vm_state == PAUSED || _vm_state == NPT_EPT);
_vm_state = RUNNING;
@ -829,7 +819,7 @@ class Vcpu_handler : public Genode::List<Vcpu_handler>::Element,
Genode::error("loading vCPU state failed");
return VERR_INTERNAL_ERROR;
}
/* check whether to request interrupt window for injection */
_irq_win = check_to_request_irq_window(pVCpu);
@ -843,13 +833,10 @@ class Vcpu_handler : public Genode::List<Vcpu_handler>::Element,
VMCPU_SET_STATE(pVCpu, VMCPUSTATE_STARTED_EXEC);
/* switch to hardware accelerated mode */
switch_to_hw();
switch_to_hw(pCtx);
Assert(_state->actv_state.value() == ACTIVITY_STATE_ACTIVE);
/* write FPU state of vCPU (in current FPU registers) to pCtx */
Genode::memcpy(pCtx->pXStateR3, &_guest_fpu_state, sizeof(X86FXSTATE));
/* see hmR0VmxExitToRing3 - sync recompiler state */
CPUMSetChangedFlags(pVCpu, CPUM_CHANGED_SYSENTER_MSR |
CPUM_CHANGED_LDTR | CPUM_CHANGED_GDTR |

1
tool/autopilot.list
View File

@ -69,6 +69,7 @@ vbox5_vm_ubuntu_16_04_32
vbox5_vm_ubuntu_16_04_64
vbox5_vm_win7_32
vbox5_vm_win7_64
vbox5_vm_win10_64
vbox5_win10_64
vbox5_win7_32
vbox5_win7_64