feat: add virtio-rng into fs random

Author: lhw

Cargo.lock

@@ -77,7 +77,7 @@ display = [
 ]
 
 #virtio random number generator
-virtio-rng = ["ruxdriver/virtio-rng","ruxruntime/rng"]
+virtio-rng = ["ruxdriver/virtio-rng","ruxruntime/rng","ruxfs/rng"]
 
 # 9P
 virtio-9p = [

api/ruxfeat/Cargo.toml

@@ -139,6 +139,7 @@ impl AllDevices {
     /// Probes all supported devices.
     fn probe(&mut self) {
         for_each_drivers!(type Driver, {
+            info!("Probing for {:?} devices...", core::any::type_name::<Driver>());
             if let Some(dev) = Driver::probe_global() {
                 info!(
                     "registered a new {:?} device: {:?}",

modules/ruxdriver/src/lib.rs

@@ -28,6 +28,7 @@ myfs = []
 use-ramdisk = []
 alloc = ["axalloc"]
 fp_simd = []
+rng = ["dep:ruxrand"]
 
 default = ["devfs", "ramfs", "procfs", "sysfs", "etcfs", "mntfs"]
 
@@ -49,6 +50,7 @@ ruxfifo = { path = "../../crates/ruxfifo" }
 crate_interface = { version = "0.1.1" }
 ruxfdtable = { path = "../ruxfdtable" }
 ruxdriver = { path = "../ruxdriver", features = ["block"] }
+ruxrand = { path = "../ruxrand", optional = true }
 axalloc = { path = "../axalloc", optional = true }
 memory_addr = "0.1.0"
 # lwext4_rust = { git = "https://github.com/elliott10/lwext4_rust", optional = true }

modules/ruxfs/Cargo.toml

@@ -48,6 +48,8 @@ pub mod fifo;
 mod file;
 pub mod fops;
 pub mod fuse_st;
+#[cfg(feature = "rng")]
+pub mod rng_rand;
 pub mod root;
 
 pub use directory::Directory;

modules/ruxfs/src/lib.rs

@@ -18,7 +18,13 @@ use crate::fs;
 pub(crate) fn devfs() -> Arc<fs::devfs::DeviceFileSystem> {
     let null = fs::devfs::NullDev;
     let zero = fs::devfs::ZeroDev;
+    #[cfg(feature = "rng")]
+    let random = crate::rng_rand::RandomDev;
+    #[cfg(feature = "rng")]
+    let urandom = crate::rng_rand::RandomDev;
+    #[cfg(not(feature = "rng"))]
     let random = fs::devfs::RandomDev;
+    #[cfg(not(feature = "rng"))]
     let urandom = fs::devfs::RandomDev;
     let fuse = crate::devfuse::FuseDev::new();
     let pts = fs::devfs::init_pts();

modules/ruxfs/src/mounts.rs

@@ -0,0 +1,51 @@
+/* Copyright (c) [2023] [Syswonder Community]
+ *   [Rukos] is licensed under Mulan PSL v2.
+ *   You can use this software according to the terms and conditions of the Mulan PSL v2.
+ *   You may obtain a copy of Mulan PSL v2 at:
+ *               http://license.coscl.org.cn/MulanPSL2
+ *   THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+ *   See the Mulan PSL v2 for more details.
+ */
+//! random number generator from ruxrand for `/dev/random` and `/dev/urandom`
+
+use axfs_vfs::{VfsNodeAttr, VfsNodeOps, VfsNodePerm, VfsNodeType, VfsResult};
+
+use axerrno::AxError;
+
+use ruxrand::request_entropy;
+
+/// A random device behaves like `/dev/random`.
+///
+/// It always returns a chunk of random bytes when read, and all writes are discarded.
+pub struct RandomDev;
+
+impl VfsNodeOps for RandomDev {
+    fn get_attr(&self) -> VfsResult<VfsNodeAttr> {
+        Ok(VfsNodeAttr::new(
+            6,
+            VfsNodePerm::default_file(),
+            VfsNodeType::CharDevice,
+            0,
+            0,
+        ))
+    }
+
+    fn set_mode(&self, _mode: VfsNodePerm) -> VfsResult {
+        Ok(())
+    }
+
+    fn read_at(&self, _offset: u64, buf: &mut [u8]) -> VfsResult<usize> {
+        request_entropy(buf).map_err(|_e| AxError::Io)?;
+        Ok(buf.len())
+    }
+
+    fn write_at(&self, _offset: u64, buf: &[u8]) -> VfsResult<usize> {
+        Ok(buf.len())
+    }
+
+    fn truncate(&self, _size: u64) -> VfsResult {
+        Ok(())
+    }
+
+    axfs_vfs::impl_vfs_non_dir_default! {}
+}

modules/ruxfs/src/rng_rand.rs

@@ -66,7 +66,7 @@ tty = { path = "../../crates/tty" }
 
 [target.'cfg(target_arch = "x86_64")'.dependencies]
 x86 = "0.52"
-x86_64 = "0.14.13"
+x86_64 = "0.15.2"
 x2apic = "0.5"
 raw-cpuid = "11.0"