ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-06-21 00:23:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

nova: avoid Blocking_canceled exception in timer

Browse Source 
Issue #3819
This commit is contained in:
Alexander Boettcher
2020-07-20 13:00:56 +02:00
committed by Christian Helmuth
parent de795b1a6e
commit eab09a2f7c
4 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
repos/base-nova/include/nova/syscall-generic.h
View File

@ -756,6 +756,7 @@ namespace Nova {
PT_SEL_PARENT = 0x1a, /* convention on Genode */ PT_SEL_PARENT = 0x1a, /* convention on Genode */
PT_SEL_MAIN_EC = 0x1c, /* convention on Genode */ PT_SEL_MAIN_EC = 0x1c, /* convention on Genode */
PT_SEL_STARTUP = 0x1e, PT_SEL_STARTUP = 0x1e,
SM_SEL_SIGNAL = 0x1e, /* alias of PT_SEL_STARTUP */
PT_SEL_RECALL = 0x1f, PT_SEL_RECALL = 0x1f,
SM_SEL_EC = 0x1d, /* convention on Genode */ SM_SEL_EC = 0x1d, /* convention on Genode */
}; };

7
repos/base-nova/src/include/signal_source/client.h
View File

@ -54,9 +54,10 @@ namespace Genode {
{ {
/* request mapping of semaphore capability selector */ /* request mapping of semaphore capability selector */
Thread * myself = Thread::myself(); Thread * myself = Thread::myself();
request_signal_sm_cap(myself->native_thread().exc_pt_sel + Nova::PT_SEL_PAGE_FAULT, auto const &exc_base = myself->native_thread().exc_pt_sel;
myself->native_thread().exc_pt_sel + Nova::PT_SEL_STARTUP); request_signal_sm_cap(exc_base + Nova::PT_SEL_PAGE_FAULT,
_sem = Capability_space::import(myself->native_thread().exc_pt_sel + Nova::PT_SEL_STARTUP); exc_base + Nova::SM_SEL_SIGNAL);
_sem = Capability_space::import(exc_base + Nova::SM_SEL_SIGNAL);
call<Rpc_register_semaphore>(_sem); call<Rpc_register_semaphore>(_sem);
} }

16
repos/base-nova/src/timer/nova/time_source.cc
View File

@ -28,7 +28,7 @@ void Timer::Time_source::schedule_timeout(Microseconds duration,
Threaded_time_source::handler(handler); Threaded_time_source::handler(handler);
/* check whether to cancel last timeout */ /* check whether to cancel last timeout */
if (duration.value == 0 && _sem != ~0UL) { if (duration.value == 0 && _sem) {
uint8_t res = Nova::sm_ctrl(_sem, Nova::SEMAPHORE_UP); uint8_t res = Nova::sm_ctrl(_sem, Nova::SEMAPHORE_UP);
if (res != Nova::NOVA_OK) if (res != Nova::NOVA_OK)
nova_die(); nova_die();
@ -40,10 +40,14 @@ void Timer::Time_source::schedule_timeout(Microseconds duration,
void Timer::Time_source::_wait_for_irq() void Timer::Time_source::_wait_for_irq()
{ {
if (_sem == ~0UL) { if (!_sem) {
_sem = Thread::native_thread().exc_pt_sel + SM_SEL_EC; } /* initialize first time in context of running thread */
auto const &exc_base = Thread::native_thread().exc_pt_sel;
request_signal_sm_cap(exc_base + Nova::PT_SEL_PAGE_FAULT,
exc_base + Nova::SM_SEL_SIGNAL);
addr_t sem = _sem; _sem = Thread::native_thread().exc_pt_sel + SM_SEL_SIGNAL;
}
/* calculate absolute timeout */ /* calculate absolute timeout */
Trace::Timestamp now = Trace::timestamp(); Trace::Timestamp now = Trace::timestamp();
@ -52,7 +56,7 @@ void Timer::Time_source::_wait_for_irq()
if (_timeout_us == max_timeout().value) { if (_timeout_us == max_timeout().value) {
/* tsc_absolute == 0 means blocking without timeout */ /* tsc_absolute == 0 means blocking without timeout */
uint8_t res = sm_ctrl(sem, SEMAPHORE_DOWN, 0); uint8_t res = sm_ctrl(_sem, SEMAPHORE_DOWN, 0);
if (res != Nova::NOVA_OK && res != Nova::NOVA_TIMEOUT) { if (res != Nova::NOVA_OK && res != Nova::NOVA_TIMEOUT) {
nova_die(); } nova_die(); }
@ -60,7 +64,7 @@ void Timer::Time_source::_wait_for_irq()
/* block until timeout fires or it gets canceled */ /* block until timeout fires or it gets canceled */
unsigned long long tsc_absolute = now + us_64 * (_tsc_khz / TSC_FACTOR); unsigned long long tsc_absolute = now + us_64 * (_tsc_khz / TSC_FACTOR);
uint8_t res = sm_ctrl(sem, SEMAPHORE_DOWN, tsc_absolute); uint8_t res = sm_ctrl(_sem, SEMAPHORE_DOWN, tsc_absolute);
if (res != Nova::NOVA_OK && res != Nova::NOVA_TIMEOUT) { if (res != Nova::NOVA_OK && res != Nova::NOVA_TIMEOUT) {
nova_die(); } nova_die(); }
} }

2
repos/base-nova/src/timer/nova/time_source.h
View File

@ -57,7 +57,7 @@ class Timer::Time_source : public Threaded_time_source
return 1000*1000; return 1000*1000;
} }
Genode::addr_t _sem { ~0UL }; Genode::addr_t _sem { 0 };
uint64_t _timeout_us { 0 }; uint64_t _timeout_us { 0 };
unsigned long const _tsc_khz; unsigned long const _tsc_khz;
Duration _curr_time { Microseconds(0) }; Duration _curr_time { Microseconds(0) };