kernel: make server IDs 128 bits

This makes server IDs a full 128 bits, and changes the argument to
CreateServer from 32-bits to 128-bits.

Signed-off-by: Sean Cross <sean@xobs.io>
This commit is contained in:
Sean Cross 2020-07-21 17:28:18 +08:00
parent 68691a757d
commit 8242f1b53f
4 changed files with 65 additions and 41 deletions

View file

@ -1228,12 +1228,18 @@ impl SystemServices {
/// queue.
/// * **ServerNotFound**: The server queue was full and a free slot could not
/// be found.
pub fn create_server(&mut self, pid: PID, name: usize) -> Result<SID, xous::Error> {
pub fn create_server(&mut self, pid: PID, sid: SID) -> Result<SID, xous::Error> {
// println!(
// "KERNEL({}): Looking through server list for free server",
// self.pid.get()
// );
// TODO: Come up with a way to randomize the server ID
let ppid = self.get_process(pid)?.ppid.get();
if ppid != 1 {
panic!("Clients cannot start servers yet");
}
for entry in self.servers.iter_mut() {
if entry == &None {
// println!(
@ -1241,14 +1247,6 @@ impl SystemServices {
// self.pid.get()
// );
// TODO: Come up with a way to randomize this
let sid = (
pid.get() as usize,
name as usize,
pid.get() as usize,
name as usize,
);
// // Allocate a single page for the server queue
// let (addr, size) = {
// let mut mm = MemoryManagerHandle::get();

View file

@ -96,7 +96,7 @@ fn send_scalar_message() {
// "Client" what our server ID is. Normally this would be done via
// an external nameserver.
let xous_server = as_process(move || {
let sid = xous::create_server(0x7884_3123).expect("couldn't create test server");
let sid = xous::create_server(b"send_scalar_mesg").expect("couldn't create test server");
server_addr_send.send(sid).unwrap();
let envelope = xous::receive_message(sid).expect("couldn't receive messages");
assert_eq!(
@ -148,7 +148,7 @@ fn send_move_message() {
let (server_addr_send, server_addr_recv) = channel();
let xous_server = as_process(move || {
let sid = xous::create_server(0x7884_3123).expect("couldn't create test server");
let sid = xous::create_server(b"send_move_messag").expect("couldn't create test server");
server_addr_send.send(sid).unwrap();
let envelope = xous::receive_message(sid).expect("couldn't receive messages");
// println!("Received message from {}", envelope.sender);
@ -196,7 +196,7 @@ fn send_borrow_message() {
let xous_server = as_process(move || {
// println!("SERVER: Creating server...");
let sid = xous::create_server(0x7884_3123).expect("couldn't create test server");
let sid = xous::create_server(b"send_borrow_mesg").expect("couldn't create test server");
server_addr_send.send(sid).unwrap();
// println!("SERVER: Receiving message...");
let envelope = xous::receive_message(sid).expect("couldn't receive messages");
@ -256,7 +256,7 @@ fn send_mutableborrow_message() {
let test_bytes = test_str.as_bytes();
let xous_server = as_process(move || {
let sid = xous::create_server(0x7884_3123).expect("couldn't create test server");
let sid = xous::create_server(b"send_mutborrow_m").expect("couldn't create test server");
server_addr_send.send(sid).unwrap();
let envelope = xous::receive_message(sid).expect("couldn't receive messages");
// println!("Received message from {}", envelope.sender);
@ -317,7 +317,7 @@ fn send_mutableborrow_message_repeat() {
let loops = 50_000;
let xous_server = as_process(move || {
let sid = xous::create_server(0x7884_3123).expect("couldn't create test server");
let sid = xous::create_server(b"send_mutborrow_r").expect("couldn't create test server");
server_addr_send.send(sid).unwrap();
for iteration in 0..loops {
@ -407,7 +407,7 @@ fn server_client_same_process() {
let main_thread = start_kernel(SERVER_SPEC);
let internal_server = as_process(|| {
let server = xous::create_server(0x53_4534).expect("couldn't create server");
let server = xous::create_server(b"s_c_same_process").expect("couldn't create server");
let connection = xous::connect(server).expect("couldn't connect to our own server");
let msg_contents = xous::ScalarMessage {
id: 1,
@ -447,7 +447,7 @@ fn multiple_contexts() {
let internal_server = as_process(|| {
let server = xous::create_server(0x53_4534).expect("couldn't create server");
let server = xous::create_server(b"multiple_context").expect("couldn't create server");
let connection = xous::connect(server).expect("couldn't connect to our own server");
let msg_contents = xous::ScalarMessage {
id: 1,

View file

@ -1,4 +1,4 @@
use core::num::{NonZeroUsize, NonZeroU8};
use core::num::{NonZeroU8, NonZeroUsize};
pub type MemoryAddress = NonZeroUsize;
pub type MemorySize = NonZeroUsize;
@ -10,7 +10,7 @@ pub type MessageSender = usize;
pub type Connection = usize;
/// Server ID
pub type SID = (usize, usize, usize, usize);
pub type SID = (u32, u32, u32, u32);
/// Connection ID
pub type CID = usize;
@ -265,7 +265,13 @@ impl MessageEnvelope {
Message::Scalar(m) => (3, m.to_usize()),
};
[
self.sender, ret.0, ret.1[0], ret.1[1], ret.1[2], ret.1[3], ret.1[4],
self.sender,
ret.0,
ret.1[0],
ret.1[1],
ret.1[2],
ret.1[3],
ret.1[4],
]
}
}
@ -390,7 +396,7 @@ impl Result {
[4, *count, *pid0, *ctx0, *pid1, *ctx1, *pid2, *ctx2]
}
Result::ResumeProcess => [5, 0, 0, 0, 0, 0, 0, 0],
Result::ServerID(sid) => [6, sid.0, sid.1, sid.2, sid.3, 0, 0, 0],
Result::ServerID(sid) => [6, sid.0 as _, sid.1 as _, sid.2 as _, sid.3 as _, 0, 0, 0],
Result::ConnectionID(cid) => [7, *cid, 0, 0, 0, 0, 0, 0],
Result::Message(me) => {
let me_enc = me.to_usize();
@ -428,7 +434,7 @@ impl Result {
}
4 => Result::ReadyThreads(src[1], src[2], src[3], src[4], src[5], src[6], src[7]),
5 => Result::ResumeProcess,
6 => Result::ServerID((src[1], src[2], src[3], src[4])),
6 => Result::ServerID((src[1] as _, src[2] as _, src[3] as _, src[4] as _)),
7 => Result::ConnectionID(src[1] as CID),
8 => {
let sender = src[1];

View file

@ -1,7 +1,7 @@
use crate::{
pid_from_usize, ThreadInit, CpuID, Error, MemoryAddress, MemoryFlags, MemoryMessage,
MemoryRange, MemorySize, MemoryType, Message, MessageEnvelope, MessageSender, Result,
ScalarMessage, SysCallResult, CID, PID, SID,
pid_from_usize, CpuID, Error, MemoryAddress, MemoryFlags, MemoryMessage, MemoryRange,
MemorySize, MemoryType, Message, MessageEnvelope, MessageSender, Result, ScalarMessage,
SysCallResult, ThreadInit, CID, PID, SID,
};
use num_derive::FromPrimitive;
use num_traits::FromPrimitive;
@ -222,7 +222,7 @@ pub enum SysCall {
/// * **OutOfMemory**: The server table was full and a new server couldn't
/// be created.
/// * **ServerExists**: The server hash is already in use.
CreateServer(usize /* server hash */),
CreateServer(SID /* server hash */),
/// Connect to a server. This turns a 128-bit Serever ID into a 32-bit
/// Connection ID.
@ -317,10 +317,10 @@ impl SysCall {
SysCall::WaitEvent => [SysCallNumber::WaitEvent as usize, 0, 0, 0, 0, 0, 0, 0],
SysCall::ReceiveMessage(sid) => [
SysCallNumber::ReceiveMessage as usize,
sid.0,
sid.1,
sid.2,
sid.3,
sid.0 as _,
sid.1 as _,
sid.2 as _,
sid.3 as _,
0,
0,
0,
@ -409,15 +409,22 @@ impl SysCall {
0,
],
SysCall::CreateServer(a1) => {
[SysCallNumber::CreateServer as usize, *a1, 0, 0, 0, 0, 0, 0]
}
SysCall::CreateServer(a1) => [
SysCallNumber::CreateServer as usize,
a1.0 as _,
a1.1 as _,
a1.2 as _,
a1.3 as _,
0,
0,
0,
],
SysCall::Connect(sid) => [
SysCallNumber::Connect as usize,
sid.0,
sid.1,
sid.2,
sid.3,
sid.0 as _,
sid.1 as _,
sid.2 as _,
sid.3 as _,
0,
0,
0,
@ -526,7 +533,9 @@ impl SysCall {
),
Some(SysCallNumber::Yield) => SysCall::Yield,
Some(SysCallNumber::WaitEvent) => SysCall::WaitEvent,
Some(SysCallNumber::ReceiveMessage) => SysCall::ReceiveMessage((a1, a2, a3, a4)),
Some(SysCallNumber::ReceiveMessage) => {
SysCall::ReceiveMessage((a1 as _, a2 as _, a3 as _, a4 as _))
}
Some(SysCallNumber::ReturnToParentI) => {
SysCall::ReturnToParentI(pid_from_usize(a1)?, a2)
}
@ -554,8 +563,10 @@ impl SysCall {
MemoryAddress::new(a3).ok_or(Error::InvalidSyscall)?,
a4,
),
Some(SysCallNumber::CreateServer) => SysCall::CreateServer(a1),
Some(SysCallNumber::Connect) => SysCall::Connect((a1, a2, a3, a4)),
Some(SysCallNumber::CreateServer) => {
SysCall::CreateServer((a1 as _, a2 as _, a3 as _, a4 as _))
}
Some(SysCallNumber::Connect) => SysCall::Connect((a1 as _, a2 as _, a3 as _, a4 as _)),
Some(SysCallNumber::SendMessage) => match a2 {
1 => SysCall::SendMessage(
a1,
@ -715,8 +726,17 @@ pub fn claim_interrupt(
///
/// * **ServerExists**: A server has already registered with that name
/// * **InvalidString**: The name was not a valid UTF-8 string
pub fn create_server(name: usize) -> core::result::Result<SID, Error> {
let result = rsyscall(SysCall::CreateServer(name))?;
pub fn create_server(name_bytes: &[u8; 16]) -> core::result::Result<SID, Error> {
use std::convert::TryInto;
let mut sid = (0, 0, 0, 0);
let mut byte_iter = name_bytes.chunks_exact(4);
sid.0 = u32::from_le_bytes(byte_iter.next().unwrap().try_into().unwrap());
sid.1 = u32::from_le_bytes(byte_iter.next().unwrap().try_into().unwrap());
sid.2 = u32::from_le_bytes(byte_iter.next().unwrap().try_into().unwrap());
sid.3 = u32::from_le_bytes(byte_iter.next().unwrap().try_into().unwrap());
assert!(byte_iter.next().is_none());
let result = rsyscall(SysCall::CreateServer(sid))?;
if let Result::ServerID(sid) = result {
Ok(sid)
} else if let Result::Error(e) = result {