ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-06-24 09:46:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

vm_session: extensions

Browse Source 
- support to create multiple vCPUs
- support to implement Vm_session methods client side within base library
- adjust muen specific virtualbox4 version to compile/link

Issue #3111
This commit is contained in:
Alexander Boettcher
2018-09-26 15:53:18 +02:00
committed by Norman Feske
parent c5786b212b
commit 0c24e1efdc
28 changed files with 403 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
repos/base-hw/include/spec/arndale/vm_state.h
View File

@ -1,85 +0,0 @@
/*
* \brief CPU, PIC, and timer context of a virtual machine
* \author Stefan Kalkowski
* \date 2015-02-10
*/
/*
* Copyright (C) 2015-2017 Genode Labs GmbH
*
* This file is part of the Genode OS framework, which is distributed
* under the terms of the GNU Affero General Public License version 3.
*/
#ifndef _INCLUDE__SPEC__ARNDALE__VM_STATE_H_
#define _INCLUDE__SPEC__ARNDALE__VM_STATE_H_
/* Genode includes */
#include <cpu/cpu_state.h>
namespace Genode
{
/**
* CPU context of a virtual machine
*/
struct Vm_state;
}
struct Genode::Vm_state : Genode::Cpu_state_modes
{
Genode::uint64_t vttbr;
Genode::uint32_t sctrl;
Genode::uint32_t hsr;
Genode::uint32_t hpfar;
Genode::uint32_t hdfar;
Genode::uint32_t hifar;
Genode::uint32_t ttbcr;
Genode::uint32_t ttbr0;
Genode::uint32_t ttbr1;
Genode::uint32_t prrr;
Genode::uint32_t nmrr;
Genode::uint32_t dacr;
Genode::uint32_t dfsr;
Genode::uint32_t ifsr;
Genode::uint32_t adfsr;
Genode::uint32_t aifsr;
Genode::uint32_t dfar;
Genode::uint32_t ifar;
Genode::uint32_t cidr;
Genode::uint32_t tls1;
Genode::uint32_t tls2;
Genode::uint32_t tls3;
Genode::uint32_t cpacr;
/**
* Fpu registers
*/
Genode::uint32_t fpscr;
Genode::uint64_t d0_d31[32];
/**
* Timer related registers
*/
Genode::uint32_t timer_ctrl;
Genode::uint32_t timer_val;
bool timer_irq;
/**
* PIC related registers
*/
enum { NR_IRQ = 4 };
Genode::uint32_t gic_hcr;
Genode::uint32_t gic_vmcr;
Genode::uint32_t gic_misr;
Genode::uint32_t gic_apr;
Genode::uint32_t gic_eisr;
Genode::uint32_t gic_elrsr0;
Genode::uint32_t gic_lr[4];
unsigned gic_irq;
};
#endif /* _INCLUDE__SPEC__ARNDALE__VM_STATE_H_ */

0
repos/base-hw/include/spec/imx53/vm_state.h → repos/base-hw/include/spec/imx53/cpu/vm_state.h
View File

2
repos/base-hw/src/core/kernel/vm.h
View File

@ -14,7 +14,7 @@
#ifndef _CORE__KERNEL__VM_H_
#define _CORE__KERNEL__VM_H_
#include <vm_state.h>
#include <cpu/vm_state.h>
/* core includes */
#include <kernel/cpu_context.h>

39
repos/base-hw/src/core/spec/arm_v7/trustzone/vm_session_component.cc
View File

@ -18,10 +18,9 @@
using namespace Genode;
void Vm_session_component::exception_handler(Signal_context_capability handler)
void Vm_session_component::_exception_handler(Signal_context_capability handler, Vcpu_id)
{
if (!create((void*)_ds.core_local_addr(), Capability_space::capid(handler),
nullptr))
if (!create(_ds_addr, Capability_space::capid(handler), nullptr))
{
warning("Cannot instantiate vm kernel object twice,"
"or invalid signal context?");
@ -29,21 +28,35 @@ void Vm_session_component::exception_handler(Signal_context_capability handler)
}
Vm_session_component::Vm_session_component(Rpc_entrypoint *ds_ep,
size_t ram_quota)
: _ds_ep(ds_ep), _ds(_ds_size(), _alloc_ds(ram_quota), UNCACHED, true, 0),
_ds_cap(static_cap_cast<Dataspace>(_ds_ep->manage(&_ds)))
Vm_session_component::Vm_session_component(Rpc_entrypoint &ds_ep,
Resources resources,
Label const &,
Diag,
Ram_allocator &ram_alloc,
Region_map &region_map)
:
Ram_quota_guard(resources.ram_quota),
Cap_quota_guard(resources.cap_quota),
_ds_ep(&ds_ep),
_constrained_md_ram_alloc(ram_alloc, _ram_quota_guard(), _cap_quota_guard()),
_region_map(region_map)
{
_ds.assign_core_local_addr(core_env().rm_session()->attach(_ds_cap));
_ds_cap = _constrained_md_ram_alloc.alloc(_ds_size(), Genode::Cache_attribute::UNCACHED);
try {
_ds_addr = region_map.attach(_ds_cap);
} catch (...) {
_constrained_md_ram_alloc.free(_ds_cap);
throw;
}
}
Vm_session_component::~Vm_session_component()
{
/* dissolve VM dataspace from service entry point */
_ds_ep->dissolve(&_ds);
/* free region in allocator */
core_env().rm_session()->detach(_ds.core_local_addr());
platform().ram_alloc().free((void*)_ds.phys_addr());
if (_ds_cap.valid()) {
_region_map.detach(_ds_addr);
_constrained_md_ram_alloc.free(_ds_cap);
}
}

48
repos/base-hw/src/core/spec/arm_v7/trustzone/vm_session_component.h
View File

@ -16,12 +16,11 @@
/* Genode includes */
#include <base/allocator.h>
#include <base/rpc_server.h>
#include <base/session_object.h>
#include <vm_session/vm_session.h>
#include <dataspace/capability.h>
/* Core includes */
#include <dataspace_component.h>
#include <object.h>
#include <kernel/vm.h>
@ -29,8 +28,12 @@ namespace Genode {
class Vm_session_component;
}
class Genode::Vm_session_component : public Genode::Rpc_object<Genode::Vm_session>,
private Kernel_object<Kernel::Vm>
class Genode::Vm_session_component
:
private Ram_quota_guard,
private Cap_quota_guard,
public Rpc_object<Vm_session, Vm_session_component>,
private Kernel_object<Kernel::Vm>
{
private:
@ -40,35 +43,41 @@ class Genode::Vm_session_component : public Genode::Rpc_object<Genode::Vm_sessi
Vm_session_component(Vm_session_component const &);
Vm_session_component &operator = (Vm_session_component const &);
Rpc_entrypoint *_ds_ep;
Range_allocator *_ram_alloc = nullptr;
Dataspace_component _ds;
Dataspace_capability _ds_cap;
addr_t _ds_addr = 0;
Rpc_entrypoint *_ds_ep;
Constrained_ram_allocator _constrained_md_ram_alloc;
Region_map &_region_map;
Ram_dataspace_capability _ds_cap { };
Region_map::Local_addr _ds_addr { 0 };
static size_t _ds_size() {
return align_addr(sizeof(Cpu_state_modes),
get_page_size_log2()); }
addr_t _alloc_ds(size_t &ram_quota);
addr_t _alloc_ds();
protected:
Ram_quota_guard &_ram_quota_guard() { return *this; }
Cap_quota_guard &_cap_quota_guard() { return *this; }
public:
Vm_session_component(Rpc_entrypoint *ds_ep,
size_t ram_quota);
using Ram_quota_guard::upgrade;
using Cap_quota_guard::upgrade;
using Rpc_object<Vm_session, Vm_session_component>::cap;
Vm_session_component(Rpc_entrypoint &, Resources, Label const &,
Diag, Ram_allocator &ram, Region_map &);
~Vm_session_component();
using Rpc_object<Vm_session>::cap;
/**************************
** Vm session interface **
**************************/
Dataspace_capability cpu_state(void) { return _ds_cap; }
void exception_handler(Signal_context_capability handler);
void run(void);
void pause(void);
Dataspace_capability _cpu_state(Vcpu_id) { return _ds_cap; }
void _exception_handler(Signal_context_capability handler, Vcpu_id);
void _run(Vcpu_id);
void _pause(Vcpu_id);
void attach(Dataspace_capability, addr_t /* vm_addr */) {
warning("Not implemented for TrustZone case"); }
@ -78,6 +87,7 @@ class Genode::Vm_session_component : public Genode::Rpc_object<Genode::Vm_sessi
void detach(addr_t /* vm_addr */, size_t /* size */) {
warning("Not implemented for TrustZone case"); }
void _create_vcpu(Thread_capability) {}
};
#endif /* _CORE__SPEC__ARM_V7__TRUSTZONE__VM_SESSION_COMPONENT_H_ */

44
repos/base-hw/src/core/spec/arm_v7/virtualization/vm_session_component.cc
View File

@ -26,9 +26,9 @@ static Core_mem_allocator & cma() {
return static_cast<Core_mem_allocator&>(platform().core_mem_alloc()); }
void Vm_session_component::exception_handler(Signal_context_capability handler)
void Vm_session_component::_exception_handler(Signal_context_capability handler, Vcpu_id)
{
if (!create((void*)_ds.core_local_addr(), Capability_space::capid(handler),
if (!create(_ds_addr, Capability_space::capid(handler),
cma().phys_addr(&_table)))
Genode::warning("Cannot instantiate vm kernel object, invalid signal context?");
}
@ -93,26 +93,40 @@ void * Vm_session_component::_alloc_table()
}
Vm_session_component::Vm_session_component(Rpc_entrypoint *ds_ep,
size_t ram_quota)
: _ds_ep(ds_ep), _ds(_ds_size(), _alloc_ds(ram_quota), UNCACHED, true, 0),
_ds_cap(static_cap_cast<Dataspace>(_ds_ep->manage(&_ds))),
_table(*construct_at<Table>(_alloc_table())),
_table_array(*(new (cma()) Array([this] (void * virt) {
return (addr_t)cma().phys_addr(virt);})))
Vm_session_component::Vm_session_component(Rpc_entrypoint &ds_ep,
Resources resources,
Label const &,
Diag,
Ram_allocator &ram_alloc,
Region_map &region_map)
:
Ram_quota_guard(resources.ram_quota),
Cap_quota_guard(resources.cap_quota),
_ds_ep(&ds_ep),
_constrained_md_ram_alloc(ram_alloc, _ram_quota_guard(), _cap_quota_guard()),
_region_map(region_map),
_table(*construct_at<Table>(_alloc_table())),
_table_array(*(new (cma()) Array([this] (void * virt) {
return (addr_t)cma().phys_addr(virt);})))
{
_ds.assign_core_local_addr(core_env().rm_session()->attach(_ds_cap));
_ds_cap = _constrained_md_ram_alloc.alloc(_ds_size(), Genode::Cache_attribute::UNCACHED);
try {
_ds_addr = region_map.attach(_ds_cap);
} catch (...) {
_constrained_md_ram_alloc.free(_ds_cap);
throw;
}
}
Vm_session_component::~Vm_session_component()
{
/* dissolve VM dataspace from service entry point */
_ds_ep->dissolve(&_ds);
/* free region in allocator */
core_env().rm_session()->detach(_ds.core_local_addr());
platform().ram_alloc().free((void*)_ds.phys_addr());
if (_ds_cap.valid()) {
_region_map.detach(_ds_addr);
_constrained_md_ram_alloc.free(_ds_cap);
}
/* free guest-to-host page tables */
destroy(platform().core_mem_alloc(), &_table);

51
repos/base-hw/src/core/spec/arm_v7/virtualization/vm_session_component.h
View File

@ -16,13 +16,12 @@
/* Genode includes */
#include <base/allocator.h>
#include <base/rpc_server.h>
#include <base/session_object.h>
#include <vm_session/vm_session.h>
#include <dataspace/capability.h>
#include <hw/spec/arm/lpae.h>
/* Core includes */
#include <dataspace_component.h>
#include <object.h>
#include <translation_table.h>
#include <kernel/vm.h>
@ -31,8 +30,12 @@ namespace Genode {
class Vm_session_component;
}
class Genode::Vm_session_component : public Genode::Rpc_object<Genode::Vm_session>,
private Kernel_object<Kernel::Vm>
class Genode::Vm_session_component
:
private Ram_quota_guard,
private Cap_quota_guard,
public Rpc_object<Vm_session, Vm_session_component>,
private Kernel_object<Kernel::Vm>
{
private:
@ -45,42 +48,50 @@ class Genode::Vm_session_component : public Genode::Rpc_object<Genode::Vm_sessio
using Table = Hw::Level_1_stage_2_translation_table;
using Array = Table::Allocator::Array<Kernel::DEFAULT_TRANSLATION_TABLE_MAX>;
Rpc_entrypoint *_ds_ep;
Range_allocator *_ram_alloc = nullptr;
Dataspace_component _ds;
Dataspace_capability _ds_cap;
addr_t _ds_addr = 0;
Table &_table;
Array &_table_array;
Rpc_entrypoint *_ds_ep;
Constrained_ram_allocator _constrained_md_ram_alloc;
Region_map &_region_map;
Ram_dataspace_capability _ds_cap { };
Region_map::Local_addr _ds_addr { 0 };
Table &_table;
Array &_table_array;
static size_t _ds_size() {
return align_addr(sizeof(Cpu_state_modes),
get_page_size_log2()); }
addr_t _alloc_ds(size_t &ram_quota);
addr_t _alloc_ds();
void * _alloc_table();
void _attach(addr_t phys_addr, addr_t vm_addr, size_t size);
protected:
Ram_quota_guard &_ram_quota_guard() { return *this; }
Cap_quota_guard &_cap_quota_guard() { return *this; }
public:
Vm_session_component(Rpc_entrypoint *ds_ep,
size_t ram_quota);
~Vm_session_component();
using Ram_quota_guard::upgrade;
using Cap_quota_guard::upgrade;
using Rpc_object<Vm_session, Vm_session_component>::cap;
using Rpc_object<Vm_session>::cap;
Vm_session_component(Rpc_entrypoint &, Resources, Label const &,
Diag, Ram_allocator &ram, Region_map &);
~Vm_session_component();
/**************************
** Vm session interface **
**************************/
Dataspace_capability cpu_state(void) { return _ds_cap; }
void exception_handler(Signal_context_capability handler);
void run(void);
void pause(void);
Dataspace_capability _cpu_state(Vcpu_id) { return _ds_cap; }
void _exception_handler(Signal_context_capability, Vcpu_id);
void _run(Vcpu_id);
void _pause(Vcpu_id);
void attach(Dataspace_capability ds_cap, addr_t vm_addr);
void attach_pic(addr_t vm_addr);
void detach(addr_t vm_addr, size_t size);
void _create_vcpu(Thread_capability) {}
};
#endif /* _CORE__SPEC__ARM_V7__VIRTUALIZATION__VM_SESSION_COMPONENT_H_ */

10
repos/base-hw/src/core/spec/arm_v7/vm_session_component.cc
View File

@ -18,26 +18,24 @@
using namespace Genode;
addr_t Vm_session_component::_alloc_ds(size_t &ram_quota)
addr_t Vm_session_component::_alloc_ds()
{
addr_t addr;
if (_ds_size() > ram_quota ||
platform().ram_alloc().alloc_aligned(_ds_size(), (void**)&addr,
if (platform().ram_alloc().alloc_aligned(_ds_size(), (void**)&addr,
get_page_size_log2()).error())
throw Insufficient_ram_quota();
ram_quota -= _ds_size();
return addr;
}
void Vm_session_component::run(void)
void Vm_session_component::_run(Vcpu_id)
{
if (Kernel_object<Kernel::Vm>::_cap.valid())
Kernel::run_vm(kernel_object());
}
void Vm_session_component::pause(void)
void Vm_session_component::_pause(Vcpu_id)
{
if (Kernel_object<Kernel::Vm>::_cap.valid())
Kernel::pause_vm(kernel_object());

4
repos/base-hw/src/core/spec/arndale/platform_services.cc
View File

@ -18,6 +18,7 @@
/* core includes */
#include <platform.h>
#include <platform_services.h>
#include <core_env.h>
#include <core_service.h>
#include <map_local.h>
#include <vm_root.h>
@ -38,6 +39,7 @@ void Genode::platform_add_local_services(Rpc_entrypoint &ep,
Hw::Mm::hypervisor_exception_vector().base, 1,
Hw::PAGE_FLAGS_KERN_TEXT);
static Vm_root vm_root(ep, sh);
static Vm_root vm_root(ep, sh, core_env().ram_allocator(),
core_env().local_rm());
static Core_service<Vm_session_component> vm_service(services, vm_root);
}

4
repos/base-hw/src/core/spec/imx53/trustzone/platform_services.cc
View File

@ -18,6 +18,7 @@
/* Core includes */
#include <platform.h>
#include <platform_services.h>
#include <core_env.h>
#include <core_service.h>
#include <vm_root.h>
#include <map_local.h>
@ -35,6 +36,7 @@ void Genode::platform_add_local_services(Rpc_entrypoint &ep,
Platform::core_phys_addr((addr_t)&monitor_mode_exception_vector);
map_local(phys_base, Hw::Mm::system_exception_vector().base, 1,
Hw::PAGE_FLAGS_KERN_TEXT);
static Vm_root vm_root(ep, sliced_heap);
static Vm_root vm_root(ep, sliced_heap, core_env().ram_allocator(),
core_env().local_rm());
static Core_service<Vm_session_component> vm_service(local_services, vm_root);
}

0
repos/base-hw/src/core/spec/x86_64/muen/vm_state.h → repos/base-hw/src/core/spec/x86_64/muen/cpu/vm_state.h
View File

3
repos/base-hw/src/core/spec/x86_64/muen/platform_services.cc
View File

@ -28,7 +28,8 @@ void Genode::platform_add_local_services(Rpc_entrypoint &ep,
Sliced_heap &sliced_heap,
Registry<Service> &services)
{
static Vm_root vm_root(ep, sliced_heap);
static Vm_root vm_root(ep, sliced_heap, core_env().ram_allocator(),
core_env().local_rm());
static Core_service<Vm_session_component> vm_ls(services, vm_root);
static Io_port_root io_port_root(*core_env().pd_session(),

30
repos/base-hw/src/core/spec/x86_64/muen/vm_session_component.h
View File

@ -30,8 +30,11 @@ namespace Genode {
}
class Genode::Vm_session_component
: public Genode::Rpc_object<Genode::Vm_session>,
private Kernel_object<Kernel::Vm>
:
private Ram_quota_guard,
private Cap_quota_guard,
public Rpc_object<Vm_session, Vm_session_component>,
private Kernel_object<Kernel::Vm>
{
private:
@ -39,32 +42,40 @@ class Genode::Vm_session_component
public:
Vm_session_component(Rpc_entrypoint*, size_t) : _state() { }
Vm_session_component(Rpc_entrypoint &, Resources resources,
Label const &, Diag, Ram_allocator &, Region_map &)
:
Ram_quota_guard(resources.ram_quota),
Cap_quota_guard(resources.cap_quota),
_state()
{ }
~Vm_session_component() { }
using Genode::Rpc_object<Genode::Vm_session>::cap;
using Ram_quota_guard::upgrade;
using Cap_quota_guard::upgrade;
using Genode::Rpc_object<Genode::Vm_session, Vm_session_component>::cap;
/**************************
** Vm session interface **
**************************/
Dataspace_capability cpu_state(void) { return Dataspace_capability(); }
Dataspace_capability _cpu_state(Vcpu_id) { return Dataspace_capability(); }
void exception_handler(Signal_context_capability handler)
void _exception_handler(Signal_context_capability handler, Vcpu_id)
{
if (!create(&_state, Capability_space::capid(handler), nullptr))
warning("Cannot instantiate vm kernel object, "
"invalid signal context?");
}
void run(void)
void _run(Vcpu_id)
{
if (Kernel_object<Kernel::Vm>::_cap.valid())
Kernel::run_vm(kernel_object());
}
void pause(void)
void _pause(Vcpu_id)
{
if (Kernel_object<Kernel::Vm>::_cap.valid())
Kernel::pause_vm(kernel_object());
@ -73,6 +84,7 @@ class Genode::Vm_session_component
void attach(Dataspace_capability, addr_t) {}
void attach_pic(addr_t) {}
void detach(addr_t, size_t) {}
void _create_vcpu(Thread_capability) {}
};
#endif /* _CORE__SPEC__X86_64__MUEN__VM_SESSION_COMPONENT_H_ */