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

base-foc: introduce state in platform thread 

When destroying a thread, which was not bound to a protection domain via kernel
primitives beforehand, it is critical to change the pager and exregs the thread
in the destruction process. Therefore, this commit introduces two thread states:
DEAD and RUNNING. On the basis of the thread state, we can decide whether to
reset the thread before destroying it, or not.
This commit is contained in:
Stefan Kalkowski 2013-03-26 17:23:40 +01:00 committed by Norman Feske
parent 9a4887dcad
commit 074e522990
2 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
base-foc/src/core/include/platform_thread.h
View File

@ -33,8 +33,11 @@ namespace Genode {
{ {
private: private:
enum State { DEAD, RUNNING };
friend class Platform_pd; friend class Platform_pd;
State _state;
bool _core_thread; bool _core_thread;
Cap_mapping _thread; Cap_mapping _thread;
Cap_mapping _gate; Cap_mapping _gate;

31
base-foc/src/core/platform_thread.cc
View File

@ -54,6 +54,8 @@ int Platform_thread::start(void *ip, void *sp)
return -1; return -1;
} }
_state = RUNNING;
/* set ip and sp and run the thread */ /* set ip and sp and run the thread */
tag = l4_thread_ex_regs(_thread.local.dst(), (l4_addr_t) ip, tag = l4_thread_ex_regs(_thread.local.dst(), (l4_addr_t) ip,
(l4_addr_t) sp, 0); (l4_addr_t) sp, 0);
@ -143,16 +145,18 @@ void Platform_thread::bind(Platform_pd *pd)
void Platform_thread::unbind() void Platform_thread::unbind()
{ {
/* first set the thread as its own pager */ if (_state == RUNNING) {
l4_thread_control_start(); /* first set the thread as its own pager */
l4_thread_control_pager(_gate.remote); l4_thread_control_start();
l4_thread_control_exc_handler(_gate.remote); l4_thread_control_pager(_gate.remote);
if (l4_msgtag_has_error(l4_thread_control_commit(_thread.local.dst()))) l4_thread_control_exc_handler(_gate.remote);
PWRN("l4_thread_control_commit for %lx failed!", if (l4_msgtag_has_error(l4_thread_control_commit(_thread.local.dst())))
(unsigned long) _thread.local.dst()); PWRN("l4_thread_control_commit for %lx failed!",
(unsigned long) _thread.local.dst());
/* now force it into a pagefault */ /* now force it into a pagefault */
l4_thread_ex_regs(_thread.local.dst(), 0, 0, L4_THREAD_EX_REGS_CANCEL); l4_thread_ex_regs(_thread.local.dst(), 0, 0, L4_THREAD_EX_REGS_CANCEL);
}
_platform_pd = (Platform_pd*) 0; _platform_pd = (Platform_pd*) 0;
} }
@ -249,7 +253,8 @@ Weak_ptr<Address_space> Platform_thread::address_space()
Platform_thread::Platform_thread(const char *name, Platform_thread::Platform_thread(const char *name,
unsigned prio) unsigned prio)
: _core_thread(false), : _state(DEAD),
_core_thread(false),
_thread(true), _thread(true),
_irq(true), _irq(true),
_utcb(0), _utcb(0),
@ -265,7 +270,8 @@ Platform_thread::Platform_thread(const char *name,
Platform_thread::Platform_thread(Core_cap_index* thread, Platform_thread::Platform_thread(Core_cap_index* thread,
Core_cap_index* irq, const char *name) Core_cap_index* irq, const char *name)
: _core_thread(true), : _state(RUNNING),
_core_thread(true),
_thread(Native_capability(thread), L4_BASE_THREAD_CAP), _thread(Native_capability(thread), L4_BASE_THREAD_CAP),
_irq(Native_capability(irq)), _irq(Native_capability(irq)),
_utcb(0), _utcb(0),
@ -279,7 +285,8 @@ Platform_thread::Platform_thread(Core_cap_index* thread,
Platform_thread::Platform_thread(const char *name) Platform_thread::Platform_thread(const char *name)
: _core_thread(true), : _state(DEAD),
_core_thread(true),
_thread(true), _thread(true),
_irq(true), _irq(true),
_utcb(0), _utcb(0),