ehmry/genode
ehmry
/
genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

base-nova: fix core virtual memory region leak 

Revert the core-local mapping created in 'Ram_session_component::_clear_ds()'
and free the virtual memory region allocated for this mapping when a
RAM dataspace gets freed.

Fixes #416.
This commit is contained in:
Christian Prochaska 2012-10-17 15:50:05 +02:00 committed by Norman Feske
parent 7ee4b75156
commit 6c25ced5f2
3 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
base-nova/src/core/core_rm_session.cc
View File

@ -36,9 +36,6 @@ Core_rm_session::attach(Dataspace_capability ds_cap, size_t size,
if (!ds)
throw Invalid_dataspace();
if (size == 0)
size = ds->size();
if (use_local_addr) {
PERR("Parameter 'use_local_addr' not supported within core");
return 0UL;

10
base-nova/src/core/include/core_rm_session.h
View File

@ -37,7 +37,15 @@ namespace Genode {
Local_addr local_addr = 0,
bool executable = false);
void detach(Local_addr) { }
void detach(Local_addr)
{
/*
* The core-local mapping gets established in
* 'Ram_session_component::_clear_ds()' and reverted in
* 'Ram_session_component::_revoke_ram_ds(), so there's
* nothing to do here.
*/
}
Pager_capability add_client(Thread_capability thread) {
return Pager_capability(); }

15
base-nova/src/core/ram_session_support.cc
View File

@ -29,7 +29,20 @@ enum { verbose_ram_ds = false };
using namespace Genode;
void Ram_session_component::_export_ram_ds(Dataspace_component *ds) { }
void Ram_session_component::_revoke_ram_ds(Dataspace_component *ds) { }
void Ram_session_component::_revoke_ram_ds(Dataspace_component *ds)
{
size_t page_rounded_size = (ds->size() + get_page_size() - 1) & get_page_mask();
unmap_local((Nova::Utcb *)Thread_base::myself()->utcb(),
ds->core_local_addr(),
page_rounded_size >> get_page_size_log2());
platform()->region_alloc()->free((void*)ds->core_local_addr(),
page_rounded_size);
ds->assign_core_local_addr(0);
}
void Ram_session_component::_clear_ds(Dataspace_component *ds)
{