[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20230726164535.230515-2-amiculas@cisco.com>
Date: Wed, 26 Jul 2023 19:45:25 +0300
From: Ariel Miculas <amiculas@...co.com>
To: rust-for-linux@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, linux-fsdevel@...r.kernel.org,
tycho@...ho.pizza, brauner@...nel.org, viro@...iv.linux.org.uk,
ojeda@...nel.org, alex.gaynor@...il.com, wedsonaf@...il.com,
Ariel Miculas <amiculas@...co.com>
Subject: [RFC PATCH v2 01/10] samples: puzzlefs: add initial puzzlefs sample, copied from rust_fs.rs
Signed-off-by: Ariel Miculas <amiculas@...co.com>
---
samples/rust/Kconfig | 10 ++++
samples/rust/Makefile | 1 +
samples/rust/puzzlefs.rs | 105 +++++++++++++++++++++++++++++++++++++++
3 files changed, 116 insertions(+)
create mode 100644 samples/rust/puzzlefs.rs
diff --git a/samples/rust/Kconfig b/samples/rust/Kconfig
index 2bd736f99189..05ca21fbba06 100644
--- a/samples/rust/Kconfig
+++ b/samples/rust/Kconfig
@@ -40,6 +40,16 @@ config SAMPLE_RUST_FS
If unsure, say N.
+config SAMPLE_PUZZLEFS
+ tristate "Puzzlefs file system"
+ help
+ This option builds the Rust puzzlefs file system sample.
+
+ To compile this as a module, choose M here:
+ the module will be called puzzlefs.
+
+ If unsure, say N.
+
config SAMPLE_RUST_HOSTPROGS
bool "Host programs"
help
diff --git a/samples/rust/Makefile b/samples/rust/Makefile
index e5941037e673..364a38dbf90b 100644
--- a/samples/rust/Makefile
+++ b/samples/rust/Makefile
@@ -3,5 +3,6 @@
obj-$(CONFIG_SAMPLE_RUST_MINIMAL) += rust_minimal.o
obj-$(CONFIG_SAMPLE_RUST_PRINT) += rust_print.o
obj-$(CONFIG_SAMPLE_RUST_FS) += rust_fs.o
+obj-$(CONFIG_SAMPLE_PUZZLEFS) += puzzlefs.o
subdir-$(CONFIG_SAMPLE_RUST_HOSTPROGS) += hostprogs
diff --git a/samples/rust/puzzlefs.rs b/samples/rust/puzzlefs.rs
new file mode 100644
index 000000000000..0cf42762e81a
--- /dev/null
+++ b/samples/rust/puzzlefs.rs
@@ -0,0 +1,105 @@
+// SPDX-License-Identifier: GPL-2.0
+
+//! Rust file system sample.
+
+use kernel::module_fs;
+use kernel::prelude::*;
+use kernel::{c_str, file, fs, io_buffer::IoBufferWriter};
+
+module_fs! {
+ type: PuzzleFsModule,
+ name: "puzzlefs",
+ author: "Ariel Miculas",
+ license: "GPL",
+}
+
+struct PuzzleFsModule;
+
+#[vtable]
+impl fs::Context<Self> for PuzzleFsModule {
+ type Data = ();
+
+ kernel::define_fs_params! {(),
+ {flag, "flag", |_, v| { pr_info!("flag passed-in: {v}\n"); Ok(()) } },
+ {flag_no, "flagno", |_, v| { pr_info!("flagno passed-in: {v}\n"); Ok(()) } },
+ {bool, "bool", |_, v| { pr_info!("bool passed-in: {v}\n"); Ok(()) } },
+ {u32, "u32", |_, v| { pr_info!("u32 passed-in: {v}\n"); Ok(()) } },
+ {u32oct, "u32oct", |_, v| { pr_info!("u32oct passed-in: {v}\n"); Ok(()) } },
+ {u32hex, "u32hex", |_, v| { pr_info!("u32hex passed-in: {v}\n"); Ok(()) } },
+ {s32, "s32", |_, v| { pr_info!("s32 passed-in: {v}\n"); Ok(()) } },
+ {u64, "u64", |_, v| { pr_info!("u64 passed-in: {v}\n"); Ok(()) } },
+ {string, "string", |_, v| { pr_info!("string passed-in: {v}\n"); Ok(()) } },
+ {enum, "enum", [("first", 10), ("second", 20)], |_, v| {
+ pr_info!("enum passed-in: {v}\n"); Ok(()) }
+ },
+ }
+
+ fn try_new() -> Result {
+ Ok(())
+ }
+}
+
+impl fs::Type for PuzzleFsModule {
+ type Context = Self;
+ type INodeData = &'static [u8];
+ const SUPER_TYPE: fs::Super = fs::Super::Independent;
+ const NAME: &'static CStr = c_str!("puzzlefs");
+ const FLAGS: i32 = fs::flags::USERNS_MOUNT;
+ const DCACHE_BASED: bool = true;
+
+ fn fill_super(_data: (), sb: fs::NewSuperBlock<'_, Self>) -> Result<&fs::SuperBlock<Self>> {
+ let sb = sb.init(
+ (),
+ &fs::SuperParams {
+ magic: 0x72757374,
+ ..fs::SuperParams::DEFAULT
+ },
+ )?;
+ let root = sb.try_new_populated_root_dentry(
+ &[],
+ kernel::fs_entries![
+ file("test1", 0o600, "abc\n".as_bytes(), FsFile),
+ file("test2", 0o600, "def\n".as_bytes(), FsFile),
+ char("test3", 0o600, [].as_slice(), (10, 125)),
+ sock("test4", 0o755, [].as_slice()),
+ fifo("test5", 0o755, [].as_slice()),
+ block("test6", 0o755, [].as_slice(), (1, 1)),
+ dir(
+ "dir1",
+ 0o755,
+ [].as_slice(),
+ [
+ file("test1", 0o600, "abc\n".as_bytes(), FsFile),
+ file("test2", 0o600, "def\n".as_bytes(), FsFile),
+ ]
+ ),
+ ],
+ )?;
+ let sb = sb.init_root(root)?;
+ Ok(sb)
+ }
+}
+
+struct FsFile;
+
+#[vtable]
+impl file::Operations for FsFile {
+ type OpenData = &'static [u8];
+
+ fn open(_context: &Self::OpenData, _file: &file::File) -> Result<Self::Data> {
+ Ok(())
+ }
+
+ fn read(
+ _data: (),
+ file: &file::File,
+ writer: &mut impl IoBufferWriter,
+ offset: u64,
+ ) -> Result<usize> {
+ file::read_from_slice(
+ file.inode::<PuzzleFsModule>().ok_or(EINVAL)?.fs_data(),
+ writer,
+ offset,
+ )
+ }
+}
--
2.41.0
Powered by blists - more mailing lists