Merge pull request #1909 from hermit-os/feature-net

feat: separate network features

Author: mkroening

.github/workflows/ci.yml

@@ -26,16 +26,26 @@ jobs:
       - run: rustup target add x86_64-unknown-none aarch64-unknown-none-softfloat riscv64gc-unknown-none-elf
       - name: cargo hack check (x86_64)
         run: |
-          cargo hack check --package hermit-kernel --each-feature --no-dev-deps --target x86_64-unknown-none --exclude-features gem-net
-          cargo hack check --package hermit-kernel --each-feature --no-dev-deps --target x86_64-unknown-none --exclude-features gem-net --features pci
+          cargo hack check --package hermit-kernel --each-feature --no-dev-deps --target x86_64-unknown-none --exclude-features dhcpv4,dns,gem-net,net,rtl8139,virtio-net
+          cargo hack check --package hermit-kernel --each-feature --no-dev-deps --target x86_64-unknown-none --exclude-features dhcpv4,dns,gem-net,net,rtl8139,virtio-net --features pci
+          cargo hack check --package hermit-kernel --each-feature --no-dev-deps --target x86_64-unknown-none --exclude-features gem-net,rtl8139 --features tcp,virtio-net
+          cargo hack check --package hermit-kernel --each-feature --no-dev-deps --target x86_64-unknown-none --exclude-features gem-net,rtl8139 --features pci,tcp,virtio-net
+          cargo hack check --package hermit-kernel --each-feature --no-dev-deps --target x86_64-unknown-none --exclude-features gem-net,virtio-net --features tcp,rtl8139
+          cargo hack check --package hermit-kernel --each-feature --no-dev-deps --target x86_64-unknown-none --exclude-features gem-net,virtio-net --features pci,tcp,rtl8139
       - name: cargo hack check (aarch64)
         run: |
-          cargo hack check --package hermit-kernel --each-feature --no-dev-deps --target aarch64-unknown-none-softfloat --exclude-features gem-net,rtl8139
-          cargo hack check --package hermit-kernel --each-feature --no-dev-deps --target aarch64-unknown-none-softfloat --exclude-features gem-net,rtl8139 --features pci
+          cargo hack check --package hermit-kernel --each-feature --no-dev-deps --target aarch64-unknown-none-softfloat --exclude-features dhcpv4,dns,gem-net,net,rtl8139,virtio-net
+          cargo hack check --package hermit-kernel --each-feature --no-dev-deps --target aarch64-unknown-none-softfloat --exclude-features dhcpv4,dns,gem-net,net,rtl8139,virtio-net --features pci
+          cargo hack check --package hermit-kernel --each-feature --no-dev-deps --target aarch64-unknown-none-softfloat --exclude-features gem-net,rtl8139 --features tcp,virtio-net
+          cargo hack check --package hermit-kernel --each-feature --no-dev-deps --target aarch64-unknown-none-softfloat --exclude-features gem-net,rtl8139 --features pci,tcp,virtio-net
       - name: cargo hack check (riscv64)
         run: |
-          cargo hack check --package hermit-kernel --each-feature --no-dev-deps --target riscv64gc-unknown-none-elf --exclude-features rtl8139
-          cargo hack check --package hermit-kernel --each-feature --no-dev-deps --target riscv64gc-unknown-none-elf --exclude-features rtl8139 --features pci
+          cargo hack check --package hermit-kernel --each-feature --no-dev-deps --target riscv64gc-unknown-none-elf --exclude-features dhcpv4,dns,gem-net,net,rtl8139,virtio-net
+          cargo hack check --package hermit-kernel --each-feature --no-dev-deps --target riscv64gc-unknown-none-elf --exclude-features dhcpv4,dns,gem-net,net,rtl8139,virtio-net --features pci
+          cargo hack check --package hermit-kernel --each-feature --no-dev-deps --target riscv64gc-unknown-none-elf --exclude-features gem-net,rtl8139 --features tcp,virtio-net
+          cargo hack check --package hermit-kernel --each-feature --no-dev-deps --target riscv64gc-unknown-none-elf --exclude-features gem-net,rtl8139 --features pci,tcp,virtio-net
+          cargo hack check --package hermit-kernel --each-feature --no-dev-deps --target riscv64gc-unknown-none-elf --exclude-features rtl8139,virtio-net --features tcp,gem-net
+          cargo hack check --package hermit-kernel --each-feature --no-dev-deps --target riscv64gc-unknown-none-elf --exclude-features rtl8139,virtio-net --features pci,tcp,gem-net
 
   clippy:
     name: Clippy

Cargo.toml

@@ -49,12 +49,12 @@ default = ["kernel-stack", "pci", "pci-ids", "acpi", "fsgsbase", "smp", "tcp", "
 acpi = []
 common-os = []
 console = ["virtio"]
-dhcpv4 = ["smoltcp", "smoltcp/proto-dhcpv4", "smoltcp/socket-dhcpv4"]
-dns = ["smoltcp", "smoltcp/socket-dns"]
+dhcpv4 = ["net", "smoltcp", "smoltcp/proto-dhcpv4", "smoltcp/socket-dhcpv4"]
+dns = ["net", "smoltcp", "smoltcp/socket-dns"]
 fs = ["fuse"]
 fsgsbase = []
 fuse = ["virtio", "pci", "dep:fuse-abi", "fuse-abi/num_enum"]
-gem-net = ["tcp", "dep:tock-registers"]
+gem-net = ["net", "dep:tock-registers"]
 idle-poll = []
 kernel-stack = []
 log-target = []
@@ -64,17 +64,17 @@ mmap = ["mman"] # Deprecated in favor of mman
 newlib = []
 nostd = []
 pci = ["virtio?/pci"]
-rtl8139 = ["tcp", "pci"]
+rtl8139 = ["net", "pci"]
 semihosting = ["dep:semihosting"]
 shell = ["simple-shell"]
 smp = []
 strace = []
-tcp = ["smoltcp", "smoltcp/socket-tcp"]
+tcp = ["net", "smoltcp", "smoltcp/socket-tcp"]
 trace = ["smoltcp?/log", "smoltcp?/verbose"]
-udp = ["smoltcp", "smoltcp/socket-udp"]
+udp = ["net", "smoltcp", "smoltcp/socket-udp"]
 vga = []
 virtio = ["dep:virtio"]
-virtio-net = ["virtio"]
+virtio-net = ["net", "virtio"]
 vsock = ["virtio", "pci"]
 
 [lints.rust]

hermit-macro/src/system.rs

@@ -177,7 +177,7 @@ fn emit_func(func: ItemFn, sig: &ParsedSig, errno: bool) -> Result<ItemFn> {
 			cfg_if::cfg_if! {
 				if #[cfg(all(
 					feature = "kernel-stack",
-					not(any(target_arch = "riscv64", feature = "common-os"))
+					not(any(target_arch = "riscv64", feature = "common-os")),
 				))] {
 					unsafe { crate::arch::kernel::kernel_stack::#kernel_function_ident(#kernel_ident, #(#args),*) }
 				} else {
@@ -257,7 +257,7 @@ mod tests {
 				cfg_if::cfg_if! {
 					if #[cfg(all(
 						feature = "kernel-stack",
-						not(any(target_arch = "riscv64", feature = "common-os"))
+						not(any(target_arch = "riscv64", feature = "common-os")),
 					))] {
 						unsafe { crate::arch::kernel::kernel_stack::kernel_function2(_sys_test, a, b) }
 					} else {
@@ -325,7 +325,7 @@ mod tests {
 				cfg_if::cfg_if! {
 					if #[cfg(all(
 						feature = "kernel-stack",
-						not(any(target_arch = "riscv64", feature = "common-os"))
+						not(any(target_arch = "riscv64", feature = "common-os")),
 					))] {
 						unsafe { crate::arch::kernel::kernel_stack::kernel_function2(_sys_test, a, b) }
 					} else {
@@ -395,7 +395,7 @@ mod tests {
 				cfg_if::cfg_if! {
 					if #[cfg(all(
 						feature = "kernel-stack",
-						not(any(target_arch = "riscv64", feature = "common-os"))
+						not(any(target_arch = "riscv64", feature = "common-os")),
 					))] {
 						unsafe { crate::arch::kernel::kernel_stack::kernel_function2(_sys_test, a, b) }
 					} else {

src/arch/aarch64/kernel/mmio.rs

@@ -3,7 +3,9 @@ use core::ptr::NonNull;
 
 use align_address::Align;
 use arm_gic::{IntId, Trigger};
-use hermit_sync::{InterruptTicketMutex, without_interrupts};
+#[cfg(feature = "console")]
+use hermit_sync::InterruptTicketMutex;
+use hermit_sync::without_interrupts;
 use virtio::mmio::{DeviceRegisters, DeviceRegistersVolatileFieldAccess};
 use volatile::VolatileRef;
 
@@ -15,17 +17,10 @@ use crate::console::IoDevice;
 use crate::drivers::console::VirtioConsoleDriver;
 #[cfg(feature = "console")]
 use crate::drivers::console::VirtioUART;
-#[cfg(any(feature = "tcp", feature = "udp"))]
+#[cfg(feature = "virtio-net")]
 use crate::drivers::net::virtio::VirtioNetDriver;
 use crate::drivers::virtio::transport::mmio::{self as mmio_virtio, VirtioDriver};
-#[cfg(all(
-	any(
-		all(target_arch = "riscv64", feature = "gem-net", not(feature = "pci")),
-		all(target_arch = "x86_64", feature = "rtl8139"),
-		feature = "virtio-net",
-	),
-	any(feature = "tcp", feature = "udp")
-))]
+#[cfg(feature = "virtio-net")]
 use crate::executor::device::NETWORK_DEVICE;
 use crate::init_cell::InitCell;
 use crate::mm::PhysAddr;
@@ -42,17 +37,16 @@ impl MmioDriver {
 	fn get_console_driver(&self) -> Option<&InterruptTicketMutex<VirtioConsoleDriver>> {
 		match self {
 			Self::VirtioConsole(drv) => Some(drv),
-			#[cfg(any(feature = "tcp", feature = "udp"))]
-			_ => None,
 		}
 	}
 }
 
+#[cfg(feature = "console")]
 pub(crate) fn register_driver(drv: MmioDriver) {
 	MMIO_DRIVERS.with(|mmio_drivers| mmio_drivers.unwrap().push(drv));
 }
 
-#[cfg(any(feature = "tcp", feature = "udp"))]
+#[cfg(feature = "virtio-net")]
 pub(crate) type NetworkDevice = VirtioNetDriver;
 
 #[cfg(feature = "console")]
@@ -125,7 +119,7 @@ pub fn init_drivers() {
 							let cpu_id: usize = 0;
 
 							match id {
-								#[cfg(any(feature = "tcp", feature = "udp"))]
+								#[cfg(feature = "virtio-net")]
 								virtio::Id::Net => {
 									debug!(
 										"Found network card at {mmio:p}, irq: {irq}, type: {irqtype}, flags: {irqflags}"

src/arch/aarch64/kernel/mod.rs

@@ -2,13 +2,7 @@ pub mod core_local;
 pub mod interrupts;
 #[cfg(feature = "kernel-stack")]
 pub mod kernel_stack;
-#[cfg(all(
-	not(feature = "pci"),
-	any(
-		all(any(feature = "tcp", feature = "udp"), feature = "virtio-net"),
-		feature = "console"
-	)
-))]
+#[cfg(all(not(feature = "pci"), any(feature = "virtio-net", feature = "console")))]
 pub mod mmio;
 #[cfg(feature = "pci")]
 pub mod pci;

src/arch/riscv64/kernel/devicetree.rs

@@ -1,37 +1,15 @@
 #![allow(dead_code)]
 
-#[cfg(all(
-	any(
-		all(any(feature = "tcp", feature = "udp"), feature = "virtio-net"),
-		feature = "console"
-	),
-	not(feature = "pci")
-))]
+#[cfg(all(any(feature = "virtio-net", feature = "console"), not(feature = "pci")))]
 use core::ptr::NonNull;
 
 use fdt::Fdt;
 use memory_addresses::PhysAddr;
-#[cfg(all(
-	any(feature = "tcp", feature = "udp", feature = "console"),
-	feature = "gem-net",
-	not(feature = "pci")
-))]
+#[cfg(all(feature = "gem-net", not(feature = "pci")))]
 use memory_addresses::VirtAddr;
-#[cfg(all(
-	any(
-		all(any(feature = "tcp", feature = "udp"), feature = "virtio-net"),
-		feature = "console"
-	),
-	not(feature = "pci")
-))]
+#[cfg(all(any(feature = "virtio-net", feature = "console"), not(feature = "pci")))]
 use virtio::mmio::{DeviceRegisters, DeviceRegistersVolatileFieldAccess};
-#[cfg(all(
-	any(
-		all(any(feature = "tcp", feature = "udp"), feature = "virtio-net"),
-		feature = "console"
-	),
-	not(feature = "pci")
-))]
+#[cfg(all(any(feature = "virtio-net", feature = "console"), not(feature = "pci")))]
 use volatile::VolatileRef;
 
 use crate::arch::riscv64::kernel::get_dtb_ptr;
@@ -45,28 +23,13 @@ use crate::console::IoDevice;
 use crate::drivers::console::VirtioUART;
 #[cfg(all(feature = "console", not(feature = "pci")))]
 use crate::drivers::mmio::get_console_driver;
-#[cfg(all(
-	any(feature = "tcp", feature = "udp"),
-	feature = "gem-net",
-	not(feature = "pci")
-))]
+#[cfg(all(feature = "gem-net", not(feature = "pci")))]
 use crate::drivers::net::gem;
 #[cfg(all(feature = "console", feature = "pci"))]
 use crate::drivers::pci::get_console_driver;
-#[cfg(all(
-	any(
-		all(any(feature = "tcp", feature = "udp"), feature = "virtio-net"),
-		feature = "console"
-	),
-	not(feature = "pci"),
-	not(feature = "gem-net")
-))]
+#[cfg(all(any(feature = "virtio-net", feature = "console"), not(feature = "pci")))]
 use crate::drivers::virtio::transport::mmio::{self as mmio_virtio, VirtioDriver};
-#[cfg(all(
-	any(feature = "tcp", feature = "udp"),
-	any(feature = "gem-net", feature = "virtio-net"),
-	not(feature = "pci"),
-))]
+#[cfg(all(any(feature = "gem-net", feature = "virtio-net"), not(feature = "pci")))]
 use crate::executor::device::NETWORK_DEVICE;
 #[cfg(all(feature = "console", not(feature = "pci")))]
 use crate::kernel::mmio::register_driver;
@@ -205,13 +168,7 @@ pub fn init_drivers() {
 			}
 
 			// Init virtio-mmio
-			#[cfg(all(
-				any(
-					all(any(feature = "tcp", feature = "udp"), feature = "virtio-net"),
-					feature = "console"
-				),
-				not(feature = "pci")
-			))]
+			#[cfg(all(any(feature = "virtio-net", feature = "console"), not(feature = "pci")))]
 			if let Some(virtio_node) = fdt.find_compatible(&["virtio,mmio"]) {
 				debug!("Found virtio mmio device");
 				let virtio_region = virtio_node
@@ -273,11 +230,7 @@ pub fn init_drivers() {
 				}
 
 				match id {
-					#[cfg(all(
-						any(feature = "tcp", feature = "udp"),
-						feature = "virtio-net",
-						not(feature = "gem-net")
-					))]
+					#[cfg(all(feature = "virtio-net", not(feature = "gem-net")))]
 					virtio::Id::Net => {
 						debug!("Found virtio network card at {mmio:p}");
 
@@ -308,12 +261,8 @@ pub fn init_drivers() {
 	}
 
 	#[cfg(all(
-		any(
-			all(any(feature = "tcp", feature = "udp"), feature = "virtio-net"),
-			feature = "console",
-			feature = "gem-net"
-		),
-		not(feature = "pci")
+		any(feature = "virtio-net", feature = "console", feature = "gem-net"),
+		not(feature = "pci"),
 	))]
 	super::mmio::MMIO_DRIVERS.finalize();
 

src/arch/riscv64/kernel/mmio.rs

@@ -9,7 +9,7 @@ use hermit_sync::InterruptSpinMutex;
 use crate::drivers::console::VirtioConsoleDriver;
 #[cfg(feature = "gem-net")]
 use crate::drivers::net::gem::GEMDriver;
-#[cfg(all(not(feature = "gem-net"), any(feature = "tcp", feature = "udp")))]
+#[cfg(all(not(feature = "gem-net"), feature = "virtio-net"))]
 use crate::drivers::net::virtio::VirtioNetDriver;
 use crate::init_cell::InitCell;
 
@@ -25,8 +25,6 @@ impl MmioDriver {
 	fn get_console_driver(&self) -> Option<&InterruptSpinMutex<VirtioConsoleDriver>> {
 		match self {
 			Self::VirtioConsole(drv) => Some(drv),
-			#[cfg(any(feature = "tcp", feature = "udp"))]
-			_ => None,
 		}
 	}
 }
@@ -38,7 +36,7 @@ pub(crate) fn register_driver(drv: MmioDriver) {
 #[cfg(feature = "gem-net")]
 pub(crate) type NetworkDevice = GEMDriver;
 
-#[cfg(all(not(feature = "gem-net"), any(feature = "tcp", feature = "udp")))]
+#[cfg(all(not(feature = "gem-net"), feature = "virtio-net"))]
 pub(crate) type NetworkDevice = VirtioNetDriver;
 
 #[cfg(feature = "console")]

src/arch/riscv64/kernel/mod.rs

@@ -2,12 +2,8 @@ pub mod core_local;
 mod devicetree;
 pub mod interrupts;
 #[cfg(all(
-	any(
-		all(any(feature = "tcp", feature = "udp"), feature = "virtio-net"),
-		feature = "console",
-		feature = "gem-net"
-	),
-	not(feature = "pci")
+	any(feature = "virtio-net", feature = "console", feature = "gem-net"),
+	not(feature = "pci"),
 ))]
 pub mod mmio;
 #[cfg(feature = "pci")]

src/arch/riscv64/mod.rs

@@ -2,7 +2,6 @@ pub mod kernel;
 pub mod mm;
 
 #[allow(dead_code)]
-#[cfg(target_arch = "riscv64")]
 #[inline(always)]
 pub(crate) fn memory_barrier() {
 	riscv::asm::sfence_vma_all();