From: Wedson Almeida Filho <wedsonaf@gmail.com>
To: Alexander Viro <viro@zeniv.linux.org.uk>,
Christian Brauner <brauner@kernel.org>,
Matthew Wilcox <willy@infradead.org>
Cc: Kent Overstreet <kent.overstreet@gmail.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-fsdevel@vger.kernel.org, rust-for-linux@vger.kernel.org,
Wedson Almeida Filho <walmeida@microsoft.com>
Subject: [RFC PATCH 07/19] rust: fs: introduce `FileSystem::read_dir`
Date: Wed, 18 Oct 2023 09:25:06 -0300 [thread overview]
Message-ID: <20231018122518.128049-8-wedsonaf@gmail.com> (raw)
In-Reply-To: <20231018122518.128049-1-wedsonaf@gmail.com>
From: Wedson Almeida Filho <walmeida@microsoft.com>
Allow Rust file systems to report the contents of their directory
inodes. The reported entries cannot be opened yet.
Signed-off-by: Wedson Almeida Filho <walmeida@microsoft.com>
---
rust/kernel/fs.rs | 193 +++++++++++++++++++++++++++++++++++++-
samples/rust/rust_rofs.rs | 49 +++++++++-
2 files changed, 236 insertions(+), 6 deletions(-)
diff --git a/rust/kernel/fs.rs b/rust/kernel/fs.rs
index f3a41cf57502..89611c44e4c5 100644
--- a/rust/kernel/fs.rs
+++ b/rust/kernel/fs.rs
@@ -28,6 +28,70 @@ pub trait FileSystem {
/// This is called during initialisation of a superblock after [`FileSystem::super_params`] has
/// completed successfully.
fn init_root(sb: &SuperBlock<Self>) -> Result<ARef<INode<Self>>>;
+
+ /// Reads directory entries from directory inodes.
+ ///
+ /// [`DirEmitter::pos`] holds the current position of the directory reader.
+ fn read_dir(inode: &INode<Self>, emitter: &mut DirEmitter) -> Result;
+}
+
+/// The types of directory entries reported by [`FileSystem::read_dir`].
+#[repr(u32)]
+#[derive(Copy, Clone)]
+pub enum DirEntryType {
+ /// Unknown type.
+ Unknown = bindings::DT_UNKNOWN,
+
+ /// Named pipe (first-in, first-out) type.
+ Fifo = bindings::DT_FIFO,
+
+ /// Character device type.
+ Chr = bindings::DT_CHR,
+
+ /// Directory type.
+ Dir = bindings::DT_DIR,
+
+ /// Block device type.
+ Blk = bindings::DT_BLK,
+
+ /// Regular file type.
+ Reg = bindings::DT_REG,
+
+ /// Symbolic link type.
+ Lnk = bindings::DT_LNK,
+
+ /// Named unix-domain socket type.
+ Sock = bindings::DT_SOCK,
+
+ /// White-out type.
+ Wht = bindings::DT_WHT,
+}
+
+impl From<INodeType> for DirEntryType {
+ fn from(value: INodeType) -> Self {
+ match value {
+ INodeType::Dir => DirEntryType::Dir,
+ }
+ }
+}
+
+impl core::convert::TryFrom<u32> for DirEntryType {
+ type Error = crate::error::Error;
+
+ fn try_from(v: u32) -> Result<Self> {
+ match v {
+ v if v == Self::Unknown as u32 => Ok(Self::Unknown),
+ v if v == Self::Fifo as u32 => Ok(Self::Fifo),
+ v if v == Self::Chr as u32 => Ok(Self::Chr),
+ v if v == Self::Dir as u32 => Ok(Self::Dir),
+ v if v == Self::Blk as u32 => Ok(Self::Blk),
+ v if v == Self::Reg as u32 => Ok(Self::Reg),
+ v if v == Self::Lnk as u32 => Ok(Self::Lnk),
+ v if v == Self::Sock as u32 => Ok(Self::Sock),
+ v if v == Self::Wht as u32 => Ok(Self::Wht),
+ _ => Err(EDOM),
+ }
+ }
}
/// A registration of a file system.
@@ -161,9 +225,7 @@ pub fn init(self, params: INodeParams) -> Result<ARef<INode<T>>> {
let mode = match params.typ {
INodeType::Dir => {
- // SAFETY: `simple_dir_operations` never changes, it's safe to reference it.
- inode.__bindgen_anon_3.i_fop = unsafe { &bindings::simple_dir_operations };
-
+ inode.__bindgen_anon_3.i_fop = &Tables::<T>::DIR_FILE_OPERATIONS;
// SAFETY: `simple_dir_inode_operations` never changes, it's safe to reference it.
inode.i_op = unsafe { &bindings::simple_dir_inode_operations };
bindings::S_IFDIR
@@ -403,6 +465,126 @@ impl<T: FileSystem + ?Sized> Tables<T> {
free_cached_objects: None,
shutdown: None,
};
+
+ const DIR_FILE_OPERATIONS: bindings::file_operations = bindings::file_operations {
+ owner: ptr::null_mut(),
+ llseek: Some(bindings::generic_file_llseek),
+ read: Some(bindings::generic_read_dir),
+ write: None,
+ read_iter: None,
+ write_iter: None,
+ iopoll: None,
+ iterate_shared: Some(Self::read_dir_callback),
+ poll: None,
+ unlocked_ioctl: None,
+ compat_ioctl: None,
+ mmap: None,
+ mmap_supported_flags: 0,
+ open: None,
+ flush: None,
+ release: None,
+ fsync: None,
+ fasync: None,
+ lock: None,
+ get_unmapped_area: None,
+ check_flags: None,
+ flock: None,
+ splice_write: None,
+ splice_read: None,
+ splice_eof: None,
+ setlease: None,
+ fallocate: None,
+ show_fdinfo: None,
+ copy_file_range: None,
+ remap_file_range: None,
+ fadvise: None,
+ uring_cmd: None,
+ uring_cmd_iopoll: None,
+ };
+
+ unsafe extern "C" fn read_dir_callback(
+ file: *mut bindings::file,
+ ctx_ptr: *mut bindings::dir_context,
+ ) -> core::ffi::c_int {
+ from_result(|| {
+ // SAFETY: The C API guarantees that `file` is valid for read. And since `f_inode` is
+ // immutable, we can read it directly.
+ let inode = unsafe { &*(*file).f_inode.cast::<INode<T>>() };
+
+ // SAFETY: The C API guarantees that this is the only reference to the `dir_context`
+ // instance.
+ let emitter = unsafe { &mut *ctx_ptr.cast::<DirEmitter>() };
+ let orig_pos = emitter.pos();
+
+ // Call the module implementation. We ignore errors if directory entries have been
+ // succesfully emitted: this is because we want users to see them before the error.
+ match T::read_dir(inode, emitter) {
+ Ok(_) => Ok(0),
+ Err(e) => {
+ if emitter.pos() == orig_pos {
+ Err(e)
+ } else {
+ Ok(0)
+ }
+ }
+ }
+ })
+ }
+}
+
+/// Directory entry emitter.
+///
+/// This is used in [`FileSystem::read_dir`] implementations to report the directory entry.
+#[repr(transparent)]
+pub struct DirEmitter(bindings::dir_context);
+
+impl DirEmitter {
+ /// Returns the current position of the emitter.
+ pub fn pos(&self) -> i64 {
+ self.0.pos
+ }
+
+ /// Emits a directory entry.
+ ///
+ /// `pos_inc` is the number with which to increment the current position on success.
+ ///
+ /// `name` is the name of the entry.
+ ///
+ /// `ino` is the inode number of the entry.
+ ///
+ /// `etype` is the type of the entry.
+ ///
+ /// Returns `false` when the entry could not be emitted, possibly because the user-provided
+ /// buffer is full.
+ pub fn emit(&mut self, pos_inc: i64, name: &[u8], ino: Ino, etype: DirEntryType) -> bool {
+ let Ok(name_len) = i32::try_from(name.len()) else {
+ return false;
+ };
+
+ let Some(actor) = self.0.actor else {
+ return false;
+ };
+
+ let Some(new_pos) = self.0.pos.checked_add(pos_inc) else {
+ return false;
+ };
+
+ // SAFETY: `name` is valid at least for the duration of the `actor` call.
+ let ret = unsafe {
+ actor(
+ &mut self.0,
+ name.as_ptr().cast(),
+ name_len,
+ self.0.pos,
+ ino,
+ etype as _,
+ )
+ };
+ if ret {
+ self.0.pos = new_pos;
+ }
+ ret
+ }
}
/// Kernel module that exposes a single file system implemented by `T`.
@@ -431,7 +613,7 @@ fn init(module: &'static ThisModule) -> impl PinInit<Self, Error> {
///
/// ```
/// # mod module_fs_sample {
-/// use kernel::fs::{INode, NewSuperBlock, SuperBlock, SuperParams};
+/// use kernel::fs::{DirEmitter, INode, NewSuperBlock, SuperBlock, SuperParams};
/// use kernel::prelude::*;
/// use kernel::{c_str, fs, types::ARef};
///
@@ -452,6 +634,9 @@ fn init(module: &'static ThisModule) -> impl PinInit<Self, Error> {
/// fn init_root(_sb: &SuperBlock<Self>) -> Result<ARef<INode<Self>>> {
/// todo!()
/// }
+/// fn read_dir(_: &INode<Self>, _: &mut DirEmitter) -> Result {
+/// todo!()
+/// }
/// }
/// # }
/// ```
diff --git a/samples/rust/rust_rofs.rs b/samples/rust/rust_rofs.rs
index 9e5f4c7d1c06..4e61a94afa70 100644
--- a/samples/rust/rust_rofs.rs
+++ b/samples/rust/rust_rofs.rs
@@ -2,7 +2,9 @@
//! Rust read-only file system sample.
-use kernel::fs::{INode, INodeParams, INodeType, NewSuperBlock, SuperBlock, SuperParams};
+use kernel::fs::{
+ DirEmitter, INode, INodeParams, INodeType, NewSuperBlock, SuperBlock, SuperParams,
+};
use kernel::prelude::*;
use kernel::{c_str, fs, time::UNIX_EPOCH, types::ARef, types::Either};
@@ -14,6 +16,30 @@
license: "GPL",
}
+struct Entry {
+ name: &'static [u8],
+ ino: u64,
+ etype: INodeType,
+}
+
+const ENTRIES: [Entry; 3] = [
+ Entry {
+ name: b".",
+ ino: 1,
+ etype: INodeType::Dir,
+ },
+ Entry {
+ name: b"..",
+ ino: 1,
+ etype: INodeType::Dir,
+ },
+ Entry {
+ name: b"subdir",
+ ino: 2,
+ etype: INodeType::Dir,
+ },
+];
+
struct RoFs;
impl fs::FileSystem for RoFs {
const NAME: &'static CStr = c_str!("rust-fs");
@@ -33,7 +59,7 @@ fn init_root(sb: &SuperBlock<Self>) -> Result<ARef<INode<Self>>> {
Either::Right(new) => new.init(INodeParams {
typ: INodeType::Dir,
mode: 0o555,
- size: 1,
+ size: ENTRIES.len().try_into()?,
blocks: 1,
nlink: 2,
uid: 0,
@@ -44,4 +70,23 @@ fn init_root(sb: &SuperBlock<Self>) -> Result<ARef<INode<Self>>> {
}),
}
}
+
+ fn read_dir(inode: &INode<Self>, emitter: &mut DirEmitter) -> Result {
+ if inode.ino() != 1 {
+ return Ok(());
+ }
+
+ let pos = emitter.pos();
+ if pos >= ENTRIES.len().try_into()? {
+ return Ok(());
+ }
+
+ for e in ENTRIES.iter().skip(pos.try_into()?) {
+ if !emitter.emit(1, e.name, e.ino, e.etype.into()) {
+ break;
+ }
+ }
+
+ Ok(())
+ }
}
--
2.34.1
next prev parent reply other threads:[~2023-10-18 12:26 UTC|newest]
Thread overview: 125+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-18 12:24 [RFC PATCH 00/19] Rust abstractions for VFS Wedson Almeida Filho
2023-10-18 12:25 ` [RFC PATCH 01/19] rust: fs: add registration/unregistration of file systems Wedson Almeida Filho
2023-10-18 15:38 ` Benno Lossin
2024-01-10 18:32 ` Wedson Almeida Filho
2024-01-25 9:15 ` Benno Lossin
2023-10-18 12:25 ` [RFC PATCH 02/19] rust: fs: introduce the `module_fs` macro Wedson Almeida Filho
2023-10-18 12:25 ` [RFC PATCH 03/19] samples: rust: add initial ro file system sample Wedson Almeida Filho
2023-10-28 16:18 ` Alice Ryhl
2024-01-10 18:25 ` Wedson Almeida Filho
2023-10-18 12:25 ` [RFC PATCH 04/19] rust: fs: introduce `FileSystem::super_params` Wedson Almeida Filho
2023-10-18 16:34 ` Benno Lossin
2023-10-28 16:39 ` Alice Ryhl
2023-10-30 8:21 ` Benno Lossin
2023-10-30 21:36 ` Alice Ryhl
2023-10-20 15:04 ` Ariel Miculas (amiculas)
2024-01-03 12:25 ` Andreas Hindborg (Samsung)
2023-10-18 12:25 ` [RFC PATCH 05/19] rust: fs: introduce `INode<T>` Wedson Almeida Filho
2023-10-28 18:00 ` Alice Ryhl
2024-01-03 12:45 ` Andreas Hindborg (Samsung)
2024-01-03 12:54 ` Andreas Hindborg (Samsung)
2024-01-04 5:20 ` Darrick J. Wong
2024-01-04 9:57 ` Andreas Hindborg (Samsung)
2024-01-10 9:45 ` Benno Lossin
2024-01-04 5:14 ` Darrick J. Wong
2024-01-24 18:17 ` Wedson Almeida Filho
2023-10-18 12:25 ` [RFC PATCH 06/19] rust: fs: introduce `FileSystem::init_root` Wedson Almeida Filho
2023-10-19 14:30 ` Benno Lossin
2023-10-20 0:52 ` Boqun Feng
2023-10-21 13:48 ` Benno Lossin
2023-10-21 15:57 ` Boqun Feng
2023-10-21 17:01 ` Matthew Wilcox
2023-10-21 19:33 ` Boqun Feng
2023-10-23 5:29 ` Dave Chinner
2023-10-23 12:55 ` Wedson Almeida Filho
2023-10-30 2:29 ` Dave Chinner
2023-10-31 20:49 ` Wedson Almeida Filho
2023-11-08 4:54 ` Dave Chinner
2023-11-08 6:15 ` Wedson Almeida Filho
2023-10-20 0:30 ` Boqun Feng
2023-10-23 12:36 ` Wedson Almeida Filho
2024-01-03 13:29 ` Andreas Hindborg (Samsung)
2024-01-24 4:07 ` Wedson Almeida Filho
2023-10-18 12:25 ` Wedson Almeida Filho [this message]
2023-10-21 8:33 ` [RFC PATCH 07/19] rust: fs: introduce `FileSystem::read_dir` Benno Lossin
2024-01-03 14:09 ` Andreas Hindborg (Samsung)
2024-01-21 21:00 ` Askar Safin
2024-01-21 21:51 ` Dave Chinner
2023-10-18 12:25 ` [RFC PATCH 08/19] rust: fs: introduce `FileSystem::lookup` Wedson Almeida Filho
2023-10-18 12:25 ` [RFC PATCH 09/19] rust: folio: introduce basic support for folios Wedson Almeida Filho
2023-10-18 17:17 ` Matthew Wilcox
2023-10-18 18:32 ` Wedson Almeida Filho
2023-10-18 19:21 ` Matthew Wilcox
2023-10-19 13:25 ` Wedson Almeida Filho
2023-10-20 4:11 ` Matthew Wilcox
2023-10-20 15:17 ` Matthew Wilcox
2023-10-23 12:32 ` Wedson Almeida Filho
2023-10-23 10:48 ` Andreas Hindborg (Samsung)
2023-10-23 14:28 ` Matthew Wilcox
2023-10-24 15:04 ` Ariel Miculas (amiculas)
2023-10-23 12:29 ` Wedson Almeida Filho
2023-10-21 9:21 ` Benno Lossin
2023-10-18 12:25 ` [RFC PATCH 10/19] rust: fs: introduce `FileSystem::read_folio` Wedson Almeida Filho
2023-11-07 22:18 ` Matthew Wilcox
2023-11-07 22:22 ` Al Viro
2023-11-08 0:35 ` Wedson Almeida Filho
2023-11-08 0:56 ` Al Viro
2023-11-08 2:39 ` Wedson Almeida Filho
2023-10-18 12:25 ` [RFC PATCH 11/19] rust: fs: introduce `FileSystem::read_xattr` Wedson Almeida Filho
2023-10-18 13:06 ` Ariel Miculas (amiculas)
2023-10-19 13:35 ` Wedson Almeida Filho
2023-10-18 12:25 ` [RFC PATCH 12/19] rust: fs: introduce `FileSystem::statfs` Wedson Almeida Filho
2024-01-03 14:13 ` Andreas Hindborg (Samsung)
2024-01-04 5:33 ` Darrick J. Wong
2024-01-24 4:24 ` Wedson Almeida Filho
2023-10-18 12:25 ` [RFC PATCH 13/19] rust: fs: introduce more inode types Wedson Almeida Filho
2023-10-18 12:25 ` [RFC PATCH 14/19] rust: fs: add per-superblock data Wedson Almeida Filho
2023-10-25 15:51 ` Ariel Miculas (amiculas)
2023-10-26 13:46 ` Ariel Miculas (amiculas)
2024-01-03 14:16 ` Andreas Hindborg (Samsung)
2023-10-18 12:25 ` [RFC PATCH 15/19] rust: fs: add basic support for fs buffer heads Wedson Almeida Filho
2024-01-03 14:17 ` Andreas Hindborg (Samsung)
2023-10-18 12:25 ` [RFC PATCH 16/19] rust: fs: allow file systems backed by a block device Wedson Almeida Filho
2023-10-21 13:39 ` Benno Lossin
2024-01-24 4:14 ` Wedson Almeida Filho
2024-01-03 14:38 ` Andreas Hindborg (Samsung)
2023-10-18 12:25 ` [RFC PATCH 17/19] rust: fs: allow per-inode data Wedson Almeida Filho
2023-10-21 13:57 ` Benno Lossin
2024-01-03 14:39 ` Andreas Hindborg (Samsung)
2023-10-18 12:25 ` [RFC PATCH 18/19] rust: fs: export file type from mode constants Wedson Almeida Filho
2023-10-18 12:25 ` [RFC PATCH 19/19] tarfs: introduce tar fs Wedson Almeida Filho
2023-10-18 16:57 ` Matthew Wilcox
2023-10-18 17:05 ` Wedson Almeida Filho
2023-10-18 17:20 ` Matthew Wilcox
2023-10-18 18:07 ` Wedson Almeida Filho
2024-01-24 5:05 ` Matthew Wilcox
2024-01-24 5:23 ` Matthew Wilcox
2024-01-24 18:26 ` Wedson Almeida Filho
2024-01-24 21:05 ` Dave Chinner
2024-01-24 21:28 ` Matthew Wilcox
2024-01-24 5:34 ` Gao Xiang
2023-10-18 13:40 ` [RFC PATCH 00/19] Rust abstractions for VFS Ariel Miculas (amiculas)
2023-10-18 17:12 ` Wedson Almeida Filho
2023-10-29 20:31 ` Matthew Wilcox
2023-10-31 20:14 ` Wedson Almeida Filho
2024-01-03 18:02 ` Matthew Wilcox
2024-01-03 19:04 ` Wedson Almeida Filho
2024-01-03 19:53 ` Al Viro
2024-01-03 20:38 ` Kent Overstreet
2024-01-04 1:49 ` Matthew Wilcox
2024-01-09 18:25 ` Wedson Almeida Filho
2024-01-09 19:30 ` Matthew Wilcox
2024-01-03 19:14 ` Kent Overstreet
2024-01-03 20:41 ` Al Viro
2024-01-09 19:13 ` Wedson Almeida Filho
2024-01-09 19:25 ` Matthew Wilcox
2024-01-09 19:32 ` Greg Kroah-Hartman
2024-01-10 7:49 ` Wedson Almeida Filho
2024-01-10 7:57 ` Greg Kroah-Hartman
2024-01-10 12:56 ` Matthew Wilcox
2024-01-09 22:19 ` Dave Chinner
2024-01-10 19:19 ` Kent Overstreet
2024-01-24 13:08 ` FUJITA Tomonori
2024-01-24 19:49 ` Kent Overstreet
2024-01-05 0:04 ` David Howells
2024-01-05 15:54 ` Jarkko Sakkinen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231018122518.128049-8-wedsonaf@gmail.com \
--to=wedsonaf@gmail.com \
--cc=brauner@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=kent.overstreet@gmail.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=rust-for-linux@vger.kernel.org \
--cc=viro@zeniv.linux.org.uk \
--cc=walmeida@microsoft.com \
--cc=willy@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).