ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-03-14 08:16:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

base-hw: don't call Hw_vcpu::run() from the constructor

Browse Source 
On x86_64, calling Hw_vcpu::run() will cause a startup exit that is
signaled to the VMM. The VMM will subsequently call with_state().
When Hw_vcpu::run() is called from the Hw_vcpu constructor, this can
lead to a situation where the VMM calls with_state() on a vCPU that
isn't fully constructed yet.

The VMM library API requires that the vCPU starts up in order to emit a
startup exit at construction. Call Hw_vcpu::run() from the
Vm_connection::Vcpu constructor instead of calling run() from the
Hw_vcpu constructor to avoid running a native vCPU that isn't fully
constructed yet.

Fixes #5442
This commit is contained in:
Benjamin Lamowski 2025-02-26 14:26:25 +01:00 committed by Christian Helmuth
parent cd40a5be96
commit 56cb822c86
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
repos/base-hw/src/lib/base/x86_64/vm.cc
View File

@ -45,13 +45,13 @@ struct Hw_vcpu : Rpc_client<Vm_session::Native_vcpu>, Noncopyable
unsigned _id { 0 };
void *_ep_handler { nullptr };
void _run();
Vcpu_state & _local_state() { return *_state.local_addr<Vcpu_state>(); }
Capability<Native_vcpu> _create_vcpu(Vm_connection &,
Vcpu_handler_base &);
public:
void run();
const Hw_vcpu& operator=(const Hw_vcpu &) = delete;
Hw_vcpu(const Hw_vcpu&) = delete;
@ -73,11 +73,10 @@ Hw_vcpu::Hw_vcpu(Env &env, Vm_connection &vm, Vcpu_handler_base &handler)
_kernel_vcpu = call<Rpc_native_vcpu>();
_id = counter++;
_ep_handler = reinterpret_cast<Thread *>(&handler.rpc_ep());
_run();
}
void Hw_vcpu::_run()
void Hw_vcpu::run()
{
Kernel::run_vm(Capability_space::capid(_kernel_vcpu));
}
@ -92,7 +91,7 @@ void Hw_vcpu::with_state(auto const &fn)
Kernel::pause_vm(Capability_space::capid(_kernel_vcpu));
if (fn(_local_state()))
_run();
run();
}
@ -119,4 +118,6 @@ Vm_connection::Vcpu::Vcpu(Vm_connection &vm, Allocator &alloc,
Vcpu_handler_base &handler, Exit_config const &)
:
_native_vcpu(*new (alloc) Hw_vcpu(vm._env, vm, handler))
{ }
{
static_cast<Hw_vcpu &>(_native_vcpu).run();
}