vasilito/RedBear-OS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'ramfs_sys_call' into 'main'

Browse Source 
Use new redesigned redox-scheme in ramfs.

See merge request redox-os/base!2
This commit is contained in:
Jeremy Soller
2025-03-03 23:34:47 +00:00
parent 15bb765a78 897fabcbcd
commit 9fae54dc2b
4 changed files with 81 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.lock
Generated
+15 -15
View File
@@ -10,9 +10,9 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
[[package]]
name = "bitflags"
version = "2.8.0"
version = "2.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36"
checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd"
[[package]]
name = "block-buffer"
@@ -113,9 +113,9 @@ dependencies = [
[[package]]
name = "libc"
version = "0.2.169"
version = "0.2.170"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
checksum = "875b3680cb2f8f71bdcf9a30f38d48282f5d3c95cbf9b3fa57269bb5d5c06828"
[[package]]
name = "libredox"
@@ -155,9 +155,9 @@ dependencies = [
[[package]]
name = "proc-macro2"
version = "1.0.93"
version = "1.0.94"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99"
checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84"
dependencies = [
"unicode-ident",
]
@@ -176,9 +176,9 @@ dependencies = [
[[package]]
name = "quote"
version = "1.0.38"
version = "1.0.39"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc"
checksum = "c1f1914ce909e1658d9907913b4b91947430c7d9be598b15a1912935b8c04801"
dependencies = [
"proc-macro2",
]
@@ -190,7 +190,7 @@ dependencies = [
"indexmap",
"libredox",
"redox-daemon",
"redox-scheme 0.4.0",
"redox-scheme 0.5.0",
"redox_syscall",
"slab",
]
@@ -266,9 +266,9 @@ dependencies = [
[[package]]
name = "redox-scheme"
version = "0.4.0"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a28d292981c8f3338cb772b6024b08bcc597d0dd81020de17080a9a7b470ebb2"
checksum = "a96b9cfb034251dfb0aaa66a67059a7f0ea344039904d1d70cd36266af9c8a2f"
dependencies = [
"libredox",
"redox_syscall",
@@ -286,9 +286,9 @@ dependencies = [
[[package]]
name = "redox_syscall"
version = "0.5.9"
version = "0.5.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "82b568323e98e49e2a0899dcee453dd679fae22d69adf9b11dd508d1549b7e2f"
checksum = "0b8c0c260b63a8219631167be35e6a988e9554dbd323f8bd08439c8ed1302bd1"
dependencies = [
"bitflags",
]
@@ -322,9 +322,9 @@ dependencies = [
[[package]]
name = "syn"
version = "2.0.98"
version = "2.0.99"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "36147f1a48ae0ec2b5b3bc5b537d267457555a10dc06f3dbc8cb11ba3006d3b1"
checksum = "e02e925281e18ffd9d640e234264753c43edc62d64b2d4cf898f1bc5e75f3fc2"
dependencies = [
"proc-macro2",
"quote",
ramfs/Cargo.toml
+2 -2
View File
@@ -10,8 +10,8 @@ description = "In-memory filesystem for Redox, which is useful for early logging
[dependencies]
redox-daemon = "0.1.2"
redox_syscall = "0.5.9"
redox-scheme = "0.4"
redox_syscall = "0.5.10"
redox-scheme = "0.5"
libredox = "0.1.3"
indexmap = "2.5.0"
slab = "0.4.9"
ramfs/src/main.rs
+1 -1
View File
@@ -31,7 +31,7 @@ fn main() {
};
match request.kind() {
RequestKind::Call(call) => {
let response = call.handle_scheme(&mut scheme);
let response = call.handle_sync(&mut scheme);
socket
.write_responses(&[response], SignalBehavior::Restart)
ramfs/src/scheme.rs
+63 -38
View File
@@ -3,7 +3,6 @@ use std::io::{Cursor, Seek};
use std::iter;
use std::os::unix::io::AsRawFd;
use indexmap::IndexMap;
use syscall::dirent::{DirEntry, DirentBuf, DirentKind};
use syscall::error::{
EACCES, EBADF, EBADFD, EEXIST, EINVAL, EIO, EISDIR, ENOMEM, ENOSYS, ENOTDIR, ENOTEMPTY,
@@ -16,7 +15,10 @@ use syscall::schemev2::NewFdFlags;
use syscall::{Error, EventFlags, Result, Stat, StatVfs, TimeSpec, ENOENT};
use syscall::{MODE_DIR, MODE_FILE, MODE_PERM, MODE_TYPE};
use redox_scheme::{CallerCtx, OpenResult, Scheme as SchemeTrait};
use indexmap::IndexMap;
use redox_scheme::scheme::SchemeSync;
use redox_scheme::{CallerCtx, OpenResult};
use crate::filesystem::{self, File, FileData, Filesystem, Inode};
@@ -34,13 +36,7 @@ impl Scheme {
}
/// Remove a directory entry, where the entry can be both a file or a directory. Used by both
/// `unlink` and `rmdir`.
pub fn remove_dentry(
&mut self,
path: &str,
uid: u32,
gid: u32,
directory: bool,
) -> Result<usize> {
pub fn remove_dentry(&mut self, path: &str, uid: u32, gid: u32, directory: bool) -> Result<()> {
let removed_inode = {
let (parent_dir_inode, name_to_delete) =
self.filesystem.resolve_except_last(path, uid, gid)?;
@@ -107,7 +103,7 @@ impl Scheme {
self.filesystem.files.remove(&removed_inode);
}
Ok(0)
Ok(())
}
fn open_existing(&mut self, path: &str, flags: usize, uid: u32, gid: u32) -> Result<Inode> {
@@ -151,8 +147,8 @@ impl Scheme {
}
}
impl SchemeTrait for Scheme {
fn xopen(&mut self, path: &str, flags: usize, ctx: &CallerCtx) -> Result<OpenResult> {
impl SchemeSync for Scheme {
fn open(&mut self, path: &str, flags: usize, ctx: &CallerCtx) -> Result<OpenResult> {
let exists = self.filesystem.resolve(path, 0, 0).is_ok();
if flags & O_CREAT != 0 && flags & O_EXCL != 0 && exists {
return Err(Error::new(EEXIST));
@@ -245,14 +241,17 @@ impl SchemeTrait for Scheme {
flags: NewFdFlags::POSITIONED,
})
}
fn rmdir(&mut self, path: &str, uid: u32, gid: u32) -> Result<usize> {
self.remove_dentry(path, uid, gid, true)
fn rmdir(&mut self, path: &str, ctx: &CallerCtx) -> Result<()> {
self.remove_dentry(path, ctx.uid, ctx.gid, true)
}
fn unlink(&mut self, path: &str, uid: u32, gid: u32) -> Result<usize> {
self.remove_dentry(path, uid, gid, false)
fn unlink(&mut self, path: &str, ctx: &CallerCtx) -> Result<()> {
self.remove_dentry(path, ctx.uid, ctx.gid, false)
}
fn dup(&mut self, old_inode: usize, _buf: &[u8]) -> Result<usize> {
Ok(old_inode)
fn dup(&mut self, old_inode: usize, _buf: &[u8], _ctx: &CallerCtx) -> Result<OpenResult> {
Ok(OpenResult::ThisScheme {
number: old_inode,
flags: NewFdFlags::POSITIONED,
})
}
fn read(
&mut self,
@@ -260,6 +259,7 @@ impl SchemeTrait for Scheme {
buf: &mut [u8],
offset: u64,
fcntl_flags: u32,
_ctx: &CallerCtx,
) -> Result<usize> {
let Ok(offset) = usize::try_from(offset) else {
return Ok(0);
@@ -317,7 +317,14 @@ impl SchemeTrait for Scheme {
}
Ok(buf)
}
fn write(&mut self, inode: usize, buf: &[u8], offset: u64, _fcntl_flags: u32) -> Result<usize> {
fn write(
&mut self,
inode: usize,
buf: &[u8],
offset: u64,
_fcntl_flags: u32,
_ctx: &CallerCtx,
) -> Result<usize> {
let Ok(offset) = usize::try_from(offset) else {
return Ok(0);
};
@@ -347,7 +354,7 @@ impl SchemeTrait for Scheme {
Err(Error::new(EISDIR))
}
}
fn fchmod(&mut self, inode: usize, mode: u16) -> Result<usize> {
fn fchmod(&mut self, inode: usize, mode: u16, _ctx: &CallerCtx) -> Result<()> {
let file = self
.filesystem
.files
@@ -364,9 +371,9 @@ impl SchemeTrait for Scheme {
file.mode = mode | cur_type;
Ok(0)
Ok(())
}
fn fchown(&mut self, inode: usize, uid: u32, gid: u32) -> Result<usize> {
fn fchown(&mut self, inode: usize, uid: u32, gid: u32, _ctx: &CallerCtx) -> Result<()> {
let file = self
.filesystem
.files
@@ -376,12 +383,23 @@ impl SchemeTrait for Scheme {
file.uid = uid;
file.gid = gid;
Ok(())
}
fn fcntl(
&mut self,
_inode: usize,
_cmd: usize,
_arg: usize,
_ctx: &CallerCtx,
) -> Result<usize> {
Ok(0)
}
fn fcntl(&mut self, _inode: usize, _cmd: usize, _arg: usize) -> Result<usize> {
Ok(0)
}
fn fevent(&mut self, _inode: usize, _flags: EventFlags) -> Result<EventFlags> {
fn fevent(
&mut self,
_inode: usize,
_flags: EventFlags,
_ctx: &CallerCtx,
) -> Result<EventFlags> {
// TODO?
Err(Error::new(ENOSYS))
}
@@ -391,11 +409,17 @@ impl SchemeTrait for Scheme {
_offset: u64,
_size: usize,
_flags: syscall::MapFlags,
_ctx: &CallerCtx,
) -> Result<usize> {
// TODO
Err(Error::new(ENOSYS))
}
fn fpath(&mut self, mut current_inode: usize, buf: &mut [u8]) -> Result<usize> {
fn fpath(
&mut self,
mut current_inode: usize,
buf: &mut [u8],
_ctx: &CallerCtx,
) -> Result<usize> {
let mut chain = Vec::new();
let mut current_info = self
@@ -435,11 +459,11 @@ impl SchemeTrait for Scheme {
}
Ok(cursor.stream_position().unwrap() as usize)
}
fn frename(&mut self, _inode: usize, _path: &str, _uid: u32, _gid: u32) -> Result<usize> {
fn frename(&mut self, _inode: usize, _path: &str, _ctx: &CallerCtx) -> Result<usize> {
// TODO
Err(Error::new(ENOSYS))
}
fn fstat(&mut self, inode: usize, stat: &mut Stat) -> Result<usize> {
fn fstat(&mut self, inode: usize, stat: &mut Stat, _ctx: &CallerCtx) -> Result<()> {
let block_size = self.filesystem.block_size();
let file = self
.filesystem
@@ -495,9 +519,9 @@ impl SchemeTrait for Scheme {
.or(Err(Error::new(EOVERFLOW)))?,
};
Ok(0)
Ok(())
}
fn fstatvfs(&mut self, _inode: usize, stat: &mut StatVfs) -> Result<usize> {
fn fstatvfs(&mut self, _inode: usize, stat: &mut StatVfs, _ctx: &CallerCtx) -> Result<()> {
let abi_stat = libredox::call::fstatvfs(self.filesystem.memory_file.as_raw_fd() as usize)?;
// TODO: From impl
*stat = StatVfs {
@@ -507,12 +531,12 @@ impl SchemeTrait for Scheme {
f_bsize: abi_stat.f_bsize as u32,
};
Ok(0)
Ok(())
}
fn fsync(&mut self, _inode: usize) -> Result<usize> {
Ok(0)
fn fsync(&mut self, _inode: usize, _ctx: &CallerCtx) -> Result<()> {
Ok(())
}
fn ftruncate(&mut self, inode: usize, size: usize) -> Result<usize> {
fn ftruncate(&mut self, inode: usize, size: u64, _ctx: &CallerCtx) -> Result<()> {
let file = self
.filesystem
.files
@@ -522,6 +546,7 @@ impl SchemeTrait for Scheme {
if file.mode & MODE_TYPE == MODE_DIR {
return Err(Error::new(EISDIR));
}
let size = usize::try_from(size).map_err(|_| Error::new(EOVERFLOW))?;
match &mut file.data {
&mut FileData::File(ref mut bytes) => {
if size > bytes.len() {
@@ -534,9 +559,9 @@ impl SchemeTrait for Scheme {
}
&mut FileData::Directory(_) => return Err(Error::new(EBADFD)),
}
Ok(0)
Ok(())
}
fn futimens(&mut self, inode: usize, times: &[TimeSpec]) -> Result<usize> {
fn futimens(&mut self, inode: usize, times: &[TimeSpec], _ctx: &CallerCtx) -> Result<()> {
let file = self
.filesystem
.files
@@ -549,7 +574,7 @@ impl SchemeTrait for Scheme {
file.atime = new_atime;
file.mtime = new_mtime;
Ok(0)
Ok(())
}
}
impl Scheme {