From 56fa37b773968c5f84f71196675e26a2bf3f9989 Mon Sep 17 00:00:00 2001 From: Stefan Lankes Date: Sun, 21 Apr 2024 21:26:17 +0200 Subject: [PATCH 1/2] fix: clippy::legacy_numeric_constants --- src/arch/aarch64/kernel/pci.rs | 2 +- src/arch/aarch64/mm/paging.rs | 2 +- src/arch/riscv64/mm/paging.rs | 2 +- src/arch/x86_64/kernel/apic.rs | 2 +- src/arch/x86_64/kernel/pci.rs | 2 -- src/arch/x86_64/kernel/processor.rs | 2 +- src/drivers/virtio/transport/mmio.rs | 2 +- src/fs/fuse.rs | 2 +- src/syscalls/tasks.rs | 1 - 9 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/arch/aarch64/kernel/pci.rs b/src/arch/aarch64/kernel/pci.rs index c8945ae0ac..414a7ca7d8 100644 --- a/src/arch/aarch64/kernel/pci.rs +++ b/src/arch/aarch64/kernel/pci.rs @@ -1,5 +1,5 @@ use alloc::vec::Vec; -use core::{str, u32, u64, u8}; +use core::str; use arm_gic::gicv3::{IntId, Trigger}; use bit_field::BitField; diff --git a/src/arch/aarch64/mm/paging.rs b/src/arch/aarch64/mm/paging.rs index 90b09a647f..f8dd4a2a99 100644 --- a/src/arch/aarch64/mm/paging.rs +++ b/src/arch/aarch64/mm/paging.rs @@ -2,7 +2,7 @@ use core::arch::asm; use core::marker::PhantomData; -use core::{fmt, mem, ptr, usize}; +use core::{fmt, mem, ptr}; use align_address::Align; diff --git a/src/arch/riscv64/mm/paging.rs b/src/arch/riscv64/mm/paging.rs index 4eeaa29bdc..97e73b1514 100644 --- a/src/arch/riscv64/mm/paging.rs +++ b/src/arch/riscv64/mm/paging.rs @@ -1,5 +1,5 @@ use core::marker::PhantomData; -use core::{ptr, usize}; +use core::ptr; use align_address::Align; use hermit_sync::SpinMutex; diff --git a/src/arch/x86_64/kernel/apic.rs b/src/arch/x86_64/kernel/apic.rs index 0b0dd09960..7b7d34de83 100644 --- a/src/arch/x86_64/kernel/apic.rs +++ b/src/arch/x86_64/kernel/apic.rs @@ -5,7 +5,7 @@ use core::arch::x86_64::_mm_mfence; use core::fmt; use core::hint::spin_loop; use core::sync::atomic::Ordering; -use core::{cmp, mem, ptr, u32}; +use core::{cmp, mem, ptr}; use align_address::Align; #[cfg(feature = "smp")] diff --git a/src/arch/x86_64/kernel/pci.rs b/src/arch/x86_64/kernel/pci.rs index e48e838853..d585ed784e 100644 --- a/src/arch/x86_64/kernel/pci.rs +++ b/src/arch/x86_64/kernel/pci.rs @@ -1,5 +1,3 @@ -use core::{u32, u8}; - use pci_types::{ConfigRegionAccess, PciAddress, PciHeader}; use x86::io::*; diff --git a/src/arch/x86_64/kernel/processor.rs b/src/arch/x86_64/kernel/processor.rs index bde2af3131..522f333bbb 100644 --- a/src/arch/x86_64/kernel/processor.rs +++ b/src/arch/x86_64/kernel/processor.rs @@ -7,7 +7,7 @@ use core::arch::x86_64::{ use core::hint::spin_loop; use core::num::NonZeroU32; use core::sync::atomic::{AtomicU64, Ordering}; -use core::{fmt, ptr, u32}; +use core::{fmt, ptr}; use hermit_entry::boot_info::PlatformInfo; use hermit_sync::Lazy; diff --git a/src/drivers/virtio/transport/mmio.rs b/src/drivers/virtio/transport/mmio.rs index a99fce483c..45b4fea523 100644 --- a/src/drivers/virtio/transport/mmio.rs +++ b/src/drivers/virtio/transport/mmio.rs @@ -3,9 +3,9 @@ //! The module contains ... #![allow(dead_code)] +use core::ptr; use core::ptr::{read_volatile, write_volatile}; use core::sync::atomic::{fence, Ordering}; -use core::{ptr, u8}; #[cfg(any(feature = "tcp", feature = "udp"))] use crate::arch::kernel::interrupts::*; diff --git a/src/fs/fuse.rs b/src/fs/fuse.rs index d23fb6365f..f98ec173e3 100644 --- a/src/fs/fuse.rs +++ b/src/fs/fuse.rs @@ -5,10 +5,10 @@ use alloc::string::String; use alloc::sync::Arc; use alloc::vec::Vec; use core::ffi::CStr; +use core::future; use core::mem::MaybeUninit; use core::sync::atomic::{AtomicU64, Ordering}; use core::task::Poll; -use core::{future, u32, u8}; use async_lock::Mutex; use async_trait::async_trait; diff --git a/src/syscalls/tasks.rs b/src/syscalls/tasks.rs index 20a859dad7..dfb3548f0c 100644 --- a/src/syscalls/tasks.rs +++ b/src/syscalls/tasks.rs @@ -1,5 +1,4 @@ use alloc::collections::BTreeMap; -use core::isize; #[cfg(feature = "newlib")] use core::sync::atomic::{AtomicUsize, Ordering}; From 6fe5f711b101b276e5974ebf43ef37c8a4666279 Mon Sep 17 00:00:00 2001 From: Stefan Lankes Date: Sun, 21 Apr 2024 21:17:51 +0200 Subject: [PATCH 2/2] chore: upgrade to nightly-2024-04-15 --- rust-toolchain.toml | 2 +- src/arch/aarch64/kernel/interrupts.rs | 2 +- src/arch/aarch64/kernel/mod.rs | 2 +- src/arch/aarch64/kernel/pci.rs | 6 +++--- src/arch/aarch64/kernel/processor.rs | 2 +- src/arch/aarch64/kernel/scheduler.rs | 2 +- src/arch/aarch64/kernel/serial.rs | 2 +- src/arch/aarch64/kernel/systemtime.rs | 2 +- src/arch/aarch64/mm/paging.rs | 2 +- src/arch/x86_64/kernel/acpi.rs | 20 ++++++++++++-------- src/arch/x86_64/kernel/apic.rs | 17 +++++++++-------- src/arch/x86_64/kernel/mmio.rs | 4 ++-- src/arch/x86_64/kernel/scheduler.rs | 2 +- src/arch/x86_64/mm/paging.rs | 4 ++-- src/drivers/net/virtio_mmio.rs | 2 +- src/drivers/virtio/transport/pci.rs | 8 ++++---- src/drivers/virtio/virtqueue/mod.rs | 4 ++-- src/drivers/virtio/virtqueue/packed.rs | 8 ++++---- src/drivers/virtio/virtqueue/split.rs | 9 +++++---- src/lib.rs | 1 - src/syscalls/condvar.rs | 18 +++++++++--------- src/syscalls/interfaces/uhyve.rs | 4 ++-- 22 files changed, 64 insertions(+), 59 deletions(-) diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 3d3ee699c4..f5009924e0 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,5 +1,5 @@ [toolchain] -channel = "nightly-2024-03-15" +channel = "nightly-2024-04-15" components = [ "llvm-tools", "rust-src", diff --git a/src/arch/aarch64/kernel/interrupts.rs b/src/arch/aarch64/kernel/interrupts.rs index e97a5c1ddf..b0737ce39f 100644 --- a/src/arch/aarch64/kernel/interrupts.rs +++ b/src/arch/aarch64/kernel/interrupts.rs @@ -232,7 +232,7 @@ pub(crate) fn init() { info!("Intialize generic interrupt controller"); let dtb = unsafe { - Dtb::from_raw(ptr::from_exposed_addr( + Dtb::from_raw(ptr::with_exposed_provenance( boot_info().hardware_info.device_tree.unwrap().get() as usize, )) .expect(".dtb file has invalid header") diff --git a/src/arch/aarch64/kernel/mod.rs b/src/arch/aarch64/kernel/mod.rs index 3b48821c3a..c73b017b00 100644 --- a/src/arch/aarch64/kernel/mod.rs +++ b/src/arch/aarch64/kernel/mod.rs @@ -92,7 +92,7 @@ pub fn get_processor_count() -> u32 { pub fn args() -> Option<&'static str> { let dtb = unsafe { - hermit_dtb::Dtb::from_raw(ptr::from_exposed_addr( + hermit_dtb::Dtb::from_raw(ptr::with_exposed_provenance( boot_info().hardware_info.device_tree.unwrap().get() as usize, )) .expect(".dtb file has invalid header") diff --git a/src/arch/aarch64/kernel/pci.rs b/src/arch/aarch64/kernel/pci.rs index 414a7ca7d8..f6e246f487 100644 --- a/src/arch/aarch64/kernel/pci.rs +++ b/src/arch/aarch64/kernel/pci.rs @@ -46,13 +46,13 @@ impl ConfigRegionAccess for PciConfigRegion { #[inline] unsafe fn read(&self, pci_addr: PciAddress, offset: u16) -> u32 { - let ptr = core::ptr::from_exposed_addr(self.addr_from_offset(pci_addr, offset)); + let ptr = core::ptr::with_exposed_provenance(self.addr_from_offset(pci_addr, offset)); unsafe { crate::drivers::pci::from_pci_endian(core::ptr::read_volatile(ptr)) } } #[inline] unsafe fn write(&self, pci_addr: PciAddress, offset: u16, value: u32) { - let ptr = core::ptr::from_exposed_addr_mut(self.addr_from_offset(pci_addr, offset)); + let ptr = core::ptr::with_exposed_provenance_mut(self.addr_from_offset(pci_addr, offset)); unsafe { core::ptr::write_volatile(ptr, value.to_le()); } @@ -228,7 +228,7 @@ fn detect_interrupt( pub fn init() { let dtb = unsafe { - Dtb::from_raw(core::ptr::from_exposed_addr( + Dtb::from_raw(core::ptr::with_exposed_provenance( boot_info().hardware_info.device_tree.unwrap().get() as usize, )) .expect(".dtb file has invalid header") diff --git a/src/arch/aarch64/kernel/processor.rs b/src/arch/aarch64/kernel/processor.rs index 3ba97d4b2b..af7a3ac98a 100644 --- a/src/arch/aarch64/kernel/processor.rs +++ b/src/arch/aarch64/kernel/processor.rs @@ -252,7 +252,7 @@ pub fn set_oneshot_timer(wakeup_time: Option) { pub fn print_information() { let dtb = unsafe { - Dtb::from_raw(core::ptr::from_exposed_addr( + Dtb::from_raw(core::ptr::with_exposed_provenance( boot_info().hardware_info.device_tree.unwrap().get() as usize, )) .expect(".dtb file has invalid header") diff --git a/src/arch/aarch64/kernel/scheduler.rs b/src/arch/aarch64/kernel/scheduler.rs index eb850c1800..46740fada0 100644 --- a/src/arch/aarch64/kernel/scheduler.rs +++ b/src/arch/aarch64/kernel/scheduler.rs @@ -269,7 +269,7 @@ impl TaskTLS { // Get TLS initialization image let tls_init_image = { - let tls_init_data = ptr::from_exposed_addr(tls_info.start.try_into().unwrap()); + let tls_init_data = ptr::with_exposed_provenance(tls_info.start.try_into().unwrap()); let tls_init_len = tls_info.filesz.try_into().unwrap(); // SAFETY: We will have to trust the environment here. diff --git a/src/arch/aarch64/kernel/serial.rs b/src/arch/aarch64/kernel/serial.rs index 4eac1b3ce2..b061573564 100644 --- a/src/arch/aarch64/kernel/serial.rs +++ b/src/arch/aarch64/kernel/serial.rs @@ -10,7 +10,7 @@ impl SerialPort { } pub fn write_byte(&self, byte: u8) { - let port = core::ptr::from_exposed_addr_mut::(self.port_address as usize); + let port = core::ptr::with_exposed_provenance_mut::(self.port_address as usize); // LF newline characters need to be extended to CRLF over a real serial port. if byte == b'\n' { diff --git a/src/arch/aarch64/kernel/systemtime.rs b/src/arch/aarch64/kernel/systemtime.rs index ebb939ea2e..100b4bba84 100644 --- a/src/arch/aarch64/kernel/systemtime.rs +++ b/src/arch/aarch64/kernel/systemtime.rs @@ -46,7 +46,7 @@ fn rtc_read(off: usize) -> u32 { pub fn init() { let dtb = unsafe { - Dtb::from_raw(core::ptr::from_exposed_addr( + Dtb::from_raw(core::ptr::with_exposed_provenance( boot_info().hardware_info.device_tree.unwrap().get() as usize, )) .expect(".dtb file has invalid header") diff --git a/src/arch/aarch64/mm/paging.rs b/src/arch/aarch64/mm/paging.rs index f8dd4a2a99..eb3c4268f1 100644 --- a/src/arch/aarch64/mm/paging.rs +++ b/src/arch/aarch64/mm/paging.rs @@ -520,7 +520,7 @@ where let table_address = core::ptr::from_ref(self).addr(); let subtable_address = (table_address << PAGE_MAP_BITS) & !(usize::MAX << 48) | (index << PAGE_BITS); - unsafe { &mut *(ptr::from_exposed_addr_mut(subtable_address)) } + unsafe { &mut *(ptr::with_exposed_provenance_mut(subtable_address)) } } /// Maps a continuous range of pages. diff --git a/src/arch/x86_64/kernel/acpi.rs b/src/arch/x86_64/kernel/acpi.rs index 1c69ece113..104b578f88 100644 --- a/src/arch/x86_64/kernel/acpi.rs +++ b/src/arch/x86_64/kernel/acpi.rs @@ -235,7 +235,8 @@ struct AcpiFadt { /// (wrapping) sum over all table fields equals zero. fn verify_checksum(start_address: usize, length: usize) -> Result<(), ()> { // Get a slice over all bytes of the structure that are considered for the checksum. - let slice = unsafe { slice::from_raw_parts(ptr::from_exposed_addr(start_address), length) }; + let slice = + unsafe { slice::from_raw_parts(ptr::with_exposed_provenance(start_address), length) }; // Perform a wrapping sum over these bytes. let checksum = slice.iter().fold(0, |acc: u8, x| acc.wrapping_add(*x)); @@ -267,7 +268,7 @@ fn detect_rsdp(start_address: PhysAddr, end_address: PhysAddr) -> Result<&'stati } // Verify the signature to find out if this is really an ACPI RSDP. - let rsdp = unsafe { &*(ptr::from_exposed_addr::(current_address)) }; + let rsdp = unsafe { &*(ptr::with_exposed_provenance::(current_address)) }; if &rsdp.signature != b"RSD PTR " { continue; } @@ -337,8 +338,8 @@ fn search_s5_in_table(table: AcpiTable<'_>) { // As we do not implement an AML interpreter, we search through the bytecode. let aml = unsafe { slice::from_ptr_range( - ptr::from_exposed_addr(table.table_start_address()) - ..ptr::from_exposed_addr(table.table_end_address()), + ptr::with_exposed_provenance(table.table_start_address()) + ..ptr::with_exposed_provenance(table.table_end_address()), ) }; @@ -387,7 +388,8 @@ fn parse_fadt(fadt: AcpiTable<'_>) { // Get us a reference to the actual fields of the FADT table. // Note that not all fields may be accessible depending on the ACPI revision of the computer. // Always check fadt.table_end_address() when accessing an optional field! - let fadt_table = unsafe { &*ptr::from_exposed_addr::(fadt.table_start_address()) }; + let fadt_table = + unsafe { &*ptr::with_exposed_provenance::(fadt.table_start_address()) }; // Check if the FADT is large enough to hold an x_pm1a_cnt_blk field and if this field is non-zero. // In that case, it shall be preferred over the I/O port specified in pm1a_cnt_blk. @@ -480,14 +482,16 @@ pub fn init() { // The XSDT contains 64-bit pointers whereas the RSDT has 32-bit pointers. let table_physical_address = if rsdp.revision >= 2 { let address = PhysAddr(unsafe { - ptr::read_unaligned(ptr::from_exposed_addr::(current_address)) + ptr::read_unaligned(ptr::with_exposed_provenance::(current_address)) }); current_address += mem::size_of::(); address } else { let address = PhysAddr( - (unsafe { ptr::read_unaligned(ptr::from_exposed_addr::(current_address)) }) - .into(), + (unsafe { + ptr::read_unaligned(ptr::with_exposed_provenance::(current_address)) + }) + .into(), ); current_address += mem::size_of::(); address diff --git a/src/arch/x86_64/kernel/apic.rs b/src/arch/x86_64/kernel/apic.rs index 7b7d34de83..b3996cd415 100644 --- a/src/arch/x86_64/kernel/apic.rs +++ b/src/arch/x86_64/kernel/apic.rs @@ -279,21 +279,22 @@ fn detect_from_acpi() -> Result { // Get the Multiple APIC Description Table (MADT) from the ACPI information and its specific table header. let madt = acpi::get_madt().ok_or(())?; let madt_header = - unsafe { &*(ptr::from_exposed_addr::(madt.table_start_address())) }; + unsafe { &*(ptr::with_exposed_provenance::(madt.table_start_address())) }; // Jump to the actual table entries (after the table header). let mut current_address = madt.table_start_address() + mem::size_of::(); // Loop through all table entries. while current_address < madt.table_end_address() { - let record = unsafe { &*(ptr::from_exposed_addr::(current_address)) }; + let record = + unsafe { &*(ptr::with_exposed_provenance::(current_address)) }; current_address += mem::size_of::(); match record.entry_type { 0 => { // Processor Local APIC let processor_local_apic_record = unsafe { - &*(ptr::from_exposed_addr::(current_address)) + &*(ptr::with_exposed_provenance::(current_address)) }; debug!( "Found Processor Local APIC record: {}", @@ -307,7 +308,7 @@ fn detect_from_acpi() -> Result { 1 => { // I/O APIC let ioapic_record = - unsafe { &*(ptr::from_exposed_addr::(current_address)) }; + unsafe { &*(ptr::with_exposed_provenance::(current_address)) }; debug!("Found I/O APIC record: {}", ioapic_record); init_ioapic_address(PhysAddr(ioapic_record.address.into())); @@ -393,7 +394,7 @@ fn detect_from_mp() -> Result { let mut addr: usize = virtual_address.as_usize() | (mp_float.mp_config as usize & (BasePageSize::SIZE as usize - 1)); - let mp_config: &ApicConfigTable = unsafe { &*(ptr::from_exposed_addr(addr)) }; + let mp_config: &ApicConfigTable = unsafe { &*(ptr::with_exposed_provenance(addr)) }; if mp_config.signature != MP_CONFIG_SIGNATURE { warn!("Invalid MP config table"); virtualmem::deallocate(virtual_address, BasePageSize::SIZE as usize); @@ -409,11 +410,11 @@ fn detect_from_mp() -> Result { // entries starts directly after the config table addr += mem::size_of::(); for _i in 0..mp_config.entry_count { - match unsafe { *(ptr::from_exposed_addr(addr)) } { + match unsafe { *(ptr::with_exposed_provenance(addr)) } { // CPU entry 0 => { let cpu_entry: &ApicProcessorEntry = - unsafe { &*(ptr::from_exposed_addr(addr)) }; + unsafe { &*(ptr::with_exposed_provenance(addr)) }; if cpu_entry.cpu_flags & 0x01 == 0x01 { add_local_apic_id(cpu_entry.id); } @@ -421,7 +422,7 @@ fn detect_from_mp() -> Result { } // IO-APIC entry 2 => { - let io_entry: &ApicIoEntry = unsafe { &*(ptr::from_exposed_addr(addr)) }; + let io_entry: &ApicIoEntry = unsafe { &*(ptr::with_exposed_provenance(addr)) }; let ioapic = PhysAddr(io_entry.addr.into()); info!("Found IOAPIC at 0x{:p}", ioapic); diff --git a/src/arch/x86_64/kernel/mmio.rs b/src/arch/x86_64/kernel/mmio.rs index 9b62e47be9..566c29cc9f 100644 --- a/src/arch/x86_64/kernel/mmio.rs +++ b/src/arch/x86_64/kernel/mmio.rs @@ -68,7 +68,7 @@ fn check_linux_args( // Verify the first register value to find out if this is really an MMIO magic-value. let mmio = unsafe { - &mut *(ptr::from_exposed_addr_mut::( + &mut *(ptr::with_exposed_provenance_mut::( virtual_address.as_usize() | (current_address & (BasePageSize::SIZE as usize - 1)), )) @@ -146,7 +146,7 @@ fn guess_device() -> Result<(&'static mut MmioRegisterLayout, u8), &'static str> // Verify the first register value to find out if this is really an MMIO magic-value. let mmio = unsafe { - &mut *(ptr::from_exposed_addr_mut::( + &mut *(ptr::with_exposed_provenance_mut::( virtual_address.as_usize() | (current_address & (BasePageSize::SIZE as usize - 1)), )) }; diff --git a/src/arch/x86_64/kernel/scheduler.rs b/src/arch/x86_64/kernel/scheduler.rs index 80b38e006e..1ad879d9c3 100644 --- a/src/arch/x86_64/kernel/scheduler.rs +++ b/src/arch/x86_64/kernel/scheduler.rs @@ -257,7 +257,7 @@ impl TaskTLS { // Get TLS initialization image let tls_init_image = { - let tls_init_data = ptr::from_exposed_addr(tls_info.start.try_into().unwrap()); + let tls_init_data = ptr::with_exposed_provenance(tls_info.start.try_into().unwrap()); let tls_init_len = tls_info.filesz.try_into().unwrap(); // SAFETY: We will have to trust the environment here. diff --git a/src/arch/x86_64/mm/paging.rs b/src/arch/x86_64/mm/paging.rs index 0748b5dc42..62020f210a 100644 --- a/src/arch/x86_64/mm/paging.rs +++ b/src/arch/x86_64/mm/paging.rs @@ -91,7 +91,7 @@ pub use x86_64::structures::paging::{ unsafe fn recursive_page_table() -> RecursivePageTable<'static> { let level_4_table_addr = 0xFFFF_FFFF_FFFF_F000; - let level_4_table_ptr = ptr::from_exposed_addr_mut(level_4_table_addr); + let level_4_table_ptr = ptr::with_exposed_provenance_mut(level_4_table_addr); unsafe { let level_4_table = &mut *(level_4_table_ptr); RecursivePageTable::new(level_4_table).unwrap() @@ -405,7 +405,7 @@ pub(crate) unsafe fn print_page_tables(levels: usize) { // Identity mapped //let level_4_table_addr = Cr3::read().0.start_address().as_u64(); //let level_4_table_ptr = - // ptr::from_exposed_addr::(level_4_table_addr.try_into().unwrap()); + // ptr::with_exposed_provenance::(level_4_table_addr.try_into().unwrap()); //let pt = unsafe { &*level_4_table_ptr }; print(pt, 4, 5 - levels); diff --git a/src/drivers/net/virtio_mmio.rs b/src/drivers/net/virtio_mmio.rs index 2ebc5b0073..331bf85eb1 100644 --- a/src/drivers/net/virtio_mmio.rs +++ b/src/drivers/net/virtio_mmio.rs @@ -116,7 +116,7 @@ impl VirtioNetDriver { irq: u8, ) -> Result { let dev_cfg_raw: &'static NetDevCfgRaw = - unsafe { &*(ptr::from_exposed_addr(ptr::from_ref(registers).addr() + 0xFC)) }; + unsafe { &*(ptr::with_exposed_provenance(ptr::from_ref(registers).addr() + 0xFC)) }; let dev_cfg = NetDevCfg { raw: dev_cfg_raw, dev_id, diff --git a/src/drivers/virtio/transport/pci.rs b/src/drivers/virtio/transport/pci.rs index d04bddd3dc..305fc09f04 100644 --- a/src/drivers/virtio/transport/pci.rs +++ b/src/drivers/virtio/transport/pci.rs @@ -165,7 +165,7 @@ pub fn map_dev_cfg(cap: &PciCap) -> Option<&'static mut T> { // Create mutable reference to the PCI structure in PCI memory let dev_cfg: &'static mut T = - unsafe { &mut *(ptr::from_exposed_addr_mut(virt_addr_raw.into())) }; + unsafe { &mut *(ptr::with_exposed_provenance_mut(virt_addr_raw.into())) }; Some(dev_cfg) } @@ -624,7 +624,7 @@ impl ComCfgRaw { // Create mutable reference to the PCI structure in PCI memory let com_cfg_raw: &mut ComCfgRaw = - unsafe { &mut *(ptr::from_exposed_addr_mut(virt_addr_raw.into())) }; + unsafe { &mut *(ptr::with_exposed_provenance_mut(virt_addr_raw.into())) }; Some(com_cfg_raw) } @@ -811,7 +811,7 @@ impl IsrStatusRaw { // Create mutable reference to the PCI structure in the devices memory area let isr_stat_raw: &mut IsrStatusRaw = - unsafe { &mut *(ptr::from_exposed_addr_mut(virt_addr_raw.into())) }; + unsafe { &mut *(ptr::with_exposed_provenance_mut(virt_addr_raw.into())) }; Some(isr_stat_raw) } @@ -920,7 +920,7 @@ impl ShMemCfg { MemLen::from((u64::from(length_high) << 32) ^ u64::from(cap.origin.cap_struct.length)); let virt_addr_raw = cap.bar.mem_addr + offset; - let raw_ptr = ptr::from_exposed_addr_mut::(virt_addr_raw.into()); + let raw_ptr = ptr::with_exposed_provenance_mut::(virt_addr_raw.into()); // Zero initialize shared memory area unsafe { diff --git a/src/drivers/virtio/virtqueue/mod.rs b/src/drivers/virtio/virtqueue/mod.rs index a92cada59d..3302abb51a 100644 --- a/src/drivers/virtio/virtqueue/mod.rs +++ b/src/drivers/virtio/virtqueue/mod.rs @@ -3125,7 +3125,7 @@ impl MemPool { // Allocate heap memory via a vec, leak and cast let _mem_len = len.align_up(BasePageSize::SIZE as usize); - let ptr = ptr::from_exposed_addr_mut(crate::mm::allocate(_mem_len, true).0 as usize); + let ptr = ptr::with_exposed_provenance_mut(crate::mm::allocate(_mem_len, true).0 as usize); // Assert descriptor does not cross a page barrier let start_virt = ptr as usize; @@ -3160,7 +3160,7 @@ impl MemPool { // Allocate heap memory via a vec, leak and cast let _mem_len = len.align_up(BasePageSize::SIZE as usize); - let ptr = ptr::from_exposed_addr_mut(crate::mm::allocate(_mem_len, true).0 as usize); + let ptr = ptr::with_exposed_provenance_mut(crate::mm::allocate(_mem_len, true).0 as usize); // Assert descriptor does not cross a page barrier let start_virt = ptr as usize; diff --git a/src/drivers/virtio/virtqueue/packed.rs b/src/drivers/virtio/virtqueue/packed.rs index e93944a7b1..8c6cfc1291 100644 --- a/src/drivers/virtio/virtqueue/packed.rs +++ b/src/drivers/virtio/virtqueue/packed.rs @@ -105,7 +105,7 @@ impl DescriptorRing { // Allocate heap memory via a vec, leak and cast let _mem_len = (size * core::mem::size_of::()).align_up(BasePageSize::SIZE as usize); - let ptr = ptr::from_exposed_addr_mut(crate::mm::allocate(_mem_len, true).0 as usize); + let ptr = ptr::with_exposed_provenance_mut(crate::mm::allocate(_mem_len, true).0 as usize); let ring: &'static mut [Descriptor] = unsafe { core::slice::from_raw_parts_mut(ptr, size) }; @@ -1138,9 +1138,9 @@ impl Virtq for PackedVq { let _mem_len = core::mem::size_of::().align_up(BasePageSize::SIZE as usize); let drv_event_ptr = - ptr::from_exposed_addr_mut(crate::mm::allocate(_mem_len, true).0 as usize); + ptr::with_exposed_provenance_mut(crate::mm::allocate(_mem_len, true).0 as usize); let dev_event_ptr = - ptr::from_exposed_addr_mut(crate::mm::allocate(_mem_len, true).0 as usize); + ptr::with_exposed_provenance_mut(crate::mm::allocate(_mem_len, true).0 as usize); // Provide memory areas of the queues data structures to the device vq_handler.set_ring_addr(paging::virt_to_phys(VirtAddr::from( @@ -1164,7 +1164,7 @@ impl Virtq for PackedVq { raw: dev_event, }; - let mut notif_ctrl = NotifCtrl::new(ptr::from_exposed_addr_mut( + let mut notif_ctrl = NotifCtrl::new(ptr::with_exposed_provenance_mut( notif_cfg.base() + usize::from(vq_handler.notif_off()) + usize::try_from(notif_cfg.multiplier()).unwrap(), diff --git a/src/drivers/virtio/virtqueue/split.rs b/src/drivers/virtio/virtqueue/split.rs index 3906f3d83b..e4156e270f 100644 --- a/src/drivers/virtio/virtqueue/split.rs +++ b/src/drivers/virtio/virtqueue/split.rs @@ -325,7 +325,8 @@ impl Virtq for SplitVq { // Allocate heap memory via a vec, leak and cast let _mem_len = (size as usize * core::mem::size_of::()) .align_up(BasePageSize::SIZE as usize); - let table_raw = ptr::from_exposed_addr_mut(crate::mm::allocate(_mem_len, true).0 as usize); + let table_raw = + ptr::with_exposed_provenance_mut(crate::mm::allocate(_mem_len, true).0 as usize); let descr_table = DescrTable { raw: unsafe { core::slice::from_raw_parts_mut(table_raw, size as usize) }, @@ -333,10 +334,10 @@ impl Virtq for SplitVq { let _mem_len = (6 + (size as usize * 2)).align_up(BasePageSize::SIZE as usize); let avail_raw = - ptr::from_exposed_addr_mut::(crate::mm::allocate(_mem_len, true).0 as usize); + ptr::with_exposed_provenance_mut::(crate::mm::allocate(_mem_len, true).0 as usize); let _mem_len = (6 + (size as usize * 8)).align_up(BasePageSize::SIZE as usize); let used_raw = - ptr::from_exposed_addr_mut::(crate::mm::allocate(_mem_len, true).0 as usize); + ptr::with_exposed_provenance_mut::(crate::mm::allocate(_mem_len, true).0 as usize); let avail_ring = unsafe { AvailRing { @@ -391,7 +392,7 @@ impl Virtq for SplitVq { used_ring, }; - let notif_ctrl = NotifCtrl::new(ptr::from_exposed_addr_mut( + let notif_ctrl = NotifCtrl::new(ptr::with_exposed_provenance_mut( notif_cfg.base() + usize::from(vq_handler.notif_off()) + usize::try_from(notif_cfg.multiplier()).unwrap(), diff --git a/src/lib.rs b/src/lib.rs index 0e8992a1ac..1db51e3234 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -21,7 +21,6 @@ #![feature(never_type)] #![feature(new_uninit)] #![feature(noop_waker)] -#![feature(pointer_is_aligned)] #![feature(slice_from_ptr_range)] #![cfg_attr( any(target_arch = "aarch64", target_arch = "riscv64"), diff --git a/src/syscalls/condvar.rs b/src/syscalls/condvar.rs index ef70b0c664..95e1d72ba8 100644 --- a/src/syscalls/condvar.rs +++ b/src/syscalls/condvar.rs @@ -26,14 +26,14 @@ impl CondQueue { #[hermit_macro::system] pub unsafe extern "C" fn sys_destroy_queue(ptr: usize) -> i32 { unsafe { - let id = ptr::from_exposed_addr_mut::(ptr); + let id = ptr::with_exposed_provenance_mut::(ptr); if id.is_null() { debug!("sys_wait: invalid address to condition variable"); return -1; } if *id != 0 { - let cond = Box::from_raw(ptr::from_exposed_addr_mut::(*id)); + let cond = Box::from_raw(ptr::with_exposed_provenance_mut::(*id)); mem::drop(cond); } @@ -44,7 +44,7 @@ pub unsafe extern "C" fn sys_destroy_queue(ptr: usize) -> i32 { #[hermit_macro::system] pub unsafe extern "C" fn sys_notify(ptr: usize, count: i32) -> i32 { unsafe { - let id = ptr::from_exposed_addr::(ptr); + let id = ptr::with_exposed_provenance::(ptr); if id.is_null() { // invalid argument @@ -57,7 +57,7 @@ pub unsafe extern "C" fn sys_notify(ptr: usize, count: i32) -> i32 { return -1; } - let cond = &mut *(ptr::from_exposed_addr_mut::(*id)); + let cond = &mut *(ptr::with_exposed_provenance_mut::(*id)); if count < 0 { // Wake up all task that has been waiting for this condition variable @@ -81,7 +81,7 @@ pub unsafe extern "C" fn sys_notify(ptr: usize, count: i32) -> i32 { #[hermit_macro::system] pub unsafe extern "C" fn sys_init_queue(ptr: usize) -> i32 { unsafe { - let id = ptr::from_exposed_addr_mut::(ptr); + let id = ptr::with_exposed_provenance_mut::(ptr); if id.is_null() { debug!("sys_init_queue: invalid address to condition variable"); return -1; @@ -100,7 +100,7 @@ pub unsafe extern "C" fn sys_init_queue(ptr: usize) -> i32 { #[hermit_macro::system] pub unsafe extern "C" fn sys_add_queue(ptr: usize, timeout_ns: i64) -> i32 { unsafe { - let id = ptr::from_exposed_addr_mut::(ptr); + let id = ptr::with_exposed_provenance_mut::(ptr); if id.is_null() { debug!("sys_add_queue: invalid address to condition variable"); return -1; @@ -113,7 +113,7 @@ pub unsafe extern "C" fn sys_add_queue(ptr: usize, timeout_ns: i64) -> i32 { } if timeout_ns <= 0 { - let cond = &mut *(ptr::from_exposed_addr_mut::(*id)); + let cond = &mut *(ptr::with_exposed_provenance_mut::(*id)); cond.counter.fetch_add(1, Ordering::SeqCst); 0 @@ -128,7 +128,7 @@ pub unsafe extern "C" fn sys_add_queue(ptr: usize, timeout_ns: i64) -> i32 { #[hermit_macro::system] pub unsafe extern "C" fn sys_wait(ptr: usize) -> i32 { unsafe { - let id = ptr::from_exposed_addr_mut::(ptr); + let id = ptr::with_exposed_provenance_mut::(ptr); if id.is_null() { debug!("sys_wait: invalid address to condition variable"); return -1; @@ -139,7 +139,7 @@ pub unsafe extern "C" fn sys_wait(ptr: usize) -> i32 { return -1; } - let cond = &mut *(ptr::from_exposed_addr_mut::(*id)); + let cond = &mut *(ptr::with_exposed_provenance_mut::(*id)); cond.sem1.acquire(None); cond.sem2.release(); diff --git a/src/syscalls/interfaces/uhyve.rs b/src/syscalls/interfaces/uhyve.rs index a365516d21..9c375421ae 100644 --- a/src/syscalls/interfaces/uhyve.rs +++ b/src/syscalls/interfaces/uhyve.rs @@ -132,7 +132,7 @@ impl SyscallInterface for Uhyve { argv.push(unsafe { alloc(layout).cast_const() }); - argv_phy.push(ptr::from_exposed_addr::( + argv_phy.push(ptr::with_exposed_provenance::( paging::virtual_to_physical(VirtAddr(argv[i] as u64)) .unwrap() .as_usize(), @@ -148,7 +148,7 @@ impl SyscallInterface for Uhyve { .unwrap(); env.push(unsafe { alloc(layout).cast_const() }); - env_phy.push(ptr::from_exposed_addr::( + env_phy.push(ptr::with_exposed_provenance::( paging::virtual_to_physical(VirtAddr(env[i] as u64)) .unwrap() .as_usize(),