ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2024-12-29 18:18:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

libc: defer clone ack after FD initialization

Browse Source 
Issue #3478
Issue #2303
This commit is contained in:
Norman Feske 2019-11-03 11:53:13 +01:00 committed by Christian Helmuth
parent fab2fc874f
commit d4e0d2f578
2 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
repos/libports/src/lib/libc/internal/kernel.h
View File

@ -211,6 +211,8 @@ struct Libc::Kernel final : Vfs::Io_response_handler,
Pthread_pool _pthreads { _timer_accessor }; Pthread_pool _pthreads { _timer_accessor };
Constructible<Clone_connection> _clone_connection { };
struct Resumer struct Resumer
{ {
GENODE_RPC(Rpc_resume, void, resume); GENODE_RPC(Rpc_resume, void, resume);

28
repos/libports/src/lib/libc/kernel.cc
View File

@ -109,6 +109,9 @@ void Libc::Kernel::_init_file_descriptors()
return; return;
File_descriptor *fd = _vfs.open(path.string(), flags, libc_fd); File_descriptor *fd = _vfs.open(path.string(), flags, libc_fd);
if (!fd)
return;
if (fd->libc_fd != libc_fd) { if (fd->libc_fd != libc_fd) {
error("could not allocate fd ",libc_fd," for ",path,", " error("could not allocate fd ",libc_fd," for ",path,", "
"got fd ",fd->libc_fd); "got fd ",fd->libc_fd);
@ -251,21 +254,21 @@ void Libc::Kernel::_clone_state_from_parent()
_env.ram(), _env.rm(), _env.ram(), _env.rm(),
range.at, range.size); }); range.at, range.size); });
Clone_connection clone_connection(_env); _clone_connection.construct(_env);
/* fetch heap content */ /* fetch heap content */
_cloned_heap_ranges.for_each([&] (Cloned_malloc_heap_range &heap_range) { _cloned_heap_ranges.for_each([&] (Cloned_malloc_heap_range &heap_range) {
heap_range.import_content(clone_connection); }); heap_range.import_content(*_clone_connection); });
/* fetch user contex of the parent's application */ /* fetch user contex of the parent's application */
clone_connection.memory_content(&_user_context, sizeof(_user_context)); _clone_connection->memory_content(&_user_context, sizeof(_user_context));
_valid_user_context = true; _valid_user_context = true;
_libc_env.libc_config().for_each_sub_node([&] (Xml_node node) { _libc_env.libc_config().for_each_sub_node([&] (Xml_node node) {
auto copy_from_parent = [&] (Range range) auto copy_from_parent = [&] (Range range)
{ {
clone_connection.memory_content(range.at, range.size); _clone_connection->memory_content(range.at, range.size);
}; };
/* clone application stack */ /* clone application stack */
@ -292,8 +295,8 @@ void Libc::Kernel::_clone_state_from_parent()
}); });
/* import application-heap state from parent */ /* import application-heap state from parent */
clone_connection.object_content(_malloc_heap); _clone_connection->object_content(_malloc_heap);
init_malloc_cloned(clone_connection); init_malloc_cloned(*_clone_connection);
} }
@ -384,4 +387,17 @@ Libc::Kernel::Kernel(Genode::Env &env, Genode::Allocator &heap)
_init_file_descriptors(); _init_file_descriptors();
_kernel_ptr = this; _kernel_ptr = this;
/*
* Acknowledge the completion of 'fork' to the parent
*
* This must be done after '_init_file_descriptors' to ensure that pipe FDs
* of the parent are opened at the child before the parent continues.
* Otherwise, the parent would potentially proceed with closing the pipe
* FDs before the child has a chance to open them. In this situation, the
* pipe reference counter may reach an intermediate value of zero,
* triggering the destruction of the pipe.
*/
if (_cloned)
_clone_connection.destruct();
} }