2011-12-22 16:19:25 +01:00
|
|
|
/*
|
Fiasco.OC: introduce Cap_index (fixes #149, #112)
This commit introduces a Cap_index class for Fiasco.OC's capabilities.
A Cap_index is a combination of the global capability id, that is used by Genode
to correctly identify a kernel-object, and a corresponding entry in a
protection-domain's (kernel-)capability-space. The cap-indices are non-copyable,
unique objects, that are held in a Cap_map. The Cap_map is used to re-find
capabilities already present in the protection-domain, when a capability is
received via IPC. The retrieval of capabilities effectively fixes issue #112,
meaning the waste of capability-space entries.
Because Cap_index objects are non-copyable (their address indicates the position
in the capability-space of the pd), they are inappropriate to use as
Native_capability. Therefore, Native_capability is implemented as a reference
to Cap_index objects. This design seems to be a good pre-condition to implement
smart-pointers for entries in the capability-space, and thereby closing existing
leaks (please refer to issue #32).
Cap_index, Cap_map, and the allocator for Cap_index objects are designed in a way,
that it should be relatively easy to apply the same concept to NOVA also. By now,
these classes are located in the `base-foc` repository, but they intentionally
contain no Fiasco.OC specific elements.
The previously explained changes had extensive impact on the whole Fiasco.OC
platform implementation, due to various dependencies. The following things had to
be changed:
* The Thread object's startup and destruction routine is re-arranged, to
enable another thread (that calls the Thread destructor) gaining the
capability id of the thread's gate to remove it from the Cap_map, the
thread's UTCB had to be made available to the caller, because there
is the current location of that id. After having the UTCB available
in the Thread object for that reason, the whole thread bootstrapping
could be simplified.
* In the course of changing the Native_capability's semantic, a new Cap_mapping
class was introduced in core, that facilitates the establishment and
destruction of capability mappings between core and it's client's, especially
mappings related to Platform_thread and Platform_task, that are relevant to
task and thread creation and destruction. Thereby, the destruction of
threads had to be reworked, which effectively removed a bug (issue #149)
where some threads weren't destroyed properly.
* In the quick fix for issue #112, something similar to the Cap_map was
introduced available in all processes. Moreover, some kind of a capability
map already existed in core, to handle cap-session request properly. The
introduction of the Cap_map unified both structures, so that the
cap-session component code in core had to be reworked too.
* The platform initialization code had to be changed sligthly due to the
changes in Native_capability
* The vcpu initialization in the L4Linux support library had to be adapted
according to the already mentioned changes in the Thread object's bootstrap
code.
2012-03-15 12:41:24 +01:00
|
|
|
* \brief Fiasco.OC-specific core implementation of IRQ sessions
|
2011-12-22 16:19:25 +01:00
|
|
|
* \author Christian Helmuth
|
Fiasco.OC: introduce Cap_index (fixes #149, #112)
This commit introduces a Cap_index class for Fiasco.OC's capabilities.
A Cap_index is a combination of the global capability id, that is used by Genode
to correctly identify a kernel-object, and a corresponding entry in a
protection-domain's (kernel-)capability-space. The cap-indices are non-copyable,
unique objects, that are held in a Cap_map. The Cap_map is used to re-find
capabilities already present in the protection-domain, when a capability is
received via IPC. The retrieval of capabilities effectively fixes issue #112,
meaning the waste of capability-space entries.
Because Cap_index objects are non-copyable (their address indicates the position
in the capability-space of the pd), they are inappropriate to use as
Native_capability. Therefore, Native_capability is implemented as a reference
to Cap_index objects. This design seems to be a good pre-condition to implement
smart-pointers for entries in the capability-space, and thereby closing existing
leaks (please refer to issue #32).
Cap_index, Cap_map, and the allocator for Cap_index objects are designed in a way,
that it should be relatively easy to apply the same concept to NOVA also. By now,
these classes are located in the `base-foc` repository, but they intentionally
contain no Fiasco.OC specific elements.
The previously explained changes had extensive impact on the whole Fiasco.OC
platform implementation, due to various dependencies. The following things had to
be changed:
* The Thread object's startup and destruction routine is re-arranged, to
enable another thread (that calls the Thread destructor) gaining the
capability id of the thread's gate to remove it from the Cap_map, the
thread's UTCB had to be made available to the caller, because there
is the current location of that id. After having the UTCB available
in the Thread object for that reason, the whole thread bootstrapping
could be simplified.
* In the course of changing the Native_capability's semantic, a new Cap_mapping
class was introduced in core, that facilitates the establishment and
destruction of capability mappings between core and it's client's, especially
mappings related to Platform_thread and Platform_task, that are relevant to
task and thread creation and destruction. Thereby, the destruction of
threads had to be reworked, which effectively removed a bug (issue #149)
where some threads weren't destroyed properly.
* In the quick fix for issue #112, something similar to the Cap_map was
introduced available in all processes. Moreover, some kind of a capability
map already existed in core, to handle cap-session request properly. The
introduction of the Cap_map unified both structures, so that the
cap-session component code in core had to be reworked too.
* The platform initialization code had to be changed sligthly due to the
changes in Native_capability
* The vcpu initialization in the L4Linux support library had to be adapted
according to the already mentioned changes in the Thread object's bootstrap
code.
2012-03-15 12:41:24 +01:00
|
|
|
* \author Stefan Kalkowski
|
2011-12-22 16:19:25 +01:00
|
|
|
* \date 2007-09-13
|
|
|
|
*
|
|
|
|
* FIXME ram quota missing
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
2012-01-03 15:35:05 +01:00
|
|
|
* Copyright (C) 2007-2012 Genode Labs GmbH
|
2011-12-22 16:19:25 +01:00
|
|
|
*
|
|
|
|
* 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/printf.h>
|
|
|
|
#include <util/arg_string.h>
|
|
|
|
|
|
|
|
/* core includes */
|
|
|
|
#include <irq_root.h>
|
|
|
|
#include <irq_session_component.h>
|
2012-03-16 14:47:41 +01:00
|
|
|
#include <platform.h>
|
2011-12-22 16:19:25 +01:00
|
|
|
#include <util.h>
|
|
|
|
|
|
|
|
/* Fiasco includes */
|
|
|
|
namespace Fiasco {
|
|
|
|
#include <l4/sys/icu.h>
|
|
|
|
#include <l4/sys/irq.h>
|
|
|
|
#include <l4/sys/factory.h>
|
|
|
|
#include <l4/sys/types.h>
|
|
|
|
}
|
|
|
|
|
|
|
|
using namespace Genode;
|
|
|
|
|
|
|
|
|
|
|
|
Irq_session_component::Interrupt*
|
|
|
|
Irq_session_component::Interrupt::find_by_num(unsigned num)
|
|
|
|
{
|
|
|
|
if (number == num) return this;
|
|
|
|
|
|
|
|
Interrupt *n = Avl_node<Interrupt>::child(num > number);
|
|
|
|
return n ? n->find_by_num(num) : 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
bool Irq_session_component::Interrupt::higher(Irq_session_component::Interrupt *n)
|
|
|
|
{
|
|
|
|
return n->number > number;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
Irq_session_component::Interrupt::Interrupt()
|
Fiasco.OC: introduce Cap_index (fixes #149, #112)
This commit introduces a Cap_index class for Fiasco.OC's capabilities.
A Cap_index is a combination of the global capability id, that is used by Genode
to correctly identify a kernel-object, and a corresponding entry in a
protection-domain's (kernel-)capability-space. The cap-indices are non-copyable,
unique objects, that are held in a Cap_map. The Cap_map is used to re-find
capabilities already present in the protection-domain, when a capability is
received via IPC. The retrieval of capabilities effectively fixes issue #112,
meaning the waste of capability-space entries.
Because Cap_index objects are non-copyable (their address indicates the position
in the capability-space of the pd), they are inappropriate to use as
Native_capability. Therefore, Native_capability is implemented as a reference
to Cap_index objects. This design seems to be a good pre-condition to implement
smart-pointers for entries in the capability-space, and thereby closing existing
leaks (please refer to issue #32).
Cap_index, Cap_map, and the allocator for Cap_index objects are designed in a way,
that it should be relatively easy to apply the same concept to NOVA also. By now,
these classes are located in the `base-foc` repository, but they intentionally
contain no Fiasco.OC specific elements.
The previously explained changes had extensive impact on the whole Fiasco.OC
platform implementation, due to various dependencies. The following things had to
be changed:
* The Thread object's startup and destruction routine is re-arranged, to
enable another thread (that calls the Thread destructor) gaining the
capability id of the thread's gate to remove it from the Cap_map, the
thread's UTCB had to be made available to the caller, because there
is the current location of that id. After having the UTCB available
in the Thread object for that reason, the whole thread bootstrapping
could be simplified.
* In the course of changing the Native_capability's semantic, a new Cap_mapping
class was introduced in core, that facilitates the establishment and
destruction of capability mappings between core and it's client's, especially
mappings related to Platform_thread and Platform_task, that are relevant to
task and thread creation and destruction. Thereby, the destruction of
threads had to be reworked, which effectively removed a bug (issue #149)
where some threads weren't destroyed properly.
* In the quick fix for issue #112, something similar to the Cap_map was
introduced available in all processes. Moreover, some kind of a capability
map already existed in core, to handle cap-session request properly. The
introduction of the Cap_map unified both structures, so that the
cap-session component code in core had to be reworked too.
* The platform initialization code had to be changed sligthly due to the
changes in Native_capability
* The vcpu initialization in the L4Linux support library had to be adapted
according to the already mentioned changes in the Thread object's bootstrap
code.
2012-03-15 12:41:24 +01:00
|
|
|
: _cap(cap_map()->insert(platform_specific()->cap_id_alloc()->alloc())),
|
|
|
|
_sem(), number(0) {}
|
2011-12-22 16:19:25 +01:00
|
|
|
|
|
|
|
|
|
|
|
Native_thread Irq_session_component::Interrupt_handler::handler_cap()
|
|
|
|
{
|
|
|
|
static Interrupt_handler handler;
|
2012-03-09 12:25:11 +01:00
|
|
|
return handler._thread_cap.dst();
|
2011-12-22 16:19:25 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void Irq_session_component::Interrupt_handler::entry()
|
|
|
|
{
|
|
|
|
using namespace Fiasco;
|
|
|
|
|
|
|
|
int err;
|
|
|
|
l4_msgtag_t tag;
|
|
|
|
l4_umword_t label;
|
|
|
|
|
|
|
|
while (true) {
|
|
|
|
tag = l4_ipc_wait(l4_utcb(), &label, L4_IPC_NEVER);
|
|
|
|
if ((err = l4_ipc_error(tag, l4_utcb())))
|
|
|
|
PERR("IRQ receive: %d\n", err);
|
|
|
|
else {
|
|
|
|
Interrupt *intr = _irqs()->first();
|
|
|
|
if (intr) {
|
|
|
|
intr = intr->find_by_num(label);
|
|
|
|
if (intr)
|
|
|
|
intr->semaphore()->up();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
Avl_tree<Irq_session_component::Interrupt>* Irq_session_component::_irqs()
|
|
|
|
{
|
|
|
|
static Avl_tree<Interrupt> irqs;
|
|
|
|
return &irqs;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
Irq_session_component::Irq_session_component(Cap_session *cap_session,
|
|
|
|
Range_allocator *irq_alloc,
|
|
|
|
const char *args)
|
|
|
|
:
|
|
|
|
_irq_alloc(irq_alloc),
|
|
|
|
_ep(cap_session, STACK_SIZE, "irqctrl")
|
|
|
|
{
|
|
|
|
using namespace Fiasco;
|
|
|
|
|
|
|
|
long irq_number = Arg_string::find_arg(args, "irq_number").long_value(-1);
|
|
|
|
if ((irq_number == -1) || _irq_alloc->alloc_addr(1, irq_number)) {
|
|
|
|
PERR("Unavailable IRQ %lx requested", irq_number);
|
|
|
|
throw Root::Invalid_args();
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* temorary hack for fiasco.oc using the local-apic,
|
|
|
|
* where old pic-line 0 maps to 2
|
|
|
|
*/
|
|
|
|
if (irq_number == 0)
|
|
|
|
irq_number = 2;
|
|
|
|
|
|
|
|
_irq.number = irq_number;
|
|
|
|
Irq_session_component::_irqs()->insert(&_irq);
|
|
|
|
|
|
|
|
if (l4_error(l4_factory_create_irq(L4_BASE_FACTORY_CAP, _irq.capability())))
|
|
|
|
PERR("l4_factory_create_irq failed!");
|
|
|
|
|
|
|
|
if (l4_error(l4_icu_bind(L4_BASE_ICU_CAP, irq_number, _irq.capability())))
|
|
|
|
PERR("Binding IRQ%ld to the ICU failed", irq_number);
|
|
|
|
|
2012-03-16 14:47:41 +01:00
|
|
|
/* set interrupt mode */
|
|
|
|
Platform::setup_irq_mode(irq_number);
|
|
|
|
|
2011-12-22 16:19:25 +01:00
|
|
|
if (l4_error(l4_irq_attach(_irq.capability(), irq_number,
|
|
|
|
Interrupt_handler::handler_cap())))
|
|
|
|
PERR("Error attaching to IRQ %ld", irq_number);
|
|
|
|
|
|
|
|
/* initialize capability */
|
|
|
|
_irq_cap = _ep.manage(this);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void Irq_session_component::wait_for_irq()
|
|
|
|
{
|
|
|
|
using namespace Fiasco;
|
|
|
|
|
|
|
|
int err;
|
|
|
|
l4_msgtag_t tag = l4_irq_unmask(_irq.capability());
|
|
|
|
if ((err = l4_ipc_error(tag, l4_utcb())))
|
|
|
|
PERR("IRQ unmask: %d\n", err);
|
|
|
|
|
|
|
|
_irq.semaphore()->down();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
Irq_session_component::~Irq_session_component()
|
|
|
|
{
|
|
|
|
PERR("Implement me, immediately!");
|
|
|
|
}
|