remove some copiler warnings and minor compilor errors

Author: stlankes

src/arch/aarch64/kernel/mod.rs

@@ -27,10 +27,10 @@ use memory_addresses::{PhysAddr, VirtAddr};
 
 pub(crate) use self::interrupts::wakeup_core;
 pub(crate) use self::processor::set_oneshot_timer;
-use crate::arch::kernel::core_local::*;
-use crate::arch::mm::paging::{BasePageSize, PageSize};
 #[cfg(all(feature = "common-os", feature = "fork"))]
 pub use self::scheduler::prepare_fork_child_stack;
+use crate::arch::kernel::core_local::*;
+use crate::arch::mm::paging::{BasePageSize, PageSize};
 use crate::config::*;
 #[cfg(feature = "smp")]
 use crate::env::FdtStartInfo;

src/arch/aarch64/mm/paging.rs

@@ -1111,7 +1111,7 @@ pub fn drop_user_space(l0_phys: usize) {
 pub fn clear_user_space() {
 	use aarch64_cpu::registers::TTBR0_EL1;
 
-	use crate::core_scheduler;
+	use crate::arch::kernel::core_local::core_scheduler;
 	use crate::fd::STDERR_FILENO;
 
 	core_scheduler()

src/arch/aarch64/start/hermit_entry.rs

@@ -90,6 +90,39 @@ pub unsafe extern "C" fn pre_init(boot_info: Option<&'static RawBootInfo>, cpu_i
 	// Memory barrier
 	dsb(SY);
 
+	// On CPUs that implement FEAT_PAN (ARMv8.1+, e.g. Apple Silicon under
+	// HVF), `PSTATE.PAN` may default to 1, which would make every kernel
+	// write to a USER_ACCESSIBLE page (e.g. clearing the user-space TLS
+	// region during `load_application`) trap as a permission fault.
+	// Hermit's common-os path needs the kernel to be able to set up
+	// user pages on behalf of the loader, so:
+	//   1. set SCTLR_EL1.SPAN=1 so `PSTATE.PAN` is *not* forced to 1 on
+	//      exception entry (otherwise every SVC/IRQ would re-set PAN
+	//      and our `msr pan, #0` below would only hold for one trap), and
+	//   2. clear `PSTATE.PAN` itself.
+	// On older CPUs without FEAT_PAN (e.g. Cortex-A72) the PAN field in
+	// ID_AA64MMFR1_EL1 reads zero, so we skip the `msr pan, #0` (which
+	// would otherwise UNDEF).
+	#[cfg(feature = "common-os")]
+	unsafe {
+		asm!(
+			// SCTLR_EL1.SPAN <- 1: keep PSTATE.PAN unchanged on exception entry.
+			"mrs {tmp}, sctlr_el1",
+			"orr {tmp}, {tmp}, #(1 << 23)",
+			"msr sctlr_el1, {tmp}",
+			"isb",
+			// Clear PSTATE.PAN if the CPU implements FEAT_PAN.
+			"mrs {tmp}, id_aa64mmfr1_el1",
+			"ubfx {tmp}, {tmp}, #20, #4",
+			"cbz {tmp}, 1f",
+			".arch_extension pan",
+			"msr pan, #0",
+			"1:",
+			tmp = out(reg) _,
+			options(nostack, preserves_flags),
+		);
+	}
+
 	if cpu_id == 0 {
 		unsafe {
 			env::set_start_info(*boot_info.unwrap());

src/arch/aarch64/start/smp.rs

@@ -190,38 +190,5 @@ unsafe extern "C" fn smp_start_rust() -> ! {
 	// Memory barrier
 	dsb(SY);
 
-	// On CPUs that implement FEAT_PAN (ARMv8.1+, e.g. Apple Silicon under
-	// HVF), `PSTATE.PAN` may default to 1, which would make every kernel
-	// write to a USER_ACCESSIBLE page (e.g. clearing the user-space TLS
-	// region during `load_application`) trap as a permission fault.
-	// Hermit's common-os path needs the kernel to be able to set up
-	// user pages on behalf of the loader, so:
-	//   1. set SCTLR_EL1.SPAN=1 so `PSTATE.PAN` is *not* forced to 1 on
-	//      exception entry (otherwise every SVC/IRQ would re-set PAN
-	//      and our `msr pan, #0` below would only hold for one trap), and
-	//   2. clear `PSTATE.PAN` itself.
-	// On older CPUs without FEAT_PAN (e.g. Cortex-A72) the PAN field in
-	// ID_AA64MMFR1_EL1 reads zero, so we skip the `msr pan, #0` (which
-	// would otherwise UNDEF).
-	#[cfg(feature = "common-os")]
-	unsafe {
-		asm!(
-			// SCTLR_EL1.SPAN <- 1: keep PSTATE.PAN unchanged on exception entry.
-			"mrs {tmp}, sctlr_el1",
-			"orr {tmp}, {tmp}, #(1 << 23)",
-			"msr sctlr_el1, {tmp}",
-			"isb",
-			// Clear PSTATE.PAN if the CPU implements FEAT_PAN.
-			"mrs {tmp}, id_aa64mmfr1_el1",
-			"ubfx {tmp}, {tmp}, #20, #4",
-			"cbz {tmp}, 9f",
-			".arch_extension pan",
-			"msr pan, #0",
-			"9:",
-			tmp = out(reg) _,
-			options(nostack, preserves_flags),
-		);
-	}
-
 	crate::rt::application_processor_main()
 }

src/arch/riscv64/mm/paging.rs

@@ -1090,7 +1090,7 @@ pub fn prepare_mem_copy_on_write() {
 /// maps the new one.
 #[cfg(feature = "common-os")]
 pub fn clear_user_space() {
-	use crate::core_scheduler;
+	use crate::arch::kernel::core_local::core_scheduler;
 	use crate::fd::STDERR_FILENO;
 
 	core_scheduler()

src/arch/x86_64/kernel/mod.rs

@@ -5,19 +5,16 @@ use core::ptr;
 use core::slice;
 use core::sync::atomic::{AtomicPtr, AtomicU32, Ordering};
 
+#[cfg(feature = "common-os")]
+use memory_addresses::{PhysAddr, VirtAddr};
 use x86_64::registers::control::{Cr0, Cr4};
 
 pub(crate) use self::apic::{set_oneshot_timer, wakeup_core};
 #[cfg(all(feature = "common-os", feature = "fork"))]
 pub use self::switch::prepare_fork_child_stack;
-use crate::env;
+use crate::arch::x86_64::kernel::core_local::*;
 #[cfg(feature = "uhyve")]
 use crate::env::{self, UhyveStartInfo};
-use crate::arch::x86_64::kernel::core_local::*;
-use hermit_entry::boot_info::RawBootInfo;
-#[cfg(feature = "common-os")]
-use memory_addresses::{PhysAddr, VirtAddr};
-use x86_64::registers::control::{Cr0, Cr4};
 
 #[cfg(feature = "acpi")]
 pub mod acpi;
@@ -187,7 +184,6 @@ where
 	use x86_64::structures::paging::{PageSize, Size4KiB as BasePageSize};
 
 	use crate::arch::mm::paging::{self, PageTableEntryFlags, PageTableEntryFlagsExt};
-	use crate::mm::{FrameAlloc, PageRangeAllocator};
 	use crate::fd::{Fd, RawFd, stdio};
 	#[cfg(feature = "fork")]
 	use crate::mm::frame_ref_inc;
@@ -342,9 +338,8 @@ pub unsafe fn jump_to_user_land(
 	};
 
 	use crate::arch::kernel::scheduler::TaskStacks;
-	use crate::arch::x86_64::mm::paging::PageTableEntryFlagsExt;
-	use crate::mm::{FrameAlloc, PageRangeAllocator};
 	use crate::arch::mm::paging;
+	use crate::arch::x86_64::mm::paging::PageTableEntryFlagsExt;
 	#[cfg(feature = "fork")]
 	use crate::mm::frame_ref_inc;
 	use crate::mm::vma::*;

src/arch/x86_64/mm/paging.rs

@@ -468,7 +468,7 @@ pub fn drop_user_space(pml4_phys: usize) {
 
 #[cfg(feature = "common-os")]
 pub fn clear_user_space() {
-	use crate::core_scheduler;
+	use crate::arch::kernel::core_local::core_scheduler;
 	use crate::fd::STDERR_FILENO;
 
 	core_scheduler()

src/mm/physicalmem.rs

@@ -7,8 +7,12 @@ use core::sync::atomic::{AtomicUsize, Ordering};
 use align_address::Align;
 use free_list::{FreeList, PageLayout, PageRange};
 use hermit_sync::InterruptTicketMutex;
+#[cfg(any(feature = "common-os", feature = "hermit-entry"))]
+use memory_addresses::PhysAddr;
 use memory_addresses::VirtAddr;
 
+#[cfg(any(feature = "common-os", feature = "hermit-entry"))]
+use crate::arch::mm::paging::PageTableEntryFlags;
 #[cfg(all(target_arch = "x86_64", feature = "hermit-entry"))]
 use crate::arch::mm::paging::PageTableEntryFlagsExt;
 use crate::arch::mm::paging::{self, HugePageSize, PageSize};
@@ -147,10 +151,6 @@ pub fn total_memory_size() -> usize {
 
 #[cfg(feature = "hermit-entry")]
 pub unsafe fn map_frame_range(frame_range: PageRange) {
-	use memory_addresses::PhysAddr;
-
-	use crate::arch::mm::paging::PageTableEntryFlags;
-
 	cfg_select! {
 		target_arch = "aarch64" => {
 			type IdentityPageSize = paging::BasePageSize;

src/syscalls/mod.rs

@@ -922,7 +922,7 @@ pub unsafe extern "C" fn sys_pipe(pipefd: *mut RawFd) -> i32 {
 #[cfg(not(feature = "common-os"))]
 #[hermit_macro::system(errno)]
 #[unsafe(no_mangle)]
-pub unsafe extern "C" fn sys_pipe(pipefd: *mut RawFd) -> i32 {
+pub unsafe extern "C" fn sys_pipe(_pipefd: *mut RawFd) -> i32 {
 	-i32::from(Errno::Nosys)
 }