2011-12-22 16:19:25 +01:00
|
|
|
/*
|
2016-04-15 15:19:22 +02:00
|
|
|
* \brief Core-local region map
|
2011-12-22 16:19:25 +01:00
|
|
|
* \author Norman Feske
|
|
|
|
|
* \date 2009-10-02
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
/*
|
2017-02-20 13:23:52 +01:00
|
|
|
* Copyright (C) 2009-2017 Genode Labs GmbH
|
2011-12-22 16:19:25 +01:00
|
|
|
*
|
|
|
|
|
* This file is part of the Genode OS framework, which is distributed
|
2017-02-20 13:23:52 +01:00
|
|
|
* under the terms of the GNU Affero General Public License version 3.
|
2011-12-22 16:19:25 +01:00
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
/* Genode includes */
|
base: avoid use of deprecated base/printf.h
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
2016-07-13 19:07:09 +02:00
|
|
|
#include <base/log.h>
|
2011-12-22 16:19:25 +01:00
|
|
|
|
|
|
|
|
/* core includes */
|
2016-04-15 15:19:22 +02:00
|
|
|
#include <core_region_map.h>
|
2011-12-22 16:19:25 +01:00
|
|
|
#include <platform.h>
|
|
|
|
|
#include <util.h>
|
|
|
|
|
#include <nova_util.h>
|
|
|
|
|
|
|
|
|
|
/* NOVA includes */
|
|
|
|
|
#include <nova/syscalls.h>
|
|
|
|
|
|
|
|
|
|
using namespace Genode;
|
|
|
|
|
|
2015-09-29 22:03:03 +02:00
|
|
|
/**
|
|
|
|
|
* 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,
|
2016-05-11 18:21:47 +02:00
|
|
|
&virt_addr, align_log2).ok())
|
2015-09-29 22:03:03 +02:00
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return virt_addr;
|
|
|
|
|
}
|
2011-12-22 16:19:25 +01:00
|
|
|
|
2016-04-15 15:19:22 +02:00
|
|
|
Region_map::Local_addr
|
Follow practices suggested by "Effective C++"
The patch adjust the code of the base, base-<kernel>, and os repository.
To adapt existing components to fix violations of the best practices
suggested by "Effective C++" as reported by the -Weffc++ compiler
argument. The changes follow the patterns outlined below:
* A class with virtual functions can no longer publicly inherit base
classed without a vtable. The inherited object may either be moved
to a member variable, or inherited privately. The latter would be
used for classes that inherit 'List::Element' or 'Avl_node'. In order
to enable the 'List' and 'Avl_tree' to access the meta data, the
'List' must become a friend.
* Instead of adding a virtual destructor to abstract base classes,
we inherit the new 'Interface' class, which contains a virtual
destructor. This way, single-line abstract base classes can stay
as compact as they are now. The 'Interface' utility resides in
base/include/util/interface.h.
* With the new warnings enabled, all member variables must be explicitly
initialized. Basic types may be initialized with '='. All other types
are initialized with braces '{ ... }' or as class initializers. If
basic types and non-basic types appear in a row, it is nice to only
use the brace syntax (also for basic types) and align the braces.
* If a class contains pointers as members, it must now also provide a
copy constructor and assignment operator. In the most cases, one
would make them private, effectively disallowing the objects to be
copied. Unfortunately, this warning cannot be fixed be inheriting
our existing 'Noncopyable' class (the compiler fails to detect that
the inheriting class cannot be copied and still gives the error).
For now, we have to manually add declarations for both the copy
constructor and assignment operator as private class members. Those
declarations should be prepended with a comment like this:
/*
* Noncopyable
*/
Thread(Thread const &);
Thread &operator = (Thread const &);
In the future, we should revisit these places and try to replace
the pointers with references. In the presence of at least one
reference member, the compiler would no longer implicitly generate
a copy constructor. So we could remove the manual declaration.
Issue #465
2017-12-21 15:42:15 +01:00
|
|
|
Core_region_map::attach(Dataspace_capability ds_cap, size_t,
|
2011-12-22 16:19:25 +01:00
|
|
|
off_t offset, bool use_local_addr,
|
Follow practices suggested by "Effective C++"
The patch adjust the code of the base, base-<kernel>, and os repository.
To adapt existing components to fix violations of the best practices
suggested by "Effective C++" as reported by the -Weffc++ compiler
argument. The changes follow the patterns outlined below:
* A class with virtual functions can no longer publicly inherit base
classed without a vtable. The inherited object may either be moved
to a member variable, or inherited privately. The latter would be
used for classes that inherit 'List::Element' or 'Avl_node'. In order
to enable the 'List' and 'Avl_tree' to access the meta data, the
'List' must become a friend.
* Instead of adding a virtual destructor to abstract base classes,
we inherit the new 'Interface' class, which contains a virtual
destructor. This way, single-line abstract base classes can stay
as compact as they are now. The 'Interface' utility resides in
base/include/util/interface.h.
* With the new warnings enabled, all member variables must be explicitly
initialized. Basic types may be initialized with '='. All other types
are initialized with braces '{ ... }' or as class initializers. If
basic types and non-basic types appear in a row, it is nice to only
use the brace syntax (also for basic types) and align the braces.
* If a class contains pointers as members, it must now also provide a
copy constructor and assignment operator. In the most cases, one
would make them private, effectively disallowing the objects to be
copied. Unfortunately, this warning cannot be fixed be inheriting
our existing 'Noncopyable' class (the compiler fails to detect that
the inheriting class cannot be copied and still gives the error).
For now, we have to manually add declarations for both the copy
constructor and assignment operator as private class members. Those
declarations should be prepended with a comment like this:
/*
* Noncopyable
*/
Thread(Thread const &);
Thread &operator = (Thread const &);
In the future, we should revisit these places and try to replace
the pointers with references. In the presence of at least one
reference member, the compiler would no longer implicitly generate
a copy constructor. So we could remove the manual declaration.
Issue #465
2017-12-21 15:42:15 +01:00
|
|
|
Region_map::Local_addr,
|
2018-05-08 11:21:10 +02:00
|
|
|
bool executable, bool writeable)
|
2011-12-22 16:19:25 +01:00
|
|
|
{
|
2015-08-10 13:34:16 +02:00
|
|
|
auto lambda = [&] (Dataspace_component *ds) -> Local_addr {
|
|
|
|
|
if (!ds)
|
|
|
|
|
throw Invalid_dataspace();
|
|
|
|
|
|
|
|
|
|
if (use_local_addr) {
|
base: avoid use of deprecated base/printf.h
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
2016-07-13 19:07:09 +02:00
|
|
|
error("Parameter 'use_local_addr' not supported within core");
|
2015-08-10 13:34:16 +02:00
|
|
|
return nullptr;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (offset) {
|
base: avoid use of deprecated base/printf.h
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
2016-07-13 19:07:09 +02:00
|
|
|
error("Parameter 'offset' not supported within core");
|
2015-08-10 13:34:16 +02:00
|
|
|
return nullptr;
|
|
|
|
|
}
|
|
|
|
|
|
2015-09-29 22:03:03 +02:00
|
|
|
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)
|
Streamline exception types
This patch reduces the number of exception types by facilitating
globally defined exceptions for common usage patterns shared by most
services. In particular, RPC functions that demand a session-resource
upgrade not longer reflect this condition via a session-specific
exception but via the 'Out_of_ram' or 'Out_of_caps' types.
Furthermore, the 'Parent::Service_denied', 'Parent::Unavailable',
'Root::Invalid_args', 'Root::Unavailable', 'Service::Invalid_args',
'Service::Unavailable', and 'Local_service::Factory::Denied' types have
been replaced by the single 'Service_denied' exception type defined in
'session/session.h'.
This consolidation eases the error handling (there are fewer exceptions
to handle), alleviates the need to convert exceptions along the
session-creation call chain, and avoids possible aliasing problems
(catching the wrong type with the same name but living in a different
scope).
2017-05-07 22:03:22 +02:00
|
|
|
throw Out_of_ram();
|
2015-09-29 22:03:03 +02:00
|
|
|
|
|
|
|
|
/* map it */
|
2016-05-04 12:27:17 +02:00
|
|
|
Nova::Utcb * const utcb = reinterpret_cast<Nova::Utcb *>(Thread::myself()->utcb());
|
2018-05-08 11:21:10 +02:00
|
|
|
const Nova::Rights rights(true, writeable && ds->writable(), executable);
|
2015-09-29 22:03:03 +02:00
|
|
|
|
|
|
|
|
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);
|
Streamline exception types
This patch reduces the number of exception types by facilitating
globally defined exceptions for common usage patterns shared by most
services. In particular, RPC functions that demand a session-resource
upgrade not longer reflect this condition via a session-specific
exception but via the 'Out_of_ram' or 'Out_of_caps' types.
Furthermore, the 'Parent::Service_denied', 'Parent::Unavailable',
'Root::Invalid_args', 'Root::Unavailable', 'Service::Invalid_args',
'Service::Unavailable', and 'Local_service::Factory::Denied' types have
been replaced by the single 'Service_denied' exception type defined in
'session/session.h'.
This consolidation eases the error handling (there are fewer exceptions
to handle), alleviates the need to convert exceptions along the
session-creation call chain, and avoids possible aliasing problems
(catching the wrong type with the same name but living in a different
scope).
2017-05-07 22:03:22 +02:00
|
|
|
throw Out_of_ram();
|
2015-09-29 22:03:03 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return virt_ptr;
|
2015-08-10 13:34:16 +02:00
|
|
|
};
|
2016-04-20 21:12:57 +02:00
|
|
|
return _ep.apply(ds_cap, lambda);
|
2011-12-22 16:19:25 +01:00
|
|
|
}
|
2015-09-29 22:03:03 +02:00
|
|
|
|
|
|
|
|
|
2016-04-15 15:19:22 +02:00
|
|
|
void Core_region_map::detach(Local_addr core_local_addr)
|
2015-09-29 22:03:03 +02:00
|
|
|
{
|
|
|
|
|
size_t size = platform_specific()->region_alloc_size_at(core_local_addr);
|
|
|
|
|
|
2016-05-04 12:27:17 +02:00
|
|
|
unmap_local(reinterpret_cast<Nova::Utcb *>(Thread::myself()->utcb()),
|
2015-09-29 22:03:03 +02:00
|
|
|
core_local_addr, size >> get_page_size_log2());
|
|
|
|
|
|
|
|
|
|
platform()->region_alloc()->free(core_local_addr);
|
|
|
|
|
}
|
