17c79a9e23
Besides adapting the components to the use of base/log.h, the patch cleans up a few base headers, i.e., it removes unused includes from root/component.h, specifically base/heap.h and ram_session/ram_session.h. Hence, components that relied on the implicit inclusion of those headers have to manually include those headers now. While adjusting the log messages, I repeatedly stumbled over the problem that printing char * arguments is ambiguous. It is unclear whether to print the argument as pointer or null-terminated string. To overcome this problem, the patch introduces a new type 'Cstring' that allows the caller to express that the argument should be handled as null-terminated string. As a nice side effect, with this type in place, the optional len argument of the 'String' class could be removed. Instead of supplying a pair of (char const *, size_t), the constructor accepts a 'Cstring'. This, in turn, clears the way let the 'String' constructor use the new output mechanism to assemble a string from multiple arguments (and thereby getting rid of snprintf within Genode in the near future). To enforce the explicit resolution of the char * ambiguity, the 'char *' overload of the 'print' function is marked as deleted. Issue #1987
102 lines
2.7 KiB
C++
102 lines
2.7 KiB
C++
/*
|
|
* \brief Core-local region map
|
|
* \author Norman Feske
|
|
* \date 2009-10-02
|
|
*/
|
|
|
|
/*
|
|
* Copyright (C) 2009-2013 Genode Labs GmbH
|
|
*
|
|
* This file is part of the Genode OS framework, which is distributed
|
|
* under the terms of the GNU General Public License version 2.
|
|
*/
|
|
|
|
/* Genode includes */
|
|
#include <base/log.h>
|
|
|
|
/* core includes */
|
|
#include <core_region_map.h>
|
|
#include <platform.h>
|
|
#include <util.h>
|
|
#include <nova_util.h>
|
|
|
|
/* NOVA includes */
|
|
#include <nova/syscalls.h>
|
|
|
|
using namespace Genode;
|
|
|
|
/**
|
|
* Map dataspace core-locally
|
|
*/
|
|
static inline void * alloc_region(Dataspace_component *ds, const size_t size)
|
|
{
|
|
/*
|
|
* Allocate range in core's virtual address space
|
|
*
|
|
* Start with trying to use natural alignment. If this does not work,
|
|
* successively weaken the alignment constraint until we hit the page size.
|
|
*/
|
|
void *virt_addr = 0;
|
|
size_t align_log2 = log2(ds->size());
|
|
for (; align_log2 >= get_page_size_log2(); align_log2--) {
|
|
if (platform()->region_alloc()->alloc_aligned(size,
|
|
&virt_addr, align_log2).ok())
|
|
break;
|
|
}
|
|
|
|
return virt_addr;
|
|
}
|
|
|
|
Region_map::Local_addr
|
|
Core_region_map::attach(Dataspace_capability ds_cap, size_t size,
|
|
off_t offset, bool use_local_addr,
|
|
Region_map::Local_addr local_addr,
|
|
bool executable)
|
|
{
|
|
auto lambda = [&] (Dataspace_component *ds) -> Local_addr {
|
|
if (!ds)
|
|
throw Invalid_dataspace();
|
|
|
|
if (use_local_addr) {
|
|
error("Parameter 'use_local_addr' not supported within core");
|
|
return nullptr;
|
|
}
|
|
|
|
if (offset) {
|
|
error("Parameter 'offset' not supported within core");
|
|
return nullptr;
|
|
}
|
|
|
|
const size_t page_rounded_size = align_addr(ds->size(), get_page_size_log2());
|
|
|
|
/* allocate the virtual region contiguous for the dataspace */
|
|
void * virt_ptr = alloc_region(ds, page_rounded_size);
|
|
if (!virt_ptr)
|
|
throw Out_of_metadata();
|
|
|
|
/* map it */
|
|
Nova::Utcb * const utcb = reinterpret_cast<Nova::Utcb *>(Thread::myself()->utcb());
|
|
const Nova::Rights rights(true, ds->writable(), executable);
|
|
|
|
if (map_local(utcb, ds->phys_addr(), reinterpret_cast<addr_t>(virt_ptr),
|
|
page_rounded_size >> get_page_size_log2(), rights, true)) {
|
|
platform()->region_alloc()->free(virt_ptr, page_rounded_size);
|
|
throw Out_of_metadata();
|
|
}
|
|
|
|
return virt_ptr;
|
|
};
|
|
return _ep.apply(ds_cap, lambda);
|
|
}
|
|
|
|
|
|
void Core_region_map::detach(Local_addr core_local_addr)
|
|
{
|
|
size_t size = platform_specific()->region_alloc_size_at(core_local_addr);
|
|
|
|
unmap_local(reinterpret_cast<Nova::Utcb *>(Thread::myself()->utcb()),
|
|
core_local_addr, size >> get_page_size_log2());
|
|
|
|
platform()->region_alloc()->free(core_local_addr);
|
|
}
|