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

base: rework vmm library API

Browse Source 
The new API emphasizes control over the vCPU data by granting access
through the Vcpu::with_state() method, which makes sure that the vCPU is
stopped, invokes the supplied function with a reference to the VM state
and resumes the vCPU if the function returns true.

The old Vcpu::run(), Vcpu::pause() and Vcpu::state() methods are removed
in favor of the new API. Execution of the vCPU is now interrupted by
sending a native Genode Signal to its Vcpu_handler, which will run the
VMM's exit handling method. When this method retrieves the vCPU state by
calling Vcpu::with_state(), the outside interruption is detected and on
x86 a recall exit is injected into the state to signal the vCPU
interruption / pause request to the VMM's vCPU handler.

Ref #4968
This commit is contained in:
Benjamin Lamowski 2023-06-06 15:57:38 +02:00 committed by Christian Helmuth
parent 5c27993884
commit daafe3f4e2
3 changed files with 30 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
repos/base/include/vm_session/connection.h
View File

@ -2,6 +2,7 @@
* \brief Connection to a VM service
* \author Stefan Kalkowski
* \author Christian Helmuth
* \author Benjamin Lamowski
* \date 2012-10-02
*
* The VM connection is the API for VM and vCPU handling and implemented
@ -22,6 +23,7 @@
#include <base/rpc_client.h>
#include <vm_session/vm_session.h>
#include <cpu_session/cpu_session.h>
#include <util/interface.h>
#include <util/retry.h>
#include <util/noncopyable.h>
@ -47,6 +49,12 @@ struct Genode::Vm_connection : Connection<Vm_session>, Rpc_client<Vm_session>
/* for example OMIT_FPU_ON_IRQ */
};
struct Call_with_state : Genode::Interface
{
virtual bool call_with_state(Vcpu_state &) = 0;
};
/**
* Virtual CPU
*
@ -55,13 +63,28 @@ struct Genode::Vm_connection : Connection<Vm_session>, Rpc_client<Vm_session>
*/
struct Vcpu : Genode::Noncopyable
{
void _with_state(Call_with_state &);
Native_vcpu &_native_vcpu;
Vcpu(Vm_connection &, Allocator &, Vcpu_handler_base &, Exit_config const &);
void run();
void pause();
Vcpu_state & state();
template <typename FN>
void with_state(FN const &fn)
{
struct Untyped_fn : Call_with_state
{
FN const &_fn;
Untyped_fn(FN const &fn) : _fn(fn) {}
bool call_with_state(Vcpu_state &state) override
{
return _fn(state);
}
} untyped_fn(fn);
_with_state(untyped_fn);
}
};
friend class Vcpu;

4
repos/base/lib/symbols/ld
View File

@ -92,9 +92,7 @@ _ZN6Genode13Shared_objectC1ERNS_3EnvERNS_9AllocatorEPKcNS0_4BindENS0_4KeepE T
_ZN6Genode13Shared_objectC2ERNS_3EnvERNS_9AllocatorEPKcNS0_4BindENS0_4KeepE T
_ZN6Genode13Shared_objectD1Ev T
_ZN6Genode13Shared_objectD2Ev T
_ZN6Genode13Vm_connection4Vcpu3runEv T
_ZN6Genode13Vm_connection4Vcpu5pauseEv T
_ZN6Genode13Vm_connection4Vcpu5stateEv T
_ZN6Genode13Vm_connection4Vcpu11_with_stateERNS0_15Call_with_stateE T
_ZN6Genode13Vm_connection4VcpuC1ERS0_RNS_9AllocatorERNS_17Vcpu_handler_baseERKNS0_11Exit_configE T
_ZN6Genode13Vm_connection4VcpuC2ERS0_RNS_9AllocatorERNS_17Vcpu_handler_baseERKNS0_11Exit_configE T
_ZN6Genode13Xml_generator4NodeC1ERS0_PKcRKNS1_3_FnE T

18
repos/base/src/lib/base/vm.cc
View File

@ -2,11 +2,12 @@
* \brief Generic VM-connection implementation
* \author Alexander Boettcher
* \author Christian Helmuth
* \author Benjamin Lamowski
* \date 2018-08-27
*/
/*
* Copyright (C) 2018-2021 Genode Labs GmbH
* Copyright (C) 2018-2023 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.
@ -21,22 +22,9 @@ struct Vm_session::Native_vcpu { };
static Vm_session::Native_vcpu dummy;
void Vm_connection::Vcpu::run() { }
void Vm_connection::Vcpu::pause() { }
struct Genode::Vcpu_state { };
Vcpu_state & Vm_connection::Vcpu::state()
{
static char dummy[sizeof(Vcpu_state)];
return *(Vcpu_state *)dummy;
}
void Vm_connection::Vcpu::_with_state(Call_with_state &) {};
Vm_connection::Vcpu::Vcpu(Vm_connection &, Allocator &,
Vcpu_handler_base &, Exit_config const &)