Merge pull request #1013 from stlankes/syscall

add basic support of a virtual filesystem

Cargo.toml

@@ -45,14 +45,15 @@ name = "measure_startup_time"
 harness = false
 
 [features]
-default = ["pci", "pci-ids", "acpi", "fsgsbase", "smp", "tcp", "dhcpv4", "fs"]
+default = ["pci", "pci-ids", "acpi", "fsgsbase", "smp", "tcp", "dhcpv4", "fuse"]
 acpi = []
 dhcpv4 = [
     "smoltcp",
     "smoltcp/proto-dhcpv4",
     "smoltcp/socket-dhcpv4",
 ]
-fs = ["pci"]
+fs = ["fuse"]
+fuse = ["pci"]
 fsgsbase = []
 gem-net = ["tcp"]
 newlib = []
@@ -92,6 +93,7 @@ take-static = "0.1"
 talc = { version = "4" }
 time = { version = "0.3", default-features = false }
 zerocopy = { version = "0.7", features = ["derive"] }
+build-time = "0.1.3"
 
 [dependencies.smoltcp]
 version = "0.11"

src/drivers/mod.rs

@@ -1,6 +1,6 @@
 //! A module containing hermit-rs driver, hermit-rs driver trait and driver specific errors.
 
-#[cfg(feature = "fs")]
+#[cfg(feature = "fuse")]
 pub mod fs;
 #[cfg(not(feature = "pci"))]
 pub mod mmio;
@@ -10,7 +10,7 @@ pub mod net;
 pub mod pci;
 #[cfg(any(
 	all(any(feature = "tcp", feature = "udp"), not(feature = "rtl8139")),
-	feature = "fs"
+	feature = "fuse"
 ))]
 pub mod virtio;
 
@@ -26,15 +26,15 @@ pub mod error {
 	use crate::drivers::net::rtl8139::RTL8139Error;
 	#[cfg(any(
 		all(any(feature = "tcp", feature = "udp"), not(feature = "rtl8139")),
-		feature = "fs"
+		feature = "fuse"
 	))]
 	use crate::drivers::virtio::error::VirtioError;
 
 	#[derive(Debug)]
 	pub enum DriverError {
 		#[cfg(any(
 			all(any(feature = "tcp", feature = "udp"), not(feature = "rtl8139")),
-			feature = "fs"
+			feature = "fuse"
 		))]
 		InitVirtioDevFail(VirtioError),
 		#[cfg(feature = "rtl8139")]
@@ -45,7 +45,7 @@ pub mod error {
 
 	#[cfg(any(
 		all(any(feature = "tcp", feature = "udp"), not(feature = "rtl8139")),
-		feature = "fs"
+		feature = "fuse"
 	))]
 	impl From<VirtioError> for DriverError {
 		fn from(err: VirtioError) -> Self {
@@ -73,7 +73,7 @@ pub mod error {
 			match *self {
 				#[cfg(any(
 					all(any(feature = "tcp", feature = "udp"), not(feature = "rtl8139")),
-					feature = "fs"
+					feature = "fuse"
 				))]
 				DriverError::InitVirtioDevFail(ref err) => {
 					write!(f, "Virtio driver failed: {err:?}")

src/drivers/pci.rs

@@ -5,7 +5,7 @@ use core::fmt;
 
 use bitflags::bitflags;
 use hermit_sync::without_interrupts;
-#[cfg(any(feature = "tcp", feature = "udp", feature = "fs"))]
+#[cfg(any(feature = "tcp", feature = "udp", feature = "fuse"))]
 use hermit_sync::InterruptTicketMutex;
 use pci_types::{
 	Bar, ConfigRegionAccess, DeviceId, EndpointHeader, InterruptLine, InterruptPin, PciAddress,
@@ -14,20 +14,20 @@ use pci_types::{
 
 use crate::arch::mm::{PhysAddr, VirtAddr};
 use crate::arch::pci::PciConfigRegion;
-#[cfg(feature = "fs")]
+#[cfg(feature = "fuse")]
 use crate::drivers::fs::virtio_fs::VirtioFsDriver;
 #[cfg(feature = "rtl8139")]
 use crate::drivers::net::rtl8139::{self, RTL8139Driver};
 #[cfg(all(not(feature = "rtl8139"), any(feature = "tcp", feature = "udp")))]
 use crate::drivers::net::virtio_net::VirtioNetDriver;
 #[cfg(any(
 	all(any(feature = "tcp", feature = "udp"), not(feature = "rtl8139")),
-	feature = "fs"
+	feature = "fuse"
 ))]
 use crate::drivers::virtio::transport::pci as pci_virtio;
 #[cfg(any(
 	all(any(feature = "tcp", feature = "udp"), not(feature = "rtl8139")),
-	feature = "fs"
+	feature = "fuse"
 ))]
 use crate::drivers::virtio::transport::pci::VirtioDriver;
 
@@ -466,7 +466,7 @@ pub(crate) fn print_information() {
 
 #[allow(clippy::large_enum_variant)]
 pub(crate) enum PciDriver {
-	#[cfg(feature = "fs")]
+	#[cfg(feature = "fuse")]
 	VirtioFs(InterruptTicketMutex<VirtioFsDriver>),
 	#[cfg(all(not(feature = "rtl8139"), any(feature = "tcp", feature = "udp")))]
 	VirtioNet(InterruptTicketMutex<VirtioNetDriver>),
@@ -493,7 +493,7 @@ impl PciDriver {
 		}
 	}
 
-	#[cfg(feature = "fs")]
+	#[cfg(feature = "fuse")]
 	fn get_filesystem_driver(&self) -> Option<&InterruptTicketMutex<VirtioFsDriver>> {
 		match self {
 			Self::VirtioFs(drv) => Some(drv),
@@ -519,7 +519,7 @@ pub(crate) fn get_network_driver() -> Option<&'static InterruptTicketMutex<RTL81
 	unsafe { PCI_DRIVERS.iter().find_map(|drv| drv.get_network_driver()) }
 }
 
-#[cfg(feature = "fs")]
+#[cfg(feature = "fuse")]
 pub(crate) fn get_filesystem_driver() -> Option<&'static InterruptTicketMutex<VirtioFsDriver>> {
 	unsafe {
 		PCI_DRIVERS
@@ -544,14 +544,14 @@ pub(crate) fn init_drivers() {
 
 			#[cfg(any(
 				all(any(feature = "tcp", feature = "udp"), not(feature = "rtl8139")),
-				feature = "fs"
+				feature = "fuse"
 			))]
 			match pci_virtio::init_device(adapter) {
 				#[cfg(all(not(feature = "rtl8139"), any(feature = "tcp", feature = "udp")))]
 				Ok(VirtioDriver::Network(drv)) => {
 					register_driver(PciDriver::VirtioNet(InterruptTicketMutex::new(drv)))
 				}
-				#[cfg(feature = "fs")]
+				#[cfg(feature = "fuse")]
 				Ok(VirtioDriver::FileSystem(drv)) => {
 					register_driver(PciDriver::VirtioFs(InterruptTicketMutex::new(drv)))
 				}

src/drivers/virtio/mod.rs

@@ -8,7 +8,7 @@ pub mod virtqueue;
 pub mod error {
 	use core::fmt;
 
-	#[cfg(feature = "fs")]
+	#[cfg(feature = "fuse")]
 	pub use crate::drivers::fs::virtio_fs::error::VirtioFsError;
 	#[cfg(all(not(feature = "rtl8139"), any(feature = "tcp", feature = "udp")))]
 	pub use crate::drivers::net::virtio_net::error::VirtioNetError;
@@ -23,7 +23,7 @@ pub mod error {
 		DevNotSupported(u16),
 		#[cfg(all(not(feature = "rtl8139"), any(feature = "tcp", feature = "udp")))]
 		NetDriver(VirtioNetError),
-		#[cfg(feature = "fs")]
+		#[cfg(feature = "fuse")]
 		FsDriver(VirtioFsError),
 		#[cfg(not(feature = "pci"))]
 		Unknown,
@@ -56,7 +56,7 @@ pub mod error {
                     VirtioNetError::ProcessOngoing => write!(f, "Virtio network performed an unsuitable operation upon an ongoging transfer."),
 					VirtioNetError::Unknown => write!(f, "Virtio network driver failed due unknown reason!"),
                 },
-				#[cfg(feature = "fs")]
+				#[cfg(feature = "fuse")]
 				VirtioError::FsDriver(fs_error) => match fs_error {
 					VirtioFsError::NoDevCfg(id) => write!(f, "Virtio filesystem driver failed, for device {id:x}, due to a missing or malformed device config!"),
 					VirtioFsError::NoComCfg(id) =>  write!(f, "Virtio filesystem driver failed, for device {id:x}, due to a missing or malformed common config!"),

src/drivers/virtio/transport/pci.rs

@@ -14,7 +14,7 @@ use crate::arch::memory_barrier;
 use crate::arch::mm::PhysAddr;
 use crate::arch::pci::PciConfigRegion;
 use crate::drivers::error::DriverError;
-#[cfg(feature = "fs")]
+#[cfg(feature = "fuse")]
 use crate::drivers::fs::virtio_fs::VirtioFsDriver;
 #[cfg(all(not(feature = "rtl8139"), any(feature = "tcp", feature = "udp")))]
 use crate::drivers::net::network_irqhandler;
@@ -1267,7 +1267,7 @@ pub(crate) fn init_device(
 				Err(DriverError::InitVirtioDevFail(virtio_error))
 			}
 		},
-		#[cfg(feature = "fs")]
+		#[cfg(feature = "fuse")]
 		DevId::VIRTIO_DEV_ID_FS => {
 			// TODO: check subclass
 			// TODO: proper error handling on driver creation fail
@@ -1311,7 +1311,7 @@ pub(crate) fn init_device(
 
 					Ok(drv)
 				}
-				#[cfg(feature = "fs")]
+				#[cfg(feature = "fuse")]
 				VirtioDriver::FileSystem(_) => Ok(drv),
 			}
 		}
@@ -1322,6 +1322,6 @@ pub(crate) fn init_device(
 pub(crate) enum VirtioDriver {
 	#[cfg(all(not(feature = "rtl8139"), any(feature = "tcp", feature = "udp")))]
 	Network(VirtioNetDriver),
-	#[cfg(feature = "fs")]
+	#[cfg(feature = "fuse")]
 	FileSystem(VirtioFsDriver),
 }

src/env.rs

@@ -81,6 +81,10 @@ impl Default for Cli {
 					let gateway = expect_arg(words.next(), word.as_str());
 					env_vars.insert(String::from("HERMIT_GATEWAY"), gateway);
 				}
+				"-mount" => {
+					let gateway = expect_arg(words.next(), word.as_str());
+					env_vars.insert(String::from("UHYVE_MOUNT"), gateway);
+				}
 				"--" => args.extend(&mut words),
 				_ if image_path.is_none() => image_path = Some(word),
 				word => panic!(

src/executor/network.rs

@@ -29,6 +29,7 @@ use crate::drivers::net::NetworkDriver;
 use crate::drivers::pci::get_network_driver;
 use crate::executor::device::HermitNet;
 use crate::executor::{spawn, TaskNotify};
+use crate::fd::IoError;
 use crate::scheduler::PerCoreSchedulerExt;
 
 pub(crate) enum NetworkState<'a> {
@@ -248,9 +249,9 @@ fn network_poll(timestamp: Instant) {
 }
 
 /// Blocks the current thread on `f`, running the executor when idling.
-pub(crate) fn block_on<F, T>(future: F, timeout: Option<Duration>) -> Result<T, i32>
+pub(crate) fn block_on<F, T>(future: F, timeout: Option<Duration>) -> Result<T, IoError>
 where
-	F: Future<Output = Result<T, i32>>,
+	F: Future<Output = Result<T, IoError>>,
 {
 	// disable network interrupts
 	let no_retransmission = {
@@ -297,7 +298,7 @@ where
 				// allow network interrupts
 				get_network_driver().unwrap().lock().set_polling_mode(false);
 
-				return Err(-crate::errno::ETIME);
+				return Err(IoError::ETIME);
 			}
 		}
 
@@ -327,9 +328,9 @@ where
 }
 
 /// Blocks the current thread on `f`, running the executor when idling.
-pub(crate) fn poll_on<F, T>(future: F, timeout: Option<Duration>) -> Result<T, i32>
+pub(crate) fn poll_on<F, T>(future: F, timeout: Option<Duration>) -> Result<T, IoError>
 where
-	F: Future<Output = Result<T, i32>>,
+	F: Future<Output = Result<T, IoError>>,
 {
 	// disable network interrupts
 	let no_retransmission = {
@@ -372,7 +373,7 @@ where
 				// allow network interrupts
 				get_network_driver().unwrap().lock().set_polling_mode(false);
 
-				return Err(-crate::errno::ETIME);
+				return Err(IoError::ETIME);
 			}
 		}
 	}