[kernel] Fix mailbox bugs

This commit contains a number of related mailbox issues:

- Add extra parameters to mailbox_respond_receive to allow both the
  number of bytes/handles passed in, and the size of the byte/handle
  buffers to be passed in.
- Don't delete mailbox messages on receipt if the caller is waiting on
  reply
- Correctly pass status messages along with a mailbox::replyer object
- Actually wake the calling thread in the mailbox::replyer dtor
- Make sure to release locks _before_ calling thread::wake() on blocked
  threads, as that may cause them to be scheduled ahead of the current
  thread.
This commit is contained in:
Justin C. Miller
2022-02-28 20:16:42 -08:00
parent b8684777e0
commit ef307e8ec6
5 changed files with 44 additions and 21 deletions

View File

@@ -47,7 +47,7 @@ prep_send(
msg->handle_count = handle_count;
for (unsigned i = 0; i < handle_count; ++i) {
handle *h = get_handle<kobject>(handles[i]);
handle const *h = get_handle<kobject>(handles[i]);
if (!h)
return j6_err_invalid_arg;
msg->handles[i] = *h;
@@ -78,10 +78,10 @@ prep_receive(
*handle_count = msg->handle_count;
process &proc = process::current();
for (size_t i = 0; i < msg->handle_count; ++i)
for (size_t i = 0; i < msg->handle_count; ++i) {
handles[i] = proc.add_handle(msg->handles[i]);
delete msg;
msg->handles[i] = {};
}
}
j6_status_t
@@ -142,6 +142,8 @@ mailbox_receive(
data, data_len,
handles, handle_count);
if (*reply_tag == 0)
delete msg;
return j6_status_ok;
}
@@ -217,17 +219,23 @@ mailbox_respond_receive(
uint64_t * tag,
void * data,
size_t * data_len,
size_t data_in,
j6_handle_t * handles,
size_t * handle_count,
size_t handles_in,
uint16_t * reply_tag,
uint64_t * badge,
uint64_t flags)
{
j6_status_t s = mailbox_respond(self, *tag, data, *data_len, handles, *handle_count, *reply_tag);
j6_status_t s = mailbox_respond(self, *tag, data, data_in, handles, handles_in, *reply_tag);
if (s != j6_status_ok)
return s;
return mailbox_receive(self, tag, data, data_len, handles, handle_count, reply_tag, badge, flags);
s = mailbox_receive(self, tag, data, data_len, handles, handle_count, reply_tag, badge, flags);
if (s != j6_status_ok)
return s;
return j6_status_ok;
}