Skip to content

Add WithMRs variants for the remaining seL4 IPC syscalls #331

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dlom wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add WithMRs variants for the remaining seL4 IPC syscalls #331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
212 changes: 212 additions & 0 deletions crates/sel4/src/syscalls.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,20 @@ impl<C: InvocationContext> cap::Endpoint<C> {
})
}

pub fn nb_send_with_mrs<T: FastMessages>(self, info: MessageInfo, messages: T) {
let [msg0, msg1, msg2, msg3] = messages.prepare_in();
self.invoke(|cptr, ipc_buffer| {
ipc_buffer.inner_mut().seL4_NBSendWithMRs(
cptr.bits(),
info.into_inner(),
msg0,
msg1,
msg2,
msg3,
)
})
}

/// Corresponds to `seL4_Recv`.
pub fn recv(self, reply_authority: impl ConveysReplyAuthority) -> (MessageInfo, Badge) {
let (raw_msg_info, badge) = self.invoke(|cptr, ipc_buffer| {
Expand Down Expand Up @@ -134,6 +148,28 @@ impl<C: InvocationContext> cap::Endpoint<C> {
})
}

pub fn nb_recv_with_mrs(self, reply_authority: impl ConveysReplyAuthority) -> RecvWithMRs {
let mut msg = [0; NUM_FAST_MESSAGE_REGISTERS];
let [mr0, mr1, mr2, mr3] = &mut msg;
let (raw_msg_info, badge) = self.invoke(|cptr, ipc_buffer| {
ipc_buffer.inner_mut().seL4_NBRecvWithMRs(
cptr.bits(),
Some(mr0),
Some(mr1),
Some(mr2),
Some(mr3),
reply_authority
.into_reply_authority()
.into_sys_reply_authority(),
)
});
RecvWithMRs {
info: MessageInfo::from_inner(raw_msg_info),
badge,
msg,
}
}

Comment on lines +151 to +172
Copy link
Copy Markdown
Member

@nspin nspin Apr 28, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you move this under recv_with_mrs to match the ordering in the rest of the file?

pub fn recv_with_mrs(self, reply_authority: impl ConveysReplyAuthority) -> RecvWithMRs {
let mut msg = [0; NUM_FAST_MESSAGE_REGISTERS];
let [mr0, mr1, mr2, mr3] = &mut msg;
Expand All @@ -156,6 +192,34 @@ impl<C: InvocationContext> cap::Endpoint<C> {
}
}

pub fn reply_recv_with_mrs<T: FastMessages>(
self,
info: MessageInfo,
messages: T,
reply_authority: impl ConveysReplyAuthority,
) -> RecvWithMRs {
let mut msg = messages.prepare_in_out();
let [mr0, mr1, mr2, mr3] = &mut msg;
let (raw_msg_info, badge) = self.invoke(|cptr, ipc_buffer| {
ipc_buffer.inner_mut().seL4_ReplyRecvWithMRs(
cptr.bits(),
info.into_inner(),
Some(mr0),
Some(mr1),
Some(mr2),
Some(mr3),
reply_authority
.into_reply_authority()
.into_sys_reply_authority(),
)
});
RecvWithMRs {
info: MessageInfo::from_inner(raw_msg_info),
badge,
msg,
}
}

pub fn call_with_mrs<T: FastMessages>(self, info: MessageInfo, messages: T) -> CallWithMRs {
let mut msg = messages.prepare_in_out();
let [mr0, mr1, mr2, mr3] = &mut msg;
Expand Down Expand Up @@ -188,6 +252,61 @@ impl<C: InvocationContext> cap::Notification<C> {
self.invoke(|cptr, ipc_buffer| ipc_buffer.inner_mut().seL4_Wait(cptr.bits()));
(wait_message_info_from_sys(info), badge)
}

#[sel4_cfg(KERNEL_MCS)]
pub fn wait_with_mrs(self) -> WaitWithMRs {
let mut msg = [0; NUM_FAST_MESSAGE_REGISTERS];
let [mr0, mr1, mr2, mr3] = &mut msg;
let (raw_msg_info, badge) = self.invoke(|cptr, ipc_buffer| {
ipc_buffer.inner_mut().seL4_WaitWithMRs(
cptr.bits(),
Some(mr0),
Some(mr1),
Some(mr2),
Some(mr3),
)
});
WaitWithMRs {
info: wait_message_info_from_sys(raw_msg_info),
badge,
msg,
}
}

/// Corresponds to `seL4_NBWait`.
#[sel4_cfg(KERNEL_MCS)]
pub fn nb_wait(self) -> (WaitMessageInfo, Badge) {
let (info, badge) =
self.invoke(|cptr, ipc_buffer| ipc_buffer.inner_mut().seL4_NBWait(cptr.bits()));
(wait_message_info_from_sys(info), badge)
}

#[sel4_cfg(KERNEL_MCS)]
pub fn nb_wait_with_mrs(self) -> WaitWithMRs {
let mut msg = [0; NUM_FAST_MESSAGE_REGISTERS];
let [mr0, mr1, mr2, mr3] = &mut msg;
let (raw_msg_info, badge) = self.invoke(|cptr, ipc_buffer| {
ipc_buffer.inner_mut().seL4_NBWaitWithMRs(
cptr.bits(),
Some(mr0),
Some(mr1),
Some(mr2),
Some(mr3),
)
});
WaitWithMRs {
info: wait_message_info_from_sys(raw_msg_info),
badge,
msg,
}
}

/// Corresponds to `seL4_Poll`.
pub fn poll(self) -> (MessageInfo, Badge) {
let (raw_msg_info, badge) =
self.invoke(|cptr, ipc_buffer| ipc_buffer.inner_mut().seL4_Poll(cptr.bits()));
(MessageInfo::from_inner(raw_msg_info), badge)
}
}

#[sel4_cfg(KERNEL_MCS)]
Expand Down Expand Up @@ -224,6 +343,81 @@ impl<T: IpcCapType, C: InvocationContext> Cap<T, C> {
});
(MessageInfo::from_inner(raw_msg_info), badge)
}

/// Corresponds to `seL4_NBSendRecvWithMRs`.
#[sel4_cfg(KERNEL_MCS)]
pub fn nb_send_recv_with_mrs<U: IpcCapType, M: FastMessages>(
self,
info: MessageInfo,
messages: M,
src: Cap<U>,
reply_authority: impl ConveysReplyAuthority,
) -> RecvWithMRs {
let mut msg = messages.prepare_in_out();
let [mr0, mr1, mr2, mr3] = &mut msg;
let (raw_msg_info, badge) = self.invoke(|cptr, ipc_buffer| {
ipc_buffer.inner_mut().seL4_NBSendRecvWithMRs(
cptr.bits(),
info.into_inner(),
src.bits(),
Some(mr0),
Some(mr1),
Some(mr2),
Some(mr3),
reply_authority
.into_reply_authority()
.into_sys_reply_authority(),
)
});
RecvWithMRs {
info: MessageInfo::from_inner(raw_msg_info),
badge,
msg,
}
}

/// Corresponds to `seL4_NBSendWait`.
#[sel4_cfg(KERNEL_MCS)]
pub fn nb_send_wait<U: IpcCapType>(
self,
info: MessageInfo,
src: Cap<U>,
) -> (MessageInfo, Badge) {
let (raw_msg_info, badge) = self.invoke(|cptr, ipc_buffer| {
ipc_buffer
.inner_mut()
.seL4_NBSendWait(cptr.bits(), info.into_inner(), src.bits())
});
(MessageInfo::from_inner(raw_msg_info), badge)
}

/// Corresponds to `seL4_NBSendWaitWithMRs`.
#[sel4_cfg(KERNEL_MCS)]
pub fn nb_send_wait_with_mrs<U: IpcCapType, M: FastMessages>(
self,
info: MessageInfo,
messages: M,
src: Cap<U>,
) -> RecvWithMRs {
let mut msg = messages.prepare_in_out();
let [mr0, mr1, mr2, mr3] = &mut msg;
let (raw_msg_info, badge) = self.invoke(|cptr, ipc_buffer| {
ipc_buffer.inner_mut().seL4_NBSendWaitWithMRs(
cptr.bits(),
info.into_inner(),
src.bits(),
Some(mr0),
Some(mr1),
Some(mr2),
Some(mr3),
)
});
RecvWithMRs {
info: MessageInfo::from_inner(raw_msg_info),
badge,
msg,
}
}
}

/// Corresponds to `seL4_Reply`.
Expand All @@ -232,6 +426,16 @@ pub fn reply(ipc_buffer: &mut IpcBuffer, info: MessageInfo) {
ipc_buffer.inner_mut().seL4_Reply(info.into_inner())
}

/// Corresponds to `seL4_ReplyWithMRs`.
#[sel4_cfg(not(KERNEL_MCS))]
#[allow(dead_code)]
pub fn reply_with_mrs<T: FastMessages>(ipc_buffer: &mut IpcBuffer, info: MessageInfo, messages: T) {
let [msg0, msg1, msg2, msg3] = messages.prepare_in();
ipc_buffer
.inner_mut()
.seL4_ReplyWithMRs(info.into_inner(), msg0, msg1, msg2, msg3)
}

/// Corresponds to `seL4_Yield`.
pub fn r#yield() {
sys::seL4_Yield()
Expand Down Expand Up @@ -260,6 +464,14 @@ pub struct CallWithMRs {
pub msg: [Word; NUM_FAST_MESSAGE_REGISTERS],
}

/// The result of [`cap::Notification::wait_with_mrs`].
#[sel4_cfg(KERNEL_MCS)]
pub struct WaitWithMRs {
pub info: WaitMessageInfo,
pub badge: Badge,
pub msg: [Word; NUM_FAST_MESSAGE_REGISTERS],
}

type ConcreteFastMessagesForIn = [Option<Word>; NUM_FAST_MESSAGE_REGISTERS];

type ConcreteFastMessagesForInOut = [Word; NUM_FAST_MESSAGE_REGISTERS];
Expand Down
Loading
Loading