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

foc: fix reply_and_wait ipc method

Browse Source 
Currently, if the target of a reply capability gets destroyed, the
ipc syscall reply/wait returns with an error. Although we detect
the error condition we continue with reply/wait, which leads to
an endless loop. This commit introduces a condition analoque to
the base-library for pistachio and fiasco to do an open wait if an
error occured during a reply.
This commit is contained in:
Stefan Kalkowski
2018-06-14 11:23:35 +02:00
committed by Norman Feske
parent 30114e214b
commit dae9f9e164
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
repos/base-foc/src/lib/base/ipc.cc
View File

@ -318,6 +318,8 @@ Genode::Rpc_request Genode::ipc_reply_wait(Reply_capability const &,
{ {
Receive_window &rcv_window = Thread::myself()->native_thread().rcv_window; Receive_window &rcv_window = Thread::myself()->native_thread().rcv_window;
bool need_to_wait = false;
for (;;) { for (;;) {
request_msg.reset(); request_msg.reset();
@ -333,7 +335,8 @@ Genode::Rpc_request Genode::ipc_reply_wait(Reply_capability const &,
l4_msgtag_t request_tag; l4_msgtag_t request_tag;
l4_umword_t label = 0; /* kernel-protected label of invoked capability */ l4_umword_t label = 0; /* kernel-protected label of invoked capability */
if (exc.value != Rpc_exception_code::INVALID_OBJECT) { if (exc.value != Rpc_exception_code::INVALID_OBJECT
&& !need_to_wait) {
l4_msgtag_t const reply_tag = copy_msgbuf_to_utcb(reply_msg, exc.value); l4_msgtag_t const reply_tag = copy_msgbuf_to_utcb(reply_msg, exc.value);
@ -342,8 +345,10 @@ Genode::Rpc_request Genode::ipc_reply_wait(Reply_capability const &,
request_tag = l4_ipc_wait(l4_utcb(), &label, L4_IPC_NEVER); request_tag = l4_ipc_wait(l4_utcb(), &label, L4_IPC_NEVER);
} }
if (ipc_error(request_tag, false)) if (ipc_error(request_tag, false)) {
need_to_wait = true;
continue; continue;
} else need_to_wait = false;
/* copy request message from the UTCBs message registers */ /* copy request message from the UTCBs message registers */
unsigned long const badge = unsigned long const badge =