alnyan/yggdrasil
1
0
Fork 0
Code Issues 32 Pull Requests Packages Projects Releases Wiki Activity

WIP: migrate to 1.94.0 toolchain, broken riscv64

Browse Source
This commit is contained in:
Mark Poliakov
2026-03-27 17:10:20 +02:00
parent 7f256cf3a6
commit 69cc9a2eaa
189 changed files with 999 additions and 886 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.lock
Generated
-16
View File
@@ -25,7 +25,6 @@ dependencies = [
name = "abi-lib"
version = "0.1.0"
dependencies = [
"compiler_builtins",
"rustc-std-workspace-core",
]
@@ -33,7 +32,6 @@ dependencies = [
name = "abi-serde"
version = "0.1.0"
dependencies = [
"compiler_builtins",
"rustc-std-workspace-alloc",
"rustc-std-workspace-core",
]
@@ -407,15 +405,6 @@ version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
[[package]]
name = "compiler_builtins"
version = "0.1.146"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a97117b1434b79833f39a5fabdf82f890bd98c1988334dea1cb67f7e627fa311"
dependencies = [
"rustc-std-workspace-core",
]
[[package]]
name = "console"
version = "0.15.10"
@@ -1291,9 +1280,7 @@ dependencies = [
[[package]]
name = "libm"
version = "0.2.8"
source = "git+https://git.alnyan.me/yggdrasil/libm.git#ace5825d9683d2bf4a71c8f18f2c854660c297b2"
dependencies = [
"compiler_builtins",
"rustc-std-workspace-core",
]
@@ -1330,7 +1317,6 @@ version = "0.1.0"
name = "libyalloc"
version = "0.1.0"
dependencies = [
"compiler_builtins",
"libc",
"rustc-std-workspace-core",
"yggdrasil-rt",
@@ -3023,7 +3009,6 @@ dependencies = [
"abi-lib",
"abi-serde",
"bytemuck",
"compiler_builtins",
"prettyplease",
"rustc-std-workspace-alloc",
"rustc-std-workspace-core",
@@ -3101,7 +3086,6 @@ dependencies = [
"abi-lib",
"abi-serde",
"cc",
"compiler_builtins",
"libm",
"prettyplease",
"rustc-std-workspace-alloc",
Cargo.toml
+1
View File
@@ -89,6 +89,7 @@ features = ["no_std_stream"]
[workspace.lints.rust]
unexpected_cfgs = { level = "allow", check-cfg = ['cfg(rust_analyzer)'] }
unsafe_op_in_unsafe_fn.level = "deny"
[workspace.lints.clippy]
derivable_impls = { level = "allow" }
etc/aarch64-unknown-none.json
+1
View File
@@ -2,6 +2,7 @@
"arch": "aarch64",
"os": "none",
"abi": "softfloat",
"rustc-abi": "softfloat",
"llvm-target": "aarch64-unknown-none",
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128-Fn32",
"max-atomic-width": 128,
etc/riscv64-unknown-none.json
+1 -2
View File
@@ -1,8 +1,8 @@
{
"arch": "riscv64",
"os": "none",
"abi": "softfloat",
"cpu": "generic-rv64",
"llvm-abiname": "lp64",
"llvm-target": "riscv64",
"data-layout": "e-m:e-p:64:64-i64:64-i128:128-n32:64-S128",
"max-atomic-width": 64,
@@ -20,7 +20,6 @@
"crt-objects-fallback": "false",
"emit-debug-gdb-scripts": false,
"llvm-abiname": "lp64",
"linker": "rust-lld",
"linker-flavor": "ld.lld"
kernel/arch/aarch64/src/lib.rs
-1
View File
@@ -1,5 +1,4 @@
#![no_std]
#![feature(decl_macro)]
#![allow(clippy::new_without_default)]
extern crate alloc;
kernel/arch/hosted/Cargo.toml
+1 -1
View File
@@ -1,7 +1,7 @@
[package]
name = "kernel-arch-hosted"
version = "0.1.0"
edition = "2021"
edition = "2024"
[dependencies]
kernel-arch-interface.workspace = true
kernel/arch/interface/Cargo.toml
+1 -1
View File
@@ -1,7 +1,7 @@
[package]
name = "kernel-arch-interface"
version = "0.1.0"
edition = "2021"
edition = "2024"
[dependencies]
yggdrasil-abi.workspace = true
kernel/arch/interface/src/cpu.rs
+1 -1
View File
@@ -94,7 +94,7 @@ impl<A: Architecture, S: Scheduler + 'static> CpuImpl<A, S> {
///
/// See [Architecture::set_local_cpu].
pub unsafe fn set_local(&'static mut self) {
A::set_local_cpu(self as *mut _ as *mut _)
unsafe { A::set_local_cpu(self as *mut _ as *mut _) }
}
pub fn try_local<'a>() -> Option<LocalCpuImpl<'a, A, S>> {
kernel/arch/interface/src/lib.rs
+1 -1
View File
@@ -1,5 +1,5 @@
#![no_std]
#![feature(step_trait, const_trait_impl, never_type, decl_macro)]
#![feature(never_type)]
#![allow(clippy::new_without_default)]
use core::ops::Range;
kernel/arch/interface/src/mem/mod.rs
+1 -1
View File
@@ -86,7 +86,7 @@ impl<A: KernelTableManager> RawDeviceMemoryMapping<A> {
size: usize,
attrs: DeviceMemoryAttributes,
) -> Result<Self, Error> {
A::map_device_pages(base, size, attrs)
unsafe { A::map_device_pages(base, size, attrs) }
}
/// Consumes the device mapping, leaking its address without deallocating the translation
kernel/arch/x86/Cargo.toml
+1 -1
View File
@@ -1,7 +1,7 @@
[package]
name = "kernel-arch-x86"
version = "0.1.0"
edition = "2021"
edition = "2024"
[dependencies]
kernel-arch-interface.workspace = true
kernel/arch/x86/src/cpuid.rs
+20 -16
View File
@@ -170,36 +170,40 @@ impl CpuFeatureSet for CpuFeatures {
#[cfg(any(target_arch = "x86_64", rust_analyzer))]
unsafe fn raw_cpuid(eax: u32, result: &mut [u32]) {
core::arch::asm!(
r#"
unsafe {
core::arch::asm!(
r#"
push %rbx
cpuid
mov %ebx, {0:e}
pop %rbx
"#,
out(reg) result[0],
out("edx") result[1],
out("ecx") result[2],
in("eax") eax,
options(att_syntax)
);
out(reg) result[0],
out("edx") result[1],
out("ecx") result[2],
in("eax") eax,
options(att_syntax)
);
}
}
#[cfg(any(target_arch = "x86", rust_analyzer))]
unsafe fn raw_cpuid(eax: u32, result: &mut [u32]) {
core::arch::asm!(
r#"
unsafe {
core::arch::asm!(
r#"
push %ebx
cpuid
mov %ebx, {0:e}
pop %ebx
"#,
out(reg) result[0],
out("edx") result[1],
out("ecx") result[2],
in("eax") eax,
options(att_syntax)
);
out(reg) result[0],
out("edx") result[1],
out("ecx") result[2],
in("eax") eax,
options(att_syntax)
);
}
}
fn cpuid_features() -> (EcxFeatures, EdxFeatures, ExtEdxFeatures) {
kernel/arch/x86/src/gdt.rs
+34 -32
View File
@@ -225,42 +225,44 @@ mod imp {
offset: gdt_addr,
};
core::arch::asm!(
r#"
wbinvd
lgdt ({0})
unsafe {
core::arch::asm!(
r#"
wbinvd
lgdt ({0})
// Have to use iretq here
mov %rsp, %rcx
leaq 1f(%rip), %rax
// Have to use iretq here
mov %rsp, %rcx
leaq 1f(%rip), %rax
// SS:RSP
pushq $0x10
pushq %rcx
// SS:RSP
pushq $0x10
pushq %rcx
// RFLAGS
pushfq
// RFLAGS
pushfq
// CS:RIP
pushq $0x08
pushq %rax
iretq
1:
mov $0x10, %ax
mov %ax, %ds
mov %ax, %es
mov %ax, %fs
mov %ax, %gs
mov %ax, %ss
// CS:RIP
pushq $0x08
pushq %rax
iretq
1:
mov $0x10, %ax
mov %ax, %ds
mov %ax, %es
mov %ax, %fs
mov %ax, %gs
mov %ax, %ss
mov $0x28, %ax
ltr %ax
"#,
in(reg) &gdtr,
out("rax") _,
out("rcx") _,
options(att_syntax)
);
mov $0x28, %ax
ltr %ax
"#,
in(reg) &gdtr,
out("rax") _,
out("rcx") _,
options(att_syntax)
);
}
}
/// Initializes and loads the GDT data structure for the current CPU.
@@ -270,7 +272,7 @@ mod imp {
/// Intended to be called once per each CPU during their early initialization.
pub unsafe fn init() -> usize {
let (gdt, tss) = create_gdt();
load_gdt(gdt);
unsafe { load_gdt(gdt) };
(tss as *const Tss).addr()
}
}
kernel/arch/x86/src/intrinsics.rs
+18 -6
View File
@@ -76,7 +76,9 @@ impl IoPortAccess<u32> for IoPort<u32> {
#[inline]
pub unsafe fn inb(port: u16) -> u8 {
let value: u8;
core::arch::asm!("inb %dx, %al", in("dx") port, out("al") value, options(att_syntax));
unsafe {
core::arch::asm!("inb %dx, %al", in("dx") port, out("al") value, options(att_syntax))
};
value
}
@@ -88,7 +90,9 @@ pub unsafe fn inb(port: u16) -> u8 {
#[inline]
pub unsafe fn inw(port: u16) -> u16 {
let value: u16;
core::arch::asm!("inw %dx, %ax", in("dx") port, out("ax") value, options(att_syntax));
unsafe {
core::arch::asm!("inw %dx, %ax", in("dx") port, out("ax") value, options(att_syntax))
};
value
}
@@ -100,7 +104,9 @@ pub unsafe fn inw(port: u16) -> u16 {
#[inline]
pub unsafe fn inl(port: u16) -> u32 {
let value: u32;
core::arch::asm!("inl %dx, %eax", in("dx") port, out("eax") value, options(att_syntax));
unsafe {
core::arch::asm!("inl %dx, %eax", in("dx") port, out("eax") value, options(att_syntax))
};
value
}
@@ -111,7 +117,9 @@ pub unsafe fn inl(port: u16) -> u32 {
/// Provides direct access to port I/O, unsafe.
#[inline]
pub unsafe fn outb(port: u16, value: u8) {
core::arch::asm!("outb %al, %dx", in("dx") port, in("al") value, options(att_syntax));
unsafe {
core::arch::asm!("outb %al, %dx", in("dx") port, in("al") value, options(att_syntax))
};
}
/// Writes a 16-bit value to the I/O port.
@@ -121,7 +129,9 @@ pub unsafe fn outb(port: u16, value: u8) {
/// Provides direct access to port I/O, unsafe.
#[inline]
pub unsafe fn outw(port: u16, value: u16) {
core::arch::asm!("outw %ax, %dx", in("dx") port, in("ax") value, options(att_syntax));
unsafe {
core::arch::asm!("outw %ax, %dx", in("dx") port, in("ax") value, options(att_syntax))
};
}
/// Writes a 32-bit value to the I/O port.
@@ -131,7 +141,9 @@ pub unsafe fn outw(port: u16, value: u16) {
/// Provides direct access to port I/O, unsafe.
#[inline]
pub unsafe fn outl(port: u16, value: u32) {
core::arch::asm!("outl %eax, %dx", in("dx") port, in("eax") value, options(att_syntax));
unsafe {
core::arch::asm!("outl %eax, %dx", in("dx") port, in("eax") value, options(att_syntax))
};
}
#[inline]
kernel/arch/x86_64/Cargo.toml
+1 -1
View File
@@ -1,7 +1,7 @@
[package]
name = "kernel-arch-x86_64"
version = "0.1.0"
edition = "2021"
edition = "2024"
[dependencies]
yggdrasil-abi.workspace = true
kernel/arch/x86_64/src/context.rs
+24 -16
View File
@@ -255,7 +255,7 @@ impl<K: KernelTableManager, PA: PhysicalMemoryAllocator<Address = PhysicalAddres
type Context = TaskContextImpl<K, PA>;
unsafe fn fork(&self, address_space: u64) -> Result<TaskContextImpl<K, PA>, Error> {
TaskContextImpl::from_syscall_frame(self, address_space)
unsafe { TaskContextImpl::from_syscall_frame(self, address_space) }
}
fn set_return_value(&mut self, value: u64) {
@@ -405,18 +405,20 @@ impl<K: KernelTableManager, PA: PhysicalMemoryAllocator<Address = PhysicalAddres
}
unsafe fn store_state(&self) {
FpuContext::store(self.fpu_context.get());
unsafe { FpuContext::store(self.fpu_context.get()) };
// No need to save TSS/%cr3/%fs base back into the TCB, only the kernel
// can make changes to those
}
unsafe fn load_state(&self) {
FpuContext::restore(self.fpu_context.get());
// When the task is interrupted from Ring 3, make the CPU load
// the top of its kernel stack
ArchitectureImpl::set_local_tss_sp0(self.tss_rsp0);
MSR_IA32_FS_BASE.set((*self.inner.get()).fs_base as u64);
CR3.set_address(self.cr3);
unsafe {
FpuContext::restore(self.fpu_context.get());
// When the task is interrupted from Ring 3, make the CPU load
// the top of its kernel stack
ArchitectureImpl::set_local_tss_sp0(self.tss_rsp0);
MSR_IA32_FS_BASE.set((*self.inner.get()).fs_base as u64);
CR3.set_address(self.cr3);
}
}
}
@@ -506,8 +508,10 @@ impl<K: KernelTableManager, PA: PhysicalMemoryAllocator<Address = PhysicalAddres
}
unsafe fn enter(&self) -> ! {
self.load_state();
__x86_64_enter_task(self.inner.get())
unsafe {
self.load_state();
__x86_64_enter_task(self.inner.get())
}
}
unsafe fn switch(&self, from: &Self) {
@@ -515,14 +519,18 @@ impl<K: KernelTableManager, PA: PhysicalMemoryAllocator<Address = PhysicalAddres
return;
}
from.store_state();
self.load_state();
__x86_64_switch_task(self.inner.get(), from.inner.get())
unsafe {
from.store_state();
self.load_state();
__x86_64_switch_task(self.inner.get(), from.inner.get())
}
}
unsafe fn switch_and_drop(&self, thread: *const ()) {
self.load_state();
__x86_64_switch_and_drop(self.inner.get(), thread)
unsafe {
self.load_state();
__x86_64_switch_and_drop(self.inner.get(), thread)
}
}
fn set_thread_pointer(&self, tp: usize) {
@@ -561,7 +569,7 @@ fn setup_common_context(builder: &mut StackBuilder, entry: usize) {
builder.push(0); // %rbx
}
extern "C" {
unsafe extern "C" {
fn __x86_64_task_enter_kernel();
fn __x86_64_task_enter_user();
fn __x86_64_task_enter_from_fork();
kernel/arch/x86_64/src/lib.rs
+8 -6
View File
@@ -103,7 +103,7 @@ impl Architecture for ArchitectureImpl {
unsafe fn set_local_cpu(cpu: *mut ()) {
MSR_IA32_KERNEL_GS_BASE.set(cpu as u64);
core::arch::asm!("wbinvd; swapgs");
unsafe { core::arch::asm!("wbinvd; swapgs") };
}
fn local_cpu() -> *mut () {
@@ -127,7 +127,7 @@ impl Architecture for ArchitectureImpl {
)));
cpu.this = cpu.deref_mut();
cpu.set_local();
unsafe { cpu.set_local() };
}
fn idle_task() -> extern "C" fn(usize) -> ! {
@@ -153,10 +153,12 @@ impl Architecture for ArchitectureImpl {
unsafe fn set_interrupt_mask(mask: bool) -> bool {
let old = Self::interrupt_mask();
if mask {
core::arch::asm!("cli");
} else {
core::arch::asm!("sti");
unsafe {
if mask {
core::arch::asm!("cli");
} else {
core::arch::asm!("sti");
}
}
old
}
kernel/arch/x86_64/src/mem/fixed.rs
+22 -18
View File
@@ -101,29 +101,33 @@ impl DevicePageTableLevel for L3DeviceMemory {
}
pub(super) unsafe fn setup(have_1gib_pages: bool) {
let phys = PhysicalAddress::from_usize(auto_lower_address(&raw const KERNEL_PDPT));
KERNEL_PML4[KERNEL_L0I] = PageEntry::table(phys, PageAttributes::WRITABLE);
unsafe {
let phys = PhysicalAddress::from_usize(auto_lower_address(&raw const KERNEL_PDPT));
KERNEL_PML4[KERNEL_L0I] = PageEntry::table(phys, PageAttributes::WRITABLE);
if have_1gib_pages {
for i in 0..IDENTITY_SIZE_L1 {
let phys = PhysicalAddress::from_usize(i * L1::SIZE);
KERNEL_PDPT[i] = PageEntry::<L1>::block(phys, PageAttributes::WRITABLE);
if have_1gib_pages {
for i in 0..IDENTITY_SIZE_L1 {
let phys = PhysicalAddress::from_usize(i * L1::SIZE);
KERNEL_PDPT[i] = PageEntry::<L1>::block(phys, PageAttributes::WRITABLE);
}
} else {
// TODO
ArchitectureImpl::halt();
}
} else {
// TODO
ArchitectureImpl::halt();
}
// DEVICE_L1 -> Device L2 table
// 0..DEVICE_MAPPING_L3_COUNT -> Device L3 tables -> Device L3 pages
// ..512 -> Device L2 pages
for i in 0..DEVICE_MAPPING_L3_COUNT {
// DEVICE_L1 -> Device L2 table
// 0..DEVICE_MAPPING_L3_COUNT -> Device L3 tables -> Device L3 pages
// ..512 -> Device L2 pages
for i in 0..DEVICE_MAPPING_L3_COUNT {
let phys = PhysicalAddress::from_usize(auto_lower_address(
&raw const DEVICE_MEMORY.normal.0[i],
));
DEVICE_MEMORY.large.0[i] = PageEntry::table(phys, PageAttributes::WRITABLE);
}
let phys =
PhysicalAddress::from_usize(auto_lower_address(&raw const DEVICE_MEMORY.normal.0[i]));
DEVICE_MEMORY.large.0[i] = PageEntry::table(phys, PageAttributes::WRITABLE);
PhysicalAddress::from_usize(auto_lower_address(&raw const DEVICE_MEMORY.large.0));
KERNEL_PDPT[DEVICE_L1] = PageEntry::table(phys, PageAttributes::WRITABLE);
}
let phys = PhysicalAddress::from_usize(auto_lower_address(&raw const DEVICE_MEMORY.large.0));
KERNEL_PDPT[DEVICE_L1] = PageEntry::table(phys, PageAttributes::WRITABLE);
}
pub(super) unsafe fn load() {
kernel/arch/x86_64/src/mem/mod.rs
+12 -6
View File
@@ -41,13 +41,17 @@ impl KernelTableManager for KernelTableManagerImpl {
) -> Result<RawDeviceMemoryMapping<Self>, Error> {
let _lock = fixed::LOCK.lock();
#[allow(static_mut_refs)]
fixed::DEVICE_MEMORY.map_device_pages(PhysicalAddress::from_u64(base), count, attrs)
unsafe {
fixed::DEVICE_MEMORY.map_device_pages(PhysicalAddress::from_u64(base), count, attrs)
}
}
unsafe fn unmap_device_pages(mapping: &RawDeviceMemoryMapping<Self>) {
let _lock = fixed::LOCK.lock();
#[allow(static_mut_refs)]
fixed::DEVICE_MEMORY.unmap_device_pages(mapping);
unsafe {
fixed::DEVICE_MEMORY.unmap_device_pages(mapping)
};
}
}
@@ -84,9 +88,11 @@ pub fn auto_lower_address<T>(pointer: *const T) -> usize {
/// Unsafe, must only be called by BSP during its early init, must already be in "higher-half"
#[inline(never)]
pub unsafe fn init_fixed_tables(have_1gib_pages: bool, bsp: bool) {
fixed::setup(have_1gib_pages);
if bsp {
fixed::load();
unsafe {
fixed::setup(have_1gib_pages);
if bsp {
fixed::load();
}
}
}
@@ -95,5 +101,5 @@ pub unsafe fn init_fixed_tables(have_1gib_pages: bool, bsp: bool) {
/// `address` must be page-aligned.
#[inline]
pub unsafe fn flush_tlb_entry(address: usize) {
core::arch::asm!("invlpg ({0})", in(reg) address, options(att_syntax));
unsafe { core::arch::asm!("invlpg ({0})", in(reg) address, options(att_syntax)) };
}
kernel/arch/x86_64/src/mem/process.rs
+4 -2
View File
@@ -85,8 +85,10 @@ impl<TA: TableAllocator> ProcessAddressSpaceManager<TA> for ProcessAddressSpaceI
}
unsafe fn clear(&mut self) {
self.l0
.drop_range::<TA>(0..((Self::UPPER_LIMIT_PFN * L3::SIZE).page_index::<L1>()));
unsafe {
self.l0
.drop_range::<TA>(0..((Self::UPPER_LIMIT_PFN * L3::SIZE).page_index::<L1>()));
}
}
}
kernel/arch/x86_64/src/mem/table.rs
+24 -18
View File
@@ -220,7 +220,7 @@ impl<L: EntryLevel> PageTable<L> {
/// Unsafe: the caller must ensure the provided reference is properly aligned and contains sane
/// data.
pub unsafe fn from_raw_slice_mut(data: &mut [PageEntry<L>; 512]) -> &mut Self {
core::mem::transmute(data)
unsafe { core::mem::transmute(data) }
}
/// Allocates a new page table, filling it with non-preset entries
@@ -243,8 +243,10 @@ impl<L: EntryLevel> PageTable<L> {
///
/// The caller must ensure the table is no longer in use and is not referenced anymore.
pub unsafe fn free<TA: TableAllocator>(this: PhysicalRefMut<Self, KernelTableManagerImpl>) {
let physical = this.as_physical_address();
TA::free_page_table(physical);
unsafe {
let physical = this.as_physical_address();
TA::free_page_table(physical);
}
}
// /// Returns the physical address of this table
@@ -303,25 +305,29 @@ where
const FULL_RANGE: Range<usize> = 0..512;
unsafe fn drop_range<TA: TableAllocator>(&mut self, range: Range<usize>) {
for index in range {
let entry = self[index];
unsafe {
for index in range {
let entry = self[index];
if let Some(table) = entry.as_table() {
let mut table_ref: PhysicalRefMut<PageTable<L::NextLevel>, KernelTableManagerImpl> =
PhysicalRefMut::map(table);
if let Some(table) = entry.as_table() {
let mut table_ref: PhysicalRefMut<
PageTable<L::NextLevel>,
KernelTableManagerImpl,
> = PhysicalRefMut::map(table);
table_ref.drop_all::<TA>();
table_ref.drop_all::<TA>();
TA::free_page_table(table);
} else if entry.is_present() {
// Memory must've been cleared beforehand, so no non-table entries must be present
panic!(
"Expected a table containing only tables, got table[{}] = {:#x?}",
index, entry.0
);
TA::free_page_table(table);
} else if entry.is_present() {
// Memory must've been cleared beforehand, so no non-table entries must be present
panic!(
"Expected a table containing only tables, got table[{}] = {:#x?}",
index, entry.0
);
}
self[index] = PageEntry::INVALID;
}
self[index] = PageEntry::INVALID;
}
}
}
kernel/driver/block/ahci/Cargo.toml
+1 -1
View File
@@ -1,7 +1,7 @@
[package]
name = "ygg_driver_ahci"
version = "0.1.0"
edition = "2021"
edition = "2024"
authors = ["Mark Poliakov <mark@alnyan.me>"]
[dependencies]
kernel/driver/block/ahci/src/command.rs
+1 -1
View File
@@ -115,7 +115,7 @@ impl AtaCommand for AtaIdentify {
}
unsafe fn into_response(self) -> Self::Response {
DmaBuffer::assume_init(self.buffer)
unsafe { DmaBuffer::assume_init(self.buffer) }
}
}
kernel/driver/bsp/riscv/src/lib.rs
-1
View File
@@ -1,4 +1,3 @@
#![allow(unsafe_op_in_unsafe_fn)]
#![no_std]
extern crate alloc;
kernel/driver/bus/usb/Cargo.toml
+1 -1
View File
@@ -1,7 +1,7 @@
[package]
name = "ygg_driver_usb"
version = "0.1.0"
edition = "2021"
edition = "2024"
authors = ["Mark Poliakov <mark@alnyan.me>"]
[dependencies]
kernel/driver/bus/usb/src/lib.rs
-1
View File
@@ -4,7 +4,6 @@
generic_const_exprs,
iter_array_chunks,
maybe_uninit_as_bytes,
maybe_uninit_fill,
maybe_uninit_array_assume_init
)]
kernel/driver/fs/ext2/Cargo.toml
+1 -1
View File
@@ -1,7 +1,7 @@
[package]
name = "ext2"
version = "0.1.0"
edition = "2021"
edition = "2024"
authors = ["Mark Poliakov <mark@alnyan.me>"]
[dependencies]
kernel/driver/fs/ext2/src/lib.rs
-1
View File
@@ -1,4 +1,3 @@
#![feature(impl_trait_in_assoc_type)]
#![cfg_attr(not(test), no_std)]
#![allow(clippy::new_ret_no_self)]
kernel/driver/fs/kernel-fs/Cargo.toml
+1 -1
View File
@@ -1,7 +1,7 @@
[package]
name = "kernel-fs"
version = "0.1.0"
edition = "2021"
edition = "2024"
authors = ["Mark Poliakov <mark@alnyan.me>"]
[dependencies]
kernel/driver/fs/memfs/Cargo.toml
+1 -1
View File
@@ -1,7 +1,7 @@
[package]
name = "memfs"
version = "0.1.0"
edition = "2021"
edition = "2024"
authors = ["Mark Poliakov <mark@alnyan.me>"]
[dependencies]
kernel/driver/fs/memfs/src/block.rs
+2 -2
View File
@@ -159,7 +159,7 @@ impl<'a, A: BlockAllocator> BlockRaw<'a, A> {
panic!("Null block dereference");
}
&mut *(self.inner.ptr as *mut _)
unsafe { &mut *(self.inner.ptr as *mut _) }
}
#[inline]
@@ -197,7 +197,7 @@ impl<A: BlockAllocator> BlockData<'_, A> {
pub unsafe fn copy_on_write(address: usize) -> Self {
Self {
inner: BlockRaw {
inner: BlockRef::copy_on_write(address),
inner: unsafe { BlockRef::copy_on_write(address) },
},
}
}
kernel/driver/input/Cargo.toml
+1 -1
View File
@@ -1,7 +1,7 @@
[package]
name = "ygg_driver_input"
version = "0.1.0"
edition = "2021"
edition = "2024"
[dependencies]
yggdrasil-abi.workspace = true
kernel/driver/net/core/src/lib.rs
-1
View File
@@ -1,4 +1,3 @@
#![feature(map_try_insert)]
#![allow(clippy::type_complexity, clippy::new_without_default)]
#![no_std]
kernel/driver/net/loopback/Cargo.toml
+1 -1
View File
@@ -1,7 +1,7 @@
[package]
name = "ygg_driver_net_loopback"
version = "0.1.0"
edition = "2021"
edition = "2024"
[dependencies]
yggdrasil-abi.workspace = true
kernel/driver/usb/xhci/Cargo.toml
+1 -1
View File
@@ -1,7 +1,7 @@
[package]
name = "ygg_driver_usb_xhci"
version = "0.1.0"
edition = "2021"
edition = "2024"
authors = ["Mark Poliakov <mark@alnyan.me>"]
[dependencies]
kernel/driver/usb/xhci/src/lib.rs
-1
View File
@@ -1,6 +1,5 @@
#![no_std]
#![allow(clippy::new_without_default)]
#![feature(iter_array_chunks)]
extern crate alloc;
kernel/driver/virtio/core/Cargo.toml
+1 -1
View File
@@ -1,7 +1,7 @@
[package]
name = "ygg_driver_virtio_core"
version = "0.1.0"
edition = "2021"
edition = "2024"
[dependencies]
yggdrasil-abi.workspace = true
kernel/driver/virtio/core/src/queue.rs
+1 -1
View File
@@ -272,7 +272,7 @@ impl DescriptorTable {
visitor: F,
) -> u16 {
debug_assert_ne!(count, 0);
let mut current = self.first_free.unwrap_unchecked();
let mut current = unsafe { self.first_free.unwrap_unchecked() };
let head = current;
for i in 0..count {
let descriptor = &mut self.descriptors[current as usize];
kernel/driver/virtio/gpu/Cargo.toml
+1 -1
View File
@@ -1,7 +1,7 @@
[package]
name = "ygg_driver_virtio_gpu"
version = "0.1.0"
edition = "2021"
edition = "2024"
[dependencies]
yggdrasil-abi.workspace = true
kernel/driver/virtio/net/Cargo.toml
+1 -1
View File
@@ -1,7 +1,7 @@
[package]
name = "ygg_driver_virtio_net"
version = "0.1.0"
edition = "2021"
edition = "2024"
[dependencies]
yggdrasil-abi.workspace = true
kernel/driver/virtio/net/src/lib.rs
+1 -1
View File
@@ -263,7 +263,7 @@ impl<T: Transport + 'static> Device for VirtioNet<T> {
unsafe fn init(self: Arc<Self>, _cx: DeviceInitContext) -> Result<(), Error> {
let status = self.begin_init()?;
self.setup_queues()?;
unsafe { self.setup_queues() }?;
self.finish_init(status);
kernel/lib/device-api/Cargo.toml
+1 -1
View File
@@ -1,7 +1,7 @@
[package]
name = "device-api"
version = "0.1.0"
edition = "2021"
edition = "2024"
authors = ["Mark Poliakov <mark@alnyan.me>"]
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
kernel/lib/device-api/macros/Cargo.toml
+1 -1
View File
@@ -1,7 +1,7 @@
[package]
name = "device-api-macros"
version = "0.1.0"
edition = "2021"
edition = "2024"
authors = ["Mark Poliakov <mark@alnyan.me>"]
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
kernel/lib/device-api/src/i2c.rs
+2 -2
View File
@@ -151,11 +151,11 @@ impl I2CDevice {
impl Device for I2CDevice {
unsafe fn init(self: Arc<Self>, cx: DeviceInitContext) -> Result<(), Error> {
self.device.clone().init(cx)
unsafe { self.device.clone().init(cx) }
}
unsafe fn init_irq(self: Arc<Self>) -> Result<(), Error> {
self.device.clone().init_irq()
unsafe { self.device.clone().init_irq() }
}
fn display_name(&self) -> &str {
kernel/lib/device-api/src/lib.rs
-1
View File
@@ -1,4 +1,3 @@
#![feature(trait_alias)]
#![no_std]
#![allow(clippy::new_without_default)]
kernel/lib/device-tree/src/lib.rs
+1 -1
View File
@@ -10,7 +10,7 @@
//! * `pl011` - basic peripheral usage with `reg` and `interrupts`
//! * `gic` in aarch64 - interrupt controller/mapper implementation
#![cfg_attr(any(not(test), rust_analyzer), no_std)]
#![feature(trait_alias, decl_macro)]
#![feature(decl_macro)]
#![allow(clippy::type_complexity)]
#![warn(missing_docs)]
kernel/lib/module-build/Cargo.toml
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "module-build"
version = "0.1.0"
edition = "2021"
edition = "2024"
[dependencies]
kernel/lib/vmalloc/Cargo.toml
+1 -1
View File
@@ -1,7 +1,7 @@
[package]
name = "vmalloc"
version = "0.1.0"
edition = "2021"
edition = "2024"
authors = ["Mark Poliakov <mark@alnyan.me>"]
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
kernel/lib/vmalloc/src/lib.rs
-1
View File
@@ -6,7 +6,6 @@
#![deny(missing_docs)]
#![no_std]
#![feature(linked_list_cursors)]
extern crate alloc;
kernel/libk/libk-mm/Cargo.toml
+1 -1
View File
@@ -1,7 +1,7 @@
[package]
name = "libk-mm"
version = "0.1.0"
edition = "2021"
edition = "2024"
[dependencies]
yggdrasil-abi.workspace = true
kernel/libk/libk-mm/interface/Cargo.toml
+1 -1
View File
@@ -1,7 +1,7 @@
[package]
name = "libk-mm-interface"
version = "0.1.0"
edition = "2021"
edition = "2024"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
kernel/libk/libk-mm/interface/src/device.rs
+31 -25
View File
@@ -93,13 +93,15 @@ impl<N: DevicePageTableLevel, L: DevicePageTableLevel> DevicePageManager<N, L> {
.ok_or(Error::OutOfMemory)?;
let mapped_address = mapped_base + large_offset;
Ok(RawDeviceMemoryMapping::from_raw_parts(
large_aligned_base.into_u64(),
mapped_address,
mapped_base,
large_page_count,
L::Level::SIZE,
))
Ok(unsafe {
RawDeviceMemoryMapping::from_raw_parts(
large_aligned_base.into_u64(),
mapped_address,
mapped_base,
large_page_count,
L::Level::SIZE,
)
})
} else {
// Allocate from small page pool
let mapped_base = self
@@ -108,13 +110,15 @@ impl<N: DevicePageTableLevel, L: DevicePageTableLevel> DevicePageManager<N, L> {
.ok_or(Error::OutOfMemory)?;
let mapped_address = mapped_base + small_offset;
Ok(RawDeviceMemoryMapping::from_raw_parts(
small_aligned_base.into_u64(),
mapped_address,
mapped_base,
small_page_count,
N::Level::SIZE,
))
Ok(unsafe {
RawDeviceMemoryMapping::from_raw_parts(
small_aligned_base.into_u64(),
mapped_address,
mapped_base,
small_page_count,
N::Level::SIZE,
)
})
}
}
@@ -125,17 +129,19 @@ impl<N: DevicePageTableLevel, L: DevicePageTableLevel> DevicePageManager<N, L> {
&mut self,
mapping: &RawDeviceMemoryMapping<A>,
) {
if mapping.page_size == N::Level::SIZE {
self.normal
.remove_mapping(mapping.base_address, mapping.page_count);
} else if mapping.page_size == L::Level::SIZE {
self.large
.remove_mapping(mapping.base_address, mapping.page_count);
} else {
unreachable!(
"Invalid device memory mapping with page size {:#x}",
mapping.page_size
)
unsafe {
if mapping.page_size == N::Level::SIZE {
self.normal
.remove_mapping(mapping.base_address, mapping.page_count);
} else if mapping.page_size == L::Level::SIZE {
self.large
.remove_mapping(mapping.base_address, mapping.page_count);
} else {
unreachable!(
"Invalid device memory mapping with page size {:#x}",
mapping.page_size
)
}
}
}
}
kernel/libk/libk-mm/interface/src/lib.rs
+1 -1
View File
@@ -1,5 +1,5 @@
#![no_std]
#![feature(step_trait, const_trait_impl)]
#![feature(step_trait)]
use core::ops::{Deref, DerefMut};
kernel/libk/libk-mm/interface/src/pointer.rs
+10 -8
View File
@@ -33,7 +33,7 @@ impl<'a, T: Sized, K: KernelTableManager> PhysicalRefMut<'a, T, K> {
/// contains T. The caller must also take care of access synchronization and make sure no
/// aliasing occurs.
pub unsafe fn map(physical: PhysicalAddress) -> PhysicalRefMut<'a, T, K> {
let value = virtualize_raw::<_, K>(physical);
let value = unsafe { virtualize_raw::<_, K>(physical) };
PhysicalRefMut {
value,
_pd: PhantomData,
@@ -48,7 +48,7 @@ impl<'a, T: Sized, K: KernelTableManager> PhysicalRefMut<'a, T, K> {
/// contains [T; len]. The caller must also take care of access synchronization and make
/// sure no aliasing occurs.
pub unsafe fn map_slice(physical: PhysicalAddress, len: usize) -> PhysicalRefMut<'a, [T], K> {
let value = virtualize_slice_raw::<_, K>(physical, len);
let value = unsafe { virtualize_slice_raw::<_, K>(physical, len) };
PhysicalRefMut {
value,
_pd: PhantomData,
@@ -66,7 +66,9 @@ impl<T: ?Sized, K: KernelTableManager> PhysicalRefMut<'_, T, K> {
impl<T: ?Sized, K: KernelTableManager> AsPhysicalAddress for PhysicalRefMut<'_, T, K> {
unsafe fn as_physical_address(&self) -> PhysicalAddress {
PhysicalAddress::raw_from_virtualized::<K>(PhysicalRefMut::<T, K>::as_address(self))
unsafe {
PhysicalAddress::raw_from_virtualized::<K>(PhysicalRefMut::<T, K>::as_address(self))
}
}
}
@@ -106,7 +108,7 @@ impl<'a, T: Sized, K: KernelTableManager> PhysicalRef<'a, T, K> {
/// The caller must ensure the correct origin of the physical address as well that it actually
/// contains T.
pub unsafe fn map(physical: PhysicalAddress) -> PhysicalRef<'a, T, K> {
let value = virtualize_raw::<_, K>(physical);
let value = unsafe { virtualize_raw::<_, K>(physical) };
PhysicalRef {
value,
_pd: PhantomData,
@@ -121,7 +123,7 @@ impl<'a, T: Sized, K: KernelTableManager> PhysicalRef<'a, T, K> {
/// The caller must ensure the correct origin of the physical address as well that it actually
/// contains [T; len].
pub unsafe fn map_slice(physical: PhysicalAddress, len: usize) -> PhysicalRef<'a, [T], K> {
let value = virtualize_slice_raw::<_, K>(physical, len);
let value = unsafe { virtualize_slice_raw::<_, K>(physical, len) };
PhysicalRef {
value,
_pd: PhantomData,
@@ -139,7 +141,7 @@ impl<T: ?Sized, K: KernelTableManager> PhysicalRef<'_, T, K> {
impl<T: ?Sized, K: KernelTableManager> AsPhysicalAddress for PhysicalRef<'_, T, K> {
unsafe fn as_physical_address(&self) -> PhysicalAddress {
PhysicalAddress::raw_from_virtualized::<K>(PhysicalRef::<T, K>::as_address(self))
unsafe { PhysicalAddress::raw_from_virtualized::<K>(PhysicalRef::<T, K>::as_address(self)) }
}
}
@@ -162,7 +164,7 @@ unsafe fn virtualize_raw<'a, T: Sized, K: KernelTableManager>(
) -> &'a mut T {
// TODO check align
let address = physical.raw_virtualize::<K>();
&mut *(address as *mut T)
unsafe { &mut *(address as *mut T) }
}
unsafe fn virtualize_slice_raw<'a, T: Sized, K: KernelTableManager>(
@@ -171,5 +173,5 @@ unsafe fn virtualize_slice_raw<'a, T: Sized, K: KernelTableManager>(
) -> &'a mut [T] {
// TODO check align
let address = physical.raw_virtualize::<K>();
core::slice::from_raw_parts_mut(address as *mut T, len)
unsafe { core::slice::from_raw_parts_mut(address as *mut T, len) }
}
kernel/libk/libk-mm/interface/src/table.rs
+1 -1
View File
@@ -100,7 +100,7 @@ pub trait EntryLevelDrop {
/// Caller must ensure the unmapped range is not in use by some other thread and will not be
/// referred to from this point.
unsafe fn drop_all<TA: TableAllocator>(&mut self) {
self.drop_range::<TA>(Self::FULL_RANGE)
unsafe { self.drop_range::<TA>(Self::FULL_RANGE) }
}
}
kernel/libk/libk-mm/src/device.rs
+9 -9
View File
@@ -50,7 +50,7 @@ impl DeviceMemoryMapping {
size: usize,
attrs: DeviceMemoryAttributes,
) -> Result<Self, Error> {
let inner = RawDeviceMemoryMapping::map(base.into_u64(), size, attrs)?;
let inner = unsafe { RawDeviceMemoryMapping::map(base.into_u64(), size, attrs)? };
let address = inner.address;
Ok(Self {
inner: Arc::new(inner),
@@ -78,7 +78,7 @@ impl<'a, T: Sized> DeviceMemoryIo<'a, T> {
todo!();
}
// TODO check align
let value = &*(inner.address as *const T);
let value = unsafe { &*(inner.address as *const T) };
Ok(DeviceMemoryIo { inner, value })
}
@@ -94,8 +94,8 @@ impl<'a, T: Sized> DeviceMemoryIo<'a, T> {
attrs: DeviceMemoryAttributes,
) -> Result<DeviceMemoryIo<'a, [T]>, Error> {
let layout = Layout::array::<T>(count).unwrap();
let inner = RawDeviceMemoryMapping::map(base.into_u64(), layout.size(), attrs)?;
let value = core::slice::from_raw_parts(inner.address as *mut T, count);
let inner = unsafe { RawDeviceMemoryMapping::map(base.into_u64(), layout.size(), attrs)? };
let value = unsafe { core::slice::from_raw_parts(inner.address as *mut T, count) };
Ok(DeviceMemoryIo {
inner: Arc::new(inner),
@@ -113,8 +113,8 @@ impl<'a, T: Sized> DeviceMemoryIo<'a, T> {
base: PhysicalAddress,
attrs: DeviceMemoryAttributes,
) -> Result<DeviceMemoryIo<'a, T>, Error> {
let inner = RawDeviceMemoryMapping::map(base.into_u64(), size_of::<T>(), attrs)?;
let value = &*(inner.address as *const T);
let inner = unsafe { RawDeviceMemoryMapping::map(base.into_u64(), size_of::<T>(), attrs)? };
let value = unsafe { &*(inner.address as *const T) };
Ok(DeviceMemoryIo {
inner: Arc::new(inner),
@@ -139,7 +139,7 @@ impl<'a, T: ?Sized> DeviceMemoryIo<'a, T> {
DeviceMemoryIo {
inner: self.inner.clone(),
value: &*value,
value: unsafe { &*value },
}
}
}
@@ -175,8 +175,8 @@ impl<'a, T: Sized> DeviceMemoryIoMut<'a, T> {
attrs: DeviceMemoryAttributes,
) -> Result<DeviceMemoryIoMut<'a, [T]>, Error> {
let layout = Layout::array::<T>(len).unwrap();
let inner = RawDeviceMemoryMapping::map(base.into_u64(), layout.size(), attrs)?;
let value = core::slice::from_raw_parts_mut(inner.address as *mut T, len);
let inner = unsafe { RawDeviceMemoryMapping::map(base.into_u64(), layout.size(), attrs)? };
let value = unsafe { core::slice::from_raw_parts_mut(inner.address as *mut T, len) };
Ok(DeviceMemoryIoMut { inner, value })
}
kernel/libk/libk-mm/src/heap.rs
+1 -1
View File
@@ -59,7 +59,7 @@ unsafe impl GlobalAlloc for KernelAllocator {
unsafe fn dealloc(&self, ptr: *mut u8, layout: Layout) {
let ptr = NonNull::new(ptr).unwrap();
self.inner.lock().free(ptr, layout);
unsafe { self.inner.lock().free(ptr, layout) };
}
}
kernel/libk/libk-mm/src/lib.rs
+8 -14
View File
@@ -1,10 +1,4 @@
#![feature(
slice_ptr_get,
step_trait,
const_trait_impl,
maybe_uninit_as_bytes,
negative_impls
)]
#![feature(slice_ptr_get, maybe_uninit_as_bytes, negative_impls)]
#![no_std]
extern crate alloc;
@@ -46,7 +40,7 @@ impl TableAllocator for TableAllocatorImpl {
}
unsafe fn free_page_table(address: PhysicalAddress) {
phys::free_page(address)
unsafe { phys::free_page(address) }
}
}
@@ -138,7 +132,7 @@ impl<T> PageBox<T, GlobalPhysicalAllocator> {
/// Unsafe: converts a raw physical address back into a [PageBox]. Only intended to be used
/// for allocations previously converted to [PhysicalAddress] via [PageBox::into_physical_raw].
pub unsafe fn from_physical_raw(address: PhysicalAddress) -> PageBox<T> {
PageBox::from_physical_raw_in(address)
unsafe { PageBox::from_physical_raw_in(address) }
}
pub fn from_slice(slice: &[T]) -> Result<PageBox<[T]>, Error>
@@ -335,7 +329,7 @@ impl<T, A: PhysicalMemoryAllocator<Address = PhysicalAddress>> PageBox<MaybeUnin
// 1. MaybeUninit<T> is transparent
// 2. self.value still points to the same memory and is not deallocated
let page_count = self.page_count;
let value = MaybeUninit::assume_init_mut(&mut *self.value);
let value = unsafe { MaybeUninit::assume_init_mut(&mut *self.value) };
// Prevent deallocation of the PageBox with MaybeUninit
core::mem::forget(self);
@@ -363,7 +357,7 @@ impl<T, A: PhysicalMemoryAllocator<Address = PhysicalAddress>> PageBox<[MaybeUni
// 1. MaybeUninit<T> is transparent
// 2. self.value still points to the same memory and is not deallocated
let page_count = self.page_count;
let value = (&mut *self.value).assume_init_mut();
let value = unsafe { (&mut *self.value).assume_init_mut() };
core::mem::forget(self);
@@ -380,7 +374,7 @@ impl<T, A: PhysicalMemoryAllocator<Address = PhysicalAddress>> PageBox<[MaybeUni
///
/// See [MaybeUninit::slice_assume_init_ref]
pub unsafe fn assume_init_slice_ref(&self) -> &[T] {
(&*self.value).assume_init_ref()
unsafe { (&*self.value).assume_init_ref() }
}
/// Returns a mutable reference to the slice data with [MaybeUninit] removed.
@@ -389,7 +383,7 @@ impl<T, A: PhysicalMemoryAllocator<Address = PhysicalAddress>> PageBox<[MaybeUni
///
/// See [MaybeUninit::slice_assume_init_mut]
pub unsafe fn assume_init_slice_mut(&mut self) -> &mut [T] {
(&mut *self.value).assume_init_mut()
unsafe { (&mut *self.value).assume_init_mut() }
}
/// Fills a slice of MaybeUninit<T> with zeroes.
@@ -400,7 +394,7 @@ impl<T, A: PhysicalMemoryAllocator<Address = PhysicalAddress>> PageBox<[MaybeUni
/// trivial types.
pub unsafe fn zero(p: &mut Self) {
let ptr = p.as_mut_ptr() as *mut u8;
let slice = core::slice::from_raw_parts_mut(ptr, p.page_count * L3_PAGE_SIZE);
let slice = unsafe { core::slice::from_raw_parts_mut(ptr, p.page_count * L3_PAGE_SIZE) };
slice.fill(0);
}
}
kernel/libk/libk-mm/src/phys/manager.rs
+6 -4
View File
@@ -49,10 +49,12 @@ impl PhysicalMemoryManager {
page_count: usize,
) -> PhysicalMemoryManager {
let bitmap_len = page_count.div_ceil(BITMAP_WORD_SIZE);
let mut bitmap = PhysicalRefMut::<'static, _, KernelTableManagerImpl>::map_slice(
bitmap_phys_base,
bitmap_len,
);
let mut bitmap = unsafe {
PhysicalRefMut::<'static, _, KernelTableManagerImpl>::map_slice(
bitmap_phys_base,
bitmap_len,
)
};
bitmap.fill(BitmapWord::MAX);
kernel/libk/libk-mm/src/phys/mod.rs
+16 -14
View File
@@ -78,7 +78,7 @@ impl PhysicalMemoryAllocator for GlobalPhysicalAllocator {
}
unsafe fn free_page(page: Self::Address) {
free_page(page)
unsafe { free_page(page) }
}
}
@@ -111,7 +111,7 @@ pub fn stats() -> SystemMemoryStats {
///
/// `addr` must be a page-aligned physical address previously allocated by this implementation.
pub unsafe fn free_page(addr: PhysicalAddress) {
PHYSICAL_MEMORY.get().lock().free_page(addr)
unsafe { PHYSICAL_MEMORY.get().lock().free_page(addr) }
}
fn physical_memory_range<I: Iterator<Item = PhysicalMemoryRegion>>(
@@ -208,13 +208,15 @@ pub unsafe fn init_from_iter<I: Iterator<Item = PhysicalMemoryRegion> + Clone>(
000000:?:libk_mm::phys:207: page_bitmap_phys_base=0x80060000
000000:?:libk_mm::phys:208: total_count=32768
*/
let mut manager = PhysicalMemoryManager::new(
page_bitmap_phys_base,
phys_start
.try_into_usize()
.expect("Memory start didn't fit in usize"),
total_count,
);
let mut manager = unsafe {
PhysicalMemoryManager::new(
page_bitmap_phys_base,
phys_start
.try_into_usize()
.expect("Memory start didn't fit in usize"),
total_count,
)
};
let mut collected = 0;
const MAX_MEMORY: usize = 256 * 1024;
@@ -245,7 +247,7 @@ pub unsafe fn init_from_iter<I: Iterator<Item = PhysicalMemoryRegion> + Clone>(
fn kernel_physical_memory_region() -> PhysicalMemoryRegion {
use core::ptr::addr_of;
extern "C" {
unsafe extern "C" {
static __kernel_start: u8;
static __kernel_end: u8;
}
@@ -259,17 +261,17 @@ fn kernel_physical_memory_region() -> PhysicalMemoryRegion {
PhysicalMemoryRegion { base, size }
}
#[no_mangle]
#[unsafe(no_mangle)]
fn __allocate_page() -> Result<PhysicalAddress, Error> {
alloc_page()
}
#[no_mangle]
#[unsafe(no_mangle)]
fn __allocate_contiguous_pages(count: usize) -> Result<PhysicalAddress, Error> {
alloc_pages_contiguous(count)
}
#[no_mangle]
#[unsafe(no_mangle)]
unsafe fn __free_page(page: PhysicalAddress) {
free_page(page)
unsafe { free_page(page) }
}
kernel/libk/libk-mm/src/process.rs
+4 -4
View File
@@ -185,7 +185,7 @@ impl<TA: TableAllocator> Inner<TA> {
let offset = (pfn - origin_pfn) * L3_PAGE_SIZE;
let virt = pfn * L3_PAGE_SIZE;
if let Ok((phys, dirty)) = self.table.unmap_page(virt) {
if let Ok((phys, dirty)) = unsafe { self.table.unmap_page(virt) } {
backing.release_page(offset as u64, phys, dirty)?;
}
}
@@ -284,7 +284,7 @@ impl<TA: TableAllocator> Inner<TA> {
let offset = ((pfn - origin_pfn) * L3_PAGE_SIZE) as u64;
let virt = pfn * L3_PAGE_SIZE;
let (phys, dirty) = match self.table.unmap_page(virt) {
let (phys, dirty) = match unsafe { self.table.unmap_page(virt) } {
Ok(res) => res,
Err(Error::DoesNotExist) => continue,
Err(error) => return Err(error),
@@ -319,7 +319,7 @@ impl<TA: TableAllocator> Inner<TA> {
})?;
// Drop the tables
self.table.clear();
unsafe { self.table.clear() };
Ok(())
}
@@ -546,7 +546,7 @@ impl<TA: TableAllocator> ProcessAddressSpace<TA> {
let mut lock = self.inner.lock();
lock.unmap_range(address, size / L3_PAGE_SIZE)
unsafe { lock.unmap_range(address, size / L3_PAGE_SIZE) }
}
/// Returns the physical address of the translation table along with its ASID
kernel/libk/libk-util/src/lib.rs
+1 -7
View File
@@ -1,11 +1,5 @@
#![no_std]
#![feature(
linked_list_cursors,
async_fn_traits,
allocator_api,
const_trait_impl,
str_from_utf16_endian
)]
#![feature(linked_list_cursors, async_fn_traits, allocator_api)]
#![allow(clippy::new_without_default)]
extern crate alloc;
kernel/libk/src/lib.rs
-5
View File
@@ -4,13 +4,8 @@
#![feature(
option_get_or_try_insert_with,
async_fn_traits,
new_range_api,
associated_type_defaults,
step_trait,
const_trait_impl,
slice_ptr_get,
never_type,
allocator_api,
trait_alias,
arbitrary_self_types,
slice_split_once,
kernel/modules/test_mod/Cargo.toml
+1 -1
View File
@@ -1,7 +1,7 @@
[package]
name = "test_mod"
version = "0.1.0"
edition = "2021"
edition = "2024"
[lib]
crate-type = ["dylib"]
kernel/src/arch/aarch64/boot/mod.rs
+21 -17
View File
@@ -45,7 +45,7 @@ static mut DTB_PHYSICAL_ADDRESS: PhysicalAddress = PhysicalAddress::ZERO;
unsafe extern "C" fn relocate_kernel(image_base: i64, rela_start: usize, rela_end: usize) {
let rela_count = (rela_end - rela_start) / size_of::<Elf64_Rela>();
let rela_ptr: *const Elf64_Rela = core::ptr::with_exposed_provenance(rela_start);
let rela_table = core::slice::from_raw_parts(rela_ptr, rela_count);
let rela_table = unsafe { core::slice::from_raw_parts(rela_ptr, rela_count) };
for rela in rela_table {
let slot: *mut i64 =
@@ -56,7 +56,7 @@ unsafe extern "C" fn relocate_kernel(image_base: i64, rela_start: usize, rela_en
_ => ArchitectureImpl::halt(),
};
slot.write_volatile(value);
unsafe { slot.write_volatile(value) };
}
}
@@ -82,12 +82,14 @@ unsafe fn leave_el2(pc: usize, sp: usize, x0: usize) -> ! {
ELR_EL2.set(pc as u64);
SP_EL1.set(sp as u64);
core::arch::asm!("eret", in("x0") x0, options(noreturn));
unsafe { core::arch::asm!("eret", in("x0") x0, options(noreturn)) };
}
#[inline]
unsafe fn long_jump(pc: usize, sp: usize) -> ! {
core::arch::asm!("mov sp, {sp}; br {pc}", sp = in(reg) sp, pc = in(reg) pc, options(noreturn));
unsafe {
core::arch::asm!("mov sp, {sp}; br {pc}", sp = in(reg) sp, pc = in(reg) pc, options(noreturn))
};
}
unsafe extern "C" fn bsp_entry_upper() -> ! {
@@ -100,12 +102,12 @@ unsafe extern "C" fn bsp_entry_upper() -> ! {
atomic::fence(Ordering::SeqCst);
let rela_start = (&raw const __rela_start).addr();
let rela_end = (&raw const __rela_end).addr();
let image_base = (KERNEL_VIRT_OFFSET as u64 + KERNEL_LOAD_BASE) as i64;
relocate_kernel(image_base, rela_start, rela_end);
let image_base = unsafe { (KERNEL_VIRT_OFFSET as u64 + KERNEL_LOAD_BASE) as i64 };
unsafe { relocate_kernel(image_base, rela_start, rela_end) };
atomic::fence(Ordering::SeqCst);
// Setup memory management (using DTB from lower half)
if let Err(error) = PLATFORM.init_memory_management(DTB_PHYSICAL_ADDRESS) {
if let Err(error) = unsafe { PLATFORM.init_memory_management(DTB_PHYSICAL_ADDRESS) } {
let _ = error;
ArchitectureImpl::halt();
}
@@ -126,7 +128,7 @@ unsafe extern "C" fn bsp_entry_upper() -> ! {
runtime::init_task_queue();
// Initialize the BSP CPU + the devices
if PLATFORM.init_platform(true).is_err() {
if unsafe { PLATFORM.init_platform(true).is_err() } {
ArchitectureImpl::halt();
}
@@ -159,15 +161,17 @@ unsafe extern "C" fn ap_entry_upper() -> ! {
}
unsafe extern "C" fn bsp_entry_el1() -> ! {
setup_cpu_common();
mem::init_lower(true);
let pc = (bsp_entry_upper as *const ()).addr() + KERNEL_VIRT_OFFSET;
let sp = BSP_STACK.top_addr() + KERNEL_VIRT_OFFSET;
long_jump(pc, sp)
unsafe {
setup_cpu_common();
mem::init_lower(true);
let pc = (bsp_entry_upper as *const ()).addr() + KERNEL_VIRT_OFFSET;
let sp = BSP_STACK.top_addr() + KERNEL_VIRT_OFFSET;
long_jump(pc, sp)
}
}
unsafe extern "C" fn bsp_entry_el2() -> ! {
leave_el2((bsp_entry_el1 as *const ()).addr(), BSP_STACK.top_addr(), 0)
unsafe { leave_el2((bsp_entry_el1 as *const ()).addr(), BSP_STACK.top_addr(), 0) }
}
unsafe extern "C" fn ap_entry_el1(sp: usize) -> ! {
@@ -175,18 +179,18 @@ unsafe extern "C" fn ap_entry_el1(sp: usize) -> ! {
const AP_STACK_PAGES: usize = 8;
setup_cpu_common();
mem::init_lower(false);
unsafe { mem::init_lower(false) };
let stack_pages = phys::alloc_pages_contiguous(AP_STACK_PAGES).unwrap();
let stack_base = stack_pages.virtualize();
let sp = stack_base + L3::SIZE * AP_STACK_PAGES;
let pc = (ap_entry_upper as *const ()).addr() + KERNEL_VIRT_OFFSET;
long_jump(pc, sp)
unsafe { long_jump(pc, sp) }
}
unsafe extern "C" fn ap_entry_el2(sp: usize) -> ! {
leave_el2((ap_entry_el1 as *const ()).addr(), sp, sp)
unsafe { leave_el2((ap_entry_el1 as *const ()).addr(), sp, sp) }
}
global_asm!(
kernel/src/arch/aarch64/exception.rs
+3 -3
View File
@@ -51,7 +51,7 @@ unsafe fn perform_ptw<F: Fn(u32, EntryType)>(virt: usize, handler: F) {
// Strip ASID
let ttbr_phys = PhysicalAddress::from_u64(ttbr_phys & !(0xFFFF << 48));
let Some(l1) = PageTable::<L1>::from_physical(ttbr_phys) else {
let Some(l1) = (unsafe { PageTable::<L1>::from_physical(ttbr_phys) }) else {
handler(0, EntryType::Invalid);
return;
};
@@ -60,14 +60,14 @@ unsafe fn perform_ptw<F: Fn(u32, EntryType)>(virt: usize, handler: F) {
let l2 = l1.walk(l1i);
handler(1, l2);
let l2 = match l2 {
EntryType::Table(_, l2) => PageTable::<L2>::from_physical(l2).unwrap(),
EntryType::Table(_, l2) => unsafe { PageTable::<L2>::from_physical(l2).unwrap() },
_ => return,
};
let l3 = l2.walk(l2i);
handler(2, l3);
let l3 = match l3 {
EntryType::Table(_, l3) => PageTable::<L3>::from_physical(l3).unwrap(),
EntryType::Table(_, l3) => unsafe { PageTable::<L3>::from_physical(l3).unwrap() },
_ => return,
};
kernel/src/arch/aarch64/gic/mod.rs
+23 -21
View File
@@ -164,7 +164,7 @@ impl LocalInterruptController for Gic {
}
unsafe fn init_ap(&self) -> Result<(), Error> {
self.gicc.init();
unsafe { self.gicc.init() };
Ok(())
}
}
@@ -223,30 +223,32 @@ impl Gic {
gicc_base: PhysicalAddress,
) -> Result<Self, Error> {
log::debug!("Init GIC: gicd={:#x}, gicc={:#x}", gicd_base, gicc_base);
let gicd_mmio = Arc::new(RawDeviceMemoryMapping::map(
gicd_base.into_u64(),
0x1000,
Default::default(),
)?);
let gicd_mmio_shared = DeviceMemoryIo::from_raw(gicd_mmio.clone())?;
let gicd_mmio_banked = DeviceMemoryIo::from_raw(gicd_mmio)?;
let gicc_mmio = DeviceMemoryIo::map(gicc_base, Default::default())?;
unsafe {
let gicd_mmio = Arc::new(RawDeviceMemoryMapping::map(
gicd_base.into_u64(),
0x1000,
Default::default(),
)?);
let gicd_mmio_shared = DeviceMemoryIo::from_raw(gicd_mmio.clone())?;
let gicd_mmio_banked = DeviceMemoryIo::from_raw(gicd_mmio)?;
let gicc_mmio = DeviceMemoryIo::map(gicc_base, Default::default())?;
let gicd = Gicd::new(gicd_mmio_shared, gicd_mmio_banked);
let gicc = Gicc::new(gicc_mmio);
let gicd = Gicd::new(gicd_mmio_shared, gicd_mmio_banked);
let gicc = Gicc::new(gicc_mmio);
gicd.init();
gicc.init();
gicd.init();
gicc.init();
// self.gicd.init(gicd);
// self.gicc.init(gicc);
let table = FixedInterruptTable::new(MAX_IRQ);
// self.gicd.init(gicd);
// self.gicc.init(gicc);
let table = FixedInterruptTable::new(MAX_IRQ);
Ok(Self {
gicd,
gicc,
table, // table: IrqSafeRwLock::new(FixedInterruptTable::new()),
})
Ok(Self {
gicd,
gicc,
table, // table: IrqSafeRwLock::new(FixedInterruptTable::new()),
})
}
}
}
kernel/src/arch/aarch64/mod.rs
+19 -16
View File
@@ -82,7 +82,7 @@ impl Platform for AArch64 {
}
let dt = self.dt.get();
if let Err(error) = smp::start_ap_cores(dt) {
if let Err(error) = unsafe { smp::start_ap_cores(dt) } {
log::error!("Could not initialize AP CPUs: {:?}", error);
}
}
@@ -93,20 +93,22 @@ impl Platform for AArch64 {
// }
//
unsafe fn reset(&self) -> ! {
if let Some(reset) = self.reset.try_get() {
reset.reset()
} else {
let psci = self.psci.get();
psci.reset()
unsafe {
if let Some(reset) = self.reset.try_get() {
reset.reset()
} else {
let psci = self.psci.get();
psci.reset()
}
}
}
unsafe fn power_off(&self) -> Result<!, Error> {
Self::halt_aps()?;
unsafe { Self::halt_aps() }?;
if let Some(psci) = self.psci.try_get() {
log::info!("Powering off");
psci.power_off()
unsafe { psci.power_off() }
} else {
log::warn!("No power off method, halting");
ArchitectureImpl::halt();
@@ -160,8 +162,9 @@ impl AArch64 {
dtb_address: PhysicalAddress,
) -> Result<(), Error> {
let dtb: PhysicalRef<[u8]> =
PhysicalRef::map_slice(dtb_address, DeviceTree::MIN_HEADER_SIZE);
let dtb_size = DeviceTree::read_totalsize(&dtb[..]).map_err(|_| Error::InvalidArgument)?;
unsafe { PhysicalRef::map_slice(dtb_address, DeviceTree::MIN_HEADER_SIZE) };
let dtb_size =
unsafe { DeviceTree::read_totalsize(&dtb[..]).map_err(|_| Error::InvalidArgument) }?;
reserve_region(
"dtb",
@@ -171,8 +174,8 @@ impl AArch64 {
},
);
let dtb: PhysicalRef<[u8]> = PhysicalRef::map_slice(dtb_address, dtb_size);
let dt = DeviceTree::from_raw(dtb.as_ptr().addr())?;
let dtb: PhysicalRef<[u8]> = unsafe { PhysicalRef::map_slice(dtb_address, dtb_size) };
let dt = unsafe { DeviceTree::from_raw(dtb.as_ptr().addr()) }?;
// Setup initrd from the dt
let initrd = dt.chosen_initrd();
@@ -194,7 +197,7 @@ impl AArch64 {
let dt = self.dt.init(dt);
// Initialize the physical memory
phys::init_from_iter(dt.memory_regions())?;
unsafe { phys::init_from_iter(dt.memory_regions()) }?;
// Setup initrd
if let Some((initrd_start, initrd_end)) = initrd {
@@ -254,7 +257,7 @@ impl AArch64 {
let per_cpu = PerCpuData {
gic: OneTimeInit::new(),
};
Cpu::init_local(None, per_cpu);
unsafe { Cpu::init_local(None, per_cpu) };
if is_bsp {
atomic::compiler_fence(Ordering::SeqCst);
@@ -266,7 +269,7 @@ impl AArch64 {
config::parse_boot_arguments(bootargs);
// Will register drivers
call_init_array();
unsafe { call_init_array() };
// Create device tree sysfs nodes
device_tree::util::create_sysfs_nodes(dt);
@@ -280,7 +283,7 @@ impl AArch64 {
unflatten_device_tree(dt);
Self::setup_chosen_stdout(dt).ok();
unsafe { Self::setup_chosen_stdout(dt).ok() };
if let Some(machine) = machine_name {
log::info!("Running on {machine:?}");
kernel/src/arch/aarch64/smp.rs
+3 -3
View File
@@ -78,7 +78,7 @@ impl CpuEnableMethod {
Error::DoesNotExist
})?;
psci.start_cpu(id, ip, sp)
unsafe { psci.start_cpu(id, ip, sp) }
}
&Self::SpinTable(cpu_release_addr) => {
// Store a stack for the CPU
@@ -91,7 +91,7 @@ impl CpuEnableMethod {
// Make the CPU jump to __aarch64_ap_spin_table_entry first
let release_ptr =
ptr::with_exposed_provenance_mut::<u64>(cpu_release_addr.virtualize());
let release_atomic = AtomicU64::from_ptr(release_ptr);
let release_atomic = unsafe { AtomicU64::from_ptr(release_ptr) };
let spin_entry_addr =
(__aarch64_ap_spin_table_entry as *const ()).addr() - KERNEL_VIRT_OFFSET;
@@ -146,7 +146,7 @@ pub unsafe fn start_ap_cores(dt: &DeviceTree) -> Result<(), Error> {
barrier::dsb(barrier::ISH);
barrier::isb(barrier::SY);
if let Err(error) = cpu.enable_method.start_cpu(cpu.id as usize, ip, sp) {
if let Err(error) = unsafe { cpu.enable_method.start_cpu(cpu.id as usize, ip, sp) } {
log::error!("Couldn't start cpu{} up: {:?}", cpu.id, error);
continue;
}
kernel/src/arch/mod.rs
+2 -2
View File
@@ -46,7 +46,7 @@ pub trait Platform {
/// The caller must ensure it is actually safe to reset, i.e. no critical processes will be
/// aborted and no data will be lost.
unsafe fn reset(&self) -> ! {
ArchitectureImpl::set_interrupt_mask(true);
unsafe { ArchitectureImpl::set_interrupt_mask(true) };
loop {
ArchitectureImpl::wait_for_interrupt();
}
@@ -59,7 +59,7 @@ pub trait Platform {
/// The caller must ensure it is actually safe to power down, i.e. no critical processes will be
/// aborted and no data will be lost.
unsafe fn power_off(&self) -> Result<!, Error> {
ArchitectureImpl::set_interrupt_mask(true);
unsafe { ArchitectureImpl::set_interrupt_mask(true) };
loop {
ArchitectureImpl::wait_for_interrupt();
}
kernel/src/arch/riscv64/boot/mod.rs
+31 -19
View File
@@ -42,7 +42,7 @@ impl<const N: usize> BootStack<N> {
unsafe extern "C" fn relocate_kernel(image_base: i64, rela_start: usize, rela_end: usize) {
let rela_count = (rela_end - rela_start) / size_of::<Elf64_Rela>();
let rela_ptr: *const Elf64_Rela = core::ptr::with_exposed_provenance(rela_start);
let rela_table = core::slice::from_raw_parts(rela_ptr, rela_count);
let rela_table = unsafe { core::slice::from_raw_parts(rela_ptr, rela_count) };
for rela in rela_table {
let slot: *mut i64 =
@@ -53,12 +53,20 @@ unsafe extern "C" fn relocate_kernel(image_base: i64, rela_start: usize, rela_en
_ => ArchitectureImpl::halt(),
};
slot.write_volatile(value);
unsafe { slot.write_volatile(value) };
}
}
unsafe fn long_jump(pc: usize, sp: usize, a0: usize) -> ! {
core::arch::asm!("mv sp, {sp}; jr {pc}", in("a0") a0, sp = in(reg) sp, pc = in(reg) pc, options(noreturn))
unsafe {
core::arch::asm!(
"mv sp, {sp}; jr {pc}",
in("a0") a0,
sp = in(reg) sp,
pc = in(reg) pc,
options(noreturn)
)
}
}
unsafe extern "C" fn bsp_entry_upper() -> ! {
@@ -71,8 +79,8 @@ unsafe extern "C" fn bsp_entry_upper() -> ! {
atomic::fence(Ordering::SeqCst);
let rela_start = (&raw const __rela_start).addr();
let rela_end = (&raw const __rela_end).addr();
let image_base = (KERNEL_VIRT_OFFSET as u64 + KERNEL_LOAD_BASE) as i64;
relocate_kernel(image_base, rela_start, rela_end);
let image_base = unsafe { (KERNEL_VIRT_OFFSET as u64 + KERNEL_LOAD_BASE) as i64 };
unsafe { relocate_kernel(image_base, rela_start, rela_end) };
atomic::fence(Ordering::SeqCst);
debug::init_logger();
@@ -80,13 +88,13 @@ unsafe extern "C" fn bsp_entry_upper() -> ! {
log::info!("Starting riscv64 upper half");
if DTB_ADDRESS.is_zero() {
if unsafe { DTB_ADDRESS.is_zero() } {
log::error!("No device tree provided");
// No DTB provided
ArchitectureImpl::halt();
}
if let Err(error) = PLATFORM.init_memory_management(DTB_ADDRESS) {
if let Err(error) = unsafe { PLATFORM.init_memory_management(DTB_ADDRESS) } {
log::error!("Failed to initialize memory management: {error:?}");
ArchitectureImpl::halt();
}
@@ -96,7 +104,7 @@ unsafe extern "C" fn bsp_entry_upper() -> ! {
runtime::init_task_queue();
if let Err(error) = PLATFORM.init_platform(BOOT_HART_ID as u32, 0, true) {
if let Err(error) = unsafe { PLATFORM.init_platform(BOOT_HART_ID as u32, 0, true) } {
log::error!("Failed to initialize the platform: {error:?}");
ArchitectureImpl::halt();
}
@@ -105,20 +113,22 @@ unsafe extern "C" fn bsp_entry_upper() -> ! {
}
unsafe extern "C" fn bsp_smode_entry() -> ! {
mem::enable_mmu();
let pc = (bsp_entry_upper as *const ()).addr() + KERNEL_VIRT_OFFSET;
let sp = (&raw const BOOT_STACK).addr() + BOOT_STACK_SIZE + KERNEL_VIRT_OFFSET;
long_jump(pc, sp, 0)
unsafe {
mem::enable_mmu();
let pc = (bsp_entry_upper as *const ()).addr() + KERNEL_VIRT_OFFSET;
let sp = (&raw const BOOT_STACK).addr() + BOOT_STACK_SIZE + KERNEL_VIRT_OFFSET;
long_jump(pc, sp, 0)
}
}
unsafe extern "C" fn ap_smode_upper(context: PhysicalAddress) -> ! {
let hart_id = {
let context = PageBox::<SecondaryContext>::from_physical_raw(context);
let context = unsafe { PageBox::<SecondaryContext>::from_physical_raw(context) };
context.hart_id
};
let queue_index = CPU_COUNT.fetch_add(1, Ordering::Acquire);
if let Err(error) = PLATFORM.init_platform(hart_id as u32, queue_index, false) {
if let Err(error) = unsafe { PLATFORM.init_platform(hart_id as u32, queue_index, false) } {
log::error!("Secondary hart init error: {error:?}");
ArchitectureImpl::halt();
}
@@ -128,11 +138,13 @@ unsafe extern "C" fn ap_smode_upper(context: PhysicalAddress) -> ! {
unsafe extern "C" fn ap_smode_entry(context: PhysicalAddress, sp: PhysicalAddress) -> ! {
compiler_fence(Ordering::SeqCst);
mem::enable_mmu();
compiler_fence(Ordering::SeqCst);
let pc = (ap_smode_upper as *const ()).addr() + KERNEL_VIRT_OFFSET;
let sp = sp.virtualize();
long_jump(pc, sp, context.into_usize())
unsafe {
mem::enable_mmu();
compiler_fence(Ordering::SeqCst);
let pc = (ap_smode_upper as *const ()).addr() + KERNEL_VIRT_OFFSET;
let sp = sp.virtualize();
long_jump(pc, sp, context.into_usize())
}
}
global_asm!(
kernel/src/arch/riscv64/exception.rs
+10 -8
View File
@@ -186,7 +186,7 @@ unsafe fn smode_exception_handler(frame: &mut TrapFrame) {
}
unsafe extern "C" fn smode_interrupt_handler(frame: *mut TrapFrame) {
let frame = &mut *frame;
let frame = unsafe { &mut *frame };
let smode = frame.sstatus & (1 << 8) != 0;
match frame.scause & !(1 << 63) {
@@ -204,24 +204,26 @@ unsafe extern "C" fn smode_interrupt_handler(frame: *mut TrapFrame) {
}
if !smode && let Some(thread) = Thread::get_current() {
thread.handle_pending_signals(frame);
unsafe { thread.handle_pending_signals(frame) };
}
}
unsafe extern "C" fn smode_general_trap_handler(frame: *mut TrapFrame) {
let frame = &mut *frame;
let frame = unsafe { &mut *frame };
let interrupt = frame.scause & (1 << 63) != 0;
let smode = frame.sstatus & (1 << 8) != 0;
match (interrupt, smode) {
(true, _) => smode_interrupt_handler(frame),
(false, true) => smode_exception_handler(frame),
(false, false) => umode_exception_handler(frame),
unsafe {
match (interrupt, smode) {
(true, _) => smode_interrupt_handler(frame),
(false, true) => smode_exception_handler(frame),
(false, false) => umode_exception_handler(frame),
}
}
if !smode && let Some(thread) = Thread::get_current() {
thread.handle_pending_signals(frame);
unsafe { thread.handle_pending_signals(frame) };
}
mem::tlb_flush_full();
}
kernel/src/arch/riscv64/mod.rs
+9 -8
View File
@@ -77,8 +77,9 @@ impl Riscv64 {
&'static self,
dtb_address: PhysicalAddress,
) -> Result<(), Error> {
let dtb = PhysicalRef::<u8>::map_slice(dtb_address, DeviceTree::MIN_HEADER_SIZE);
let dtb_size = DeviceTree::read_totalsize(&dtb[..]).map_err(|_| Error::InvalidArgument)?;
let dtb = unsafe { PhysicalRef::<u8>::map_slice(dtb_address, DeviceTree::MIN_HEADER_SIZE) };
let dtb_size =
unsafe { DeviceTree::read_totalsize(&dtb[..]).map_err(|_| Error::InvalidArgument) }?;
// // Unmap the lower half
// mem::setup_fixed_tables();
@@ -93,8 +94,8 @@ impl Riscv64 {
},
);
let dtb = PhysicalRef::<u8>::map_slice(dtb_address, dtb_size);
let dt = DeviceTree::from_raw(dtb.as_ptr().addr())?;
let dtb = unsafe { PhysicalRef::<u8>::map_slice(dtb_address, dtb_size) };
let dt = unsafe { DeviceTree::from_raw(dtb.as_ptr().addr()) }?;
// Reserve memory regions specified in the DTB
log::info!("Reserved memory:");
@@ -122,7 +123,7 @@ impl Riscv64 {
}
// Initialize the physical memory
phys::init_from_iter(dt.memory_regions())?;
unsafe { phys::init_from_iter(dt.memory_regions()) }?;
self.dt.init(dt);
@@ -160,14 +161,14 @@ impl Riscv64 {
bootstrap: is_bsp,
queue_index,
};
Cpu::init_local(Some(hart_id), per_cpu);
unsafe { Cpu::init_local(Some(hart_id), per_cpu) };
assert_eq!(Cpu::local().id(), hart_id);
exception::init_smode_exceptions();
if is_bsp {
call_init_array();
unsafe { call_init_array() };
unsafe extern "C" {
static __kernel_start: u8;
@@ -196,7 +197,7 @@ impl Riscv64 {
if let Err(error) = Self::setup_clock_timebase(dt) {
log::error!("Could not setup clock timebase from device tree: {error:?}");
}
if let Err(error) = Self::setup_chosen_stdout(dt) {
if let Err(error) = unsafe { Self::setup_chosen_stdout(dt) } {
log::error!("chosen-stdout setup error: {error:?}");
} else {
libk::debug::disable_early_sinks();
kernel/src/arch/x86_64/apic/local.rs
+2 -1
View File
@@ -347,7 +347,8 @@ impl LocalApic {
///
/// Only meant to be called once per processor during their init.
pub unsafe fn new() -> Self {
let regs = DeviceMemoryIo::<Regs>::map(Self::base(), Default::default()).unwrap();
let regs =
unsafe { DeviceMemoryIo::<Regs>::map(Self::base(), Default::default()).unwrap() };
let id = regs.Id.read(Id::ApicId);
kernel/src/arch/x86_64/apic/mod.rs
+30 -24
View File
@@ -65,16 +65,18 @@ unsafe extern "C" fn irq_handler(vector: usize, frame: *mut IrqFrame) {
unreachable!("Got a weird IRQ with vector {}", vector);
}
let cpu = Cpu::local();
let frame = &mut *frame;
unsafe {
let cpu = Cpu::local();
let frame = &mut *frame;
if let Ok(intc) = external_interrupt_controller() {
intc.handle_specific_irq(vector);
}
cpu.local_apic().clear_interrupt();
if let Ok(intc) = external_interrupt_controller() {
intc.handle_specific_irq(vector);
}
cpu.local_apic().clear_interrupt();
if let Some(thread) = Thread::get_current() {
thread.handle_pending_signals(frame);
if let Some(thread) = Thread::get_current() {
thread.handle_pending_signals(frame);
}
}
}
@@ -83,32 +85,36 @@ unsafe extern "C" fn msi_handler(vector: usize, frame: *mut IrqFrame) {
unreachable!("Got a weird MSI with vector {}", vector);
}
let cpu = Cpu::local();
let frame = &mut *frame;
unsafe {
let cpu = Cpu::local();
let frame = &mut *frame;
cpu.local_apic().handle_msi(vector);
cpu.local_apic().clear_interrupt();
cpu.local_apic().handle_msi(vector);
cpu.local_apic().clear_interrupt();
if let Some(thread) = Thread::get_current() {
thread.handle_pending_signals(frame);
if let Some(thread) = Thread::get_current() {
thread.handle_pending_signals(frame);
}
}
}
unsafe extern "C" fn local_timer_irq_handler(frame: *mut IrqFrame) {
let frame = &mut *frame;
unsafe {
let frame = &mut *frame;
runtime::tick();
runtime::tick();
let cpu = Cpu::local();
// Clear interrupt before switching, because otherwise we won't receive the next one
cpu.local_apic().clear_interrupt();
let cpu = Cpu::local();
// Clear interrupt before switching, because otherwise we won't receive the next one
cpu.local_apic().clear_interrupt();
if let Some(queue) = cpu.try_get_scheduler() {
queue.yield_cpu();
}
if let Some(queue) = cpu.try_get_scheduler() {
queue.yield_cpu();
}
if let Some(thread) = Thread::get_current() {
thread.handle_pending_signals(frame);
if let Some(thread) = Thread::get_current() {
thread.handle_pending_signals(frame);
}
}
}
kernel/src/arch/x86_64/boot/mod.rs
+10 -8
View File
@@ -99,15 +99,17 @@ static YBOOT_DATA: LoadProtocolV1 = LoadProtocolV1 {
};
unsafe fn init_dummy_cpu() {
static UNINIT_CPU_INNER: usize = 0;
static UNINIT_CPU_PTR: &usize = &UNINIT_CPU_INNER;
unsafe {
static UNINIT_CPU_INNER: usize = 0;
static UNINIT_CPU_PTR: &usize = &UNINIT_CPU_INNER;
// Point %gs to a dummy structure so that Cpu::get_local() works properly even before the CPU
// data structure is initialized
MSR_IA32_KERNEL_GS_BASE.set(&UNINIT_CPU_PTR as *const _ as u64);
core::arch::asm!("swapgs");
MSR_IA32_KERNEL_GS_BASE.set(&UNINIT_CPU_PTR as *const _ as u64);
core::arch::asm!("swapgs");
// Point %gs to a dummy structure so that Cpu::get_local() works properly even before the CPU
// data structure is initialized
MSR_IA32_KERNEL_GS_BASE.set(&UNINIT_CPU_PTR as *const _ as u64);
core::arch::asm!("swapgs");
MSR_IA32_KERNEL_GS_BASE.set(&UNINIT_CPU_PTR as *const _ as u64);
core::arch::asm!("swapgs");
}
}
/// Application processor entry point
kernel/src/arch/x86_64/exception.rs
+4 -2
View File
@@ -252,7 +252,7 @@ pub unsafe fn init_exceptions(cpu_index: usize) {
static __x86_64_exception_vectors: [usize; 32];
}
for (i, &entry) in __x86_64_exception_vectors.iter().enumerate() {
for (i, &entry) in unsafe { __x86_64_exception_vectors.iter().enumerate() } {
idt[i] = Entry::new(entry, 0x08, Entry::PRESENT | Entry::INT32);
}
@@ -265,7 +265,9 @@ pub unsafe fn init_exceptions(cpu_index: usize) {
offset: idt.as_ptr().addr(),
};
core::arch::asm!("wbinvd; lidt ({0})", in(reg) &idtr, options(att_syntax));
unsafe {
core::arch::asm!("wbinvd; lidt ({0})", in(reg) &idtr, options(att_syntax));
}
}
global_asm!(
kernel/src/arch/x86_64/mod.rs
+62 -48
View File
@@ -94,7 +94,7 @@ impl Platform for X86_64 {
return;
};
smp::start_ap_cores(&pinfo);
unsafe { smp::start_ap_cores(&pinfo) };
}
}
@@ -165,15 +165,17 @@ impl X86_64 {
}
unsafe fn init_physical_memory_from_yboot(data: &LoadProtocolV1) -> Result<(), Error> {
let mmap = PhysicalRef::<AvailableMemoryRegion>::map_slice(
PhysicalAddress::from_u64(data.memory_map.address),
data.memory_map.len as usize,
);
unsafe {
let mmap = PhysicalRef::<AvailableMemoryRegion>::map_slice(
PhysicalAddress::from_u64(data.memory_map.address),
data.memory_map.len as usize,
);
phys::init_from_iter(mmap.as_ref().iter().map(|reg| PhysicalMemoryRegion {
base: PhysicalAddress::from_u64(reg.start_address),
size: reg.page_count as usize * L3::SIZE,
}))
phys::init_from_iter(mmap.as_ref().iter().map(|reg| PhysicalMemoryRegion {
base: PhysicalAddress::from_u64(reg.start_address),
size: reg.page_count as usize * L3::SIZE,
}))
}
}
unsafe fn init_memory_management(
@@ -183,7 +185,9 @@ impl X86_64 {
) -> Result<(), Error> {
let have_1gib_pages = enabled_features.ext_edx.contains(ExtEdxFeatures::PDPE1GB);
mem::init_fixed_tables(have_1gib_pages, is_bsp);
unsafe {
mem::init_fixed_tables(have_1gib_pages, is_bsp);
}
if !is_bsp {
return Ok(());
@@ -198,36 +202,41 @@ impl X86_64 {
},
);
match self.boot_data.get() {
&BootData::YBoot(data) => Self::init_physical_memory_from_yboot(data)?,
unsafe {
match self.boot_data.get() {
&BootData::YBoot(data) => Self::init_physical_memory_from_yboot(data)?,
}
}
Ok(())
}
unsafe fn init_platform(&'static self, cpu_id: usize) -> Result<(), Error> {
let (available_features, enabled_features) = self.init_cpu_features();
let (available_features, enabled_features) = unsafe { self.init_cpu_features() };
PLATFORM
.init_memory_management(&enabled_features, cpu_id == 0)
.expect("Could not initialize memory management");
let local_apic = self.init_local_cpu(cpu_id, available_features, enabled_features);
unsafe {
PLATFORM
.init_memory_management(&enabled_features, cpu_id == 0)
.expect("Could not initialize memory management");
}
let local_apic =
unsafe { self.init_local_cpu(cpu_id, available_features, enabled_features) };
if cpu_id == 0 {
self.setup_from_boot_data()?;
unsafe { self.setup_from_boot_data()? };
// TODO yboot doesn't yet pass any command line options
let cmdline = self.boot_data.get().cmdline();
let mut early = x86::init_platform_early(cmdline)?;
if !config::get().x86.disable_boot_fb
&& let Err(error) = self.init_framebuffer()
&& let Err(error) = unsafe { self.init_framebuffer() }
{
log::error!("Could not initialize boot framebuffer: {error:?}");
}
if let Some(acpi) = self.acpi.try_get() {
self.init_platform_from_acpi(acpi, local_apic)?;
unsafe { self.init_platform_from_acpi(acpi, local_apic)? };
}
if !config::get().x86_64.disable_hpet {
@@ -236,7 +245,7 @@ impl X86_64 {
log::info!("HPET disabled by config");
}
call_init_array();
unsafe { call_init_array() };
x86::init_platform_devices(early);
@@ -289,24 +298,26 @@ impl X86_64 {
available_features: CpuFeatures,
enabled_features: CpuFeatures,
) -> Arc<LocalApic> {
let local_apic = Arc::new(LocalApic::new());
let tss_address = gdt::init();
exception::init_exceptions(cpu_id);
unsafe {
let local_apic = Arc::new(LocalApic::new());
let tss_address = gdt::init();
exception::init_exceptions(cpu_id);
let cpu_data = PerCpuData {
this: null_mut(),
tss_address,
tmp_address: 0,
local_apic: local_apic.clone(),
available_features,
enabled_features,
};
let cpu_data = PerCpuData {
this: null_mut(),
tss_address,
tmp_address: 0,
local_apic: local_apic.clone(),
available_features,
enabled_features,
};
Cpu::init_local(Some(cpu_id as _), cpu_data);
Cpu::init_local(Some(cpu_id as _), cpu_data);
syscall::init_syscall();
syscall::init_syscall();
local_apic
local_apic
}
}
unsafe fn setup_from_boot_data(&self) -> Result<(), Error> {
@@ -315,16 +326,17 @@ impl X86_64 {
// Already reserved in set_boot_data()
x86::set_initrd(data, false);
self.init_acpi_from_rsdp(data.rsdp_address as usize)
unsafe { self.init_acpi_from_rsdp(data.rsdp_address as usize) }
}
}
}
unsafe fn init_acpi_from_rsdp(&self, rsdp: usize) -> Result<(), Error> {
let acpi_tables = AcpiTables::from_rsdp(AcpiHandlerImpl, rsdp).map_err(|err| {
log::error!("Could not initialize ACPI tables: {:?}", err);
Error::InvalidArgument
})?;
let acpi_tables =
unsafe { AcpiTables::from_rsdp(AcpiHandlerImpl, rsdp) }.map_err(|err| {
log::error!("Could not initialize ACPI tables: {:?}", err);
Error::InvalidArgument
})?;
self.acpi.init(acpi_tables);
Ok(())
}
@@ -405,14 +417,16 @@ impl X86_64 {
_ => PixelFormat::R8G8B8A8,
};
let framebuffer = LinearFramebuffer::from_physical_bits(
PhysicalAddress::from_u64(info.res_address),
info.res_size as usize,
info.res_stride as usize,
info.res_width,
info.res_height,
format,
)?;
let framebuffer = unsafe {
LinearFramebuffer::from_physical_bits(
PhysicalAddress::from_u64(info.res_address),
info.res_size as usize,
info.res_stride as usize,
info.res_width,
info.res_height,
format,
)?
};
Some(Arc::new(framebuffer))
}
kernel/src/arch/x86_64/smp.rs
+25 -21
View File
@@ -55,14 +55,16 @@ unsafe fn start_ap_core(apic_id: u32) {
entry: (ap_entry as *const ()).addr(),
};
let mut data_ref = PhysicalRefMut::<ApBootstrapData>::map(AP_BOOTSTRAP_DATA);
let mut data_ref = unsafe { PhysicalRefMut::<ApBootstrapData>::map(AP_BOOTSTRAP_DATA) };
*data_ref = data;
let cpu_count = CPU_COUNT.load(Ordering::Acquire);
// Send an IPI to wake up the AP
core::arch::asm!("wbinvd");
bsp_apic.wakeup_cpu(apic_id, AP_BOOTSTRAP_CODE);
unsafe {
core::arch::asm!("wbinvd");
bsp_apic.wakeup_cpu(apic_id, AP_BOOTSTRAP_CODE);
}
while cpu_count == CPU_COUNT.load(Ordering::Acquire) {
core::hint::spin_loop();
@@ -87,27 +89,29 @@ pub unsafe fn start_ap_cores(info: &ProcessorInfo<AcpiAllocator>) {
let mut identity_l1 = PageTable::<L1>::new_zeroed::<TableAllocatorImpl>().unwrap();
let mut identity_l2 = PageTable::<L2>::new_zeroed::<TableAllocatorImpl>().unwrap();
identity_l1[0] =
PageEntry::<L1>::table(identity_l2.as_physical_address(), PageAttributes::WRITABLE);
identity_l2[0] = PageEntry::<L2>::block(PhysicalAddress::ZERO, PageAttributes::WRITABLE);
unsafe {
identity_l1[0] =
PageEntry::<L1>::table(identity_l2.as_physical_address(), PageAttributes::WRITABLE);
identity_l2[0] = PageEntry::<L2>::block(PhysicalAddress::ZERO, PageAttributes::WRITABLE);
fixed::KERNEL_PML4[0] =
PageEntry::table(identity_l1.as_physical_address(), PageAttributes::WRITABLE);
fixed::KERNEL_PML4[0] =
PageEntry::table(identity_l1.as_physical_address(), PageAttributes::WRITABLE);
// Load AP_BOOTSTRAP_CODE
let mut code_ref = PhysicalRefMut::map_slice(AP_BOOTSTRAP_CODE, AP_BOOTSTRAP_BIN.len());
code_ref.copy_from_slice(AP_BOOTSTRAP_BIN);
// Load AP_BOOTSTRAP_CODE
let mut code_ref = PhysicalRefMut::map_slice(AP_BOOTSTRAP_CODE, AP_BOOTSTRAP_BIN.len());
code_ref.copy_from_slice(AP_BOOTSTRAP_BIN);
for ap in aps.iter() {
if ap.is_ap && ap.state == ProcessorState::WaitingForSipi {
start_ap_core(ap.local_apic_id);
for ap in aps.iter() {
if ap.is_ap && ap.state == ProcessorState::WaitingForSipi {
start_ap_core(ap.local_apic_id);
}
}
// Remove the identity-map
identity_l2[0] = PageEntry::INVALID;
flush_tlb_entry(0);
PageTable::free::<TableAllocatorImpl>(identity_l1);
PageTable::free::<TableAllocatorImpl>(identity_l2);
}
// Remove the identity-map
identity_l2[0] = PageEntry::INVALID;
flush_tlb_entry(0);
PageTable::free::<TableAllocatorImpl>(identity_l1);
PageTable::free::<TableAllocatorImpl>(identity_l2);
}
kernel/src/device/power/arm_psci.rs
+14 -10
View File
@@ -42,16 +42,18 @@ impl Device for Psci {
impl CpuBringupDevice for Psci {
unsafe fn start_cpu(&self, id: usize, ip: usize, arg0: usize) -> Result<(), Error> {
self.call(self.cpu_on as _, id as _, ip as _, arg0 as _);
unsafe { self.call(self.cpu_on as _, id as _, ip as _, arg0 as _) };
Ok(())
}
}
impl ResetDevice for Psci {
unsafe fn reset(&self) -> ! {
ArchitectureImpl::set_interrupt_mask(true);
unsafe {
ArchitectureImpl::set_interrupt_mask(true);
self.call(Self::SYSTEM_RESET as _, 0, 0, 0);
self.call(Self::SYSTEM_RESET as _, 0, 0, 0);
}
loop {
ArchitectureImpl::wait_for_interrupt();
@@ -65,12 +67,14 @@ impl Psci {
#[inline]
unsafe fn call(&self, mut x0: u64, x1: u64, x2: u64, x3: u64) -> u64 {
match self.method {
CallMethod::Hvc => {
core::arch::asm!("hvc #0", inlateout("x0") x0, in("x1") x1, in("x2") x2, in("x3") x3)
}
CallMethod::Smc => {
core::arch::asm!("smc #0", inlateout("x0") x0, in("x1") x1, in("x2") x2, in("x3") x3)
unsafe {
match self.method {
CallMethod::Hvc => {
core::arch::asm!("hvc #0", inlateout("x0") x0, in("x1") x1, in("x2") x2, in("x3") x3)
}
CallMethod::Smc => {
core::arch::asm!("smc #0", inlateout("x0") x0, in("x1") x1, in("x2") x2, in("x3") x3)
}
}
}
x0
@@ -82,7 +86,7 @@ impl Psci {
///
/// Unsafe: requires caller to perform all the necessary shutdown preparations.
pub unsafe fn power_off(&self) -> Result<!, Error> {
self.call(Self::SYSTEM_OFF as _, 0, 0, 0);
unsafe { self.call(Self::SYSTEM_OFF as _, 0, 0, 0) };
unreachable!()
}
}
kernel/src/fs/mod.rs
+1 -1
View File
@@ -53,7 +53,7 @@ unsafe impl BlockAllocator for FileBlockAllocator {
unsafe fn dealloc(block: NonNull<u8>) {
let page = block.as_ptr() as usize;
let physical = PhysicalAddress::from_virtualized(page);
phys::free_page(physical);
unsafe { phys::free_page(physical) };
}
}
kernel/src/main.rs
+2 -21
View File
@@ -1,23 +1,5 @@
//! osdev-x kernel crate
#![feature(
step_trait,
decl_macro,
optimize_attribute,
const_trait_impl,
arbitrary_self_types,
linked_list_cursors,
rustc_private,
allocator_api,
trait_alias,
slice_ptr_get,
slice_split_once,
iter_collect_into,
iter_next_chunk,
exact_size_is_empty,
never_type,
format_args_nl,
associated_type_defaults
)]
#![feature(arbitrary_self_types, rustc_private, never_type)]
#![allow(
clippy::new_without_default,
clippy::fn_to_numeric_cast,
@@ -25,8 +7,7 @@
clippy::match_single_binding,
clippy::missing_transmute_annotations,
clippy::modulo_one,
async_fn_in_trait,
unsafe_op_in_unsafe_fn
async_fn_in_trait
)]
#![deny(missing_docs)]
#![no_std]
kernel/src/mem/mod.rs
+12 -10
View File
@@ -17,13 +17,14 @@ pub const KERNEL_VIRT_OFFSET: usize = kernel_arch::KERNEL_VIRT_OFFSET;
/// The caller must ensure the correct origin of the address, its alignment and that the access is
/// properly synchronized.
pub unsafe fn read_memory<T>(address: PhysicalAddress) -> T {
let io = DeviceMemoryMapping::map(address, size_of::<T>(), Default::default()).unwrap();
let io =
unsafe { DeviceMemoryMapping::map(address, size_of::<T>(), Default::default()).unwrap() };
let address = io.address();
if address.is_multiple_of(align_of::<T>()) {
(address as *const T).read_volatile()
unsafe { (address as *const T).read_volatile() }
} else {
(address as *const T).read_unaligned()
unsafe { (address as *const T).read_unaligned() }
}
}
@@ -34,32 +35,33 @@ pub unsafe fn read_memory<T>(address: PhysicalAddress) -> T {
/// The caller must ensure the correct origin of the address, its alignment and that the access is
/// properly synchronized.
pub unsafe fn write_memory<T>(address: PhysicalAddress, value: T) {
let io = DeviceMemoryMapping::map(address, size_of::<T>(), Default::default()).unwrap();
let io =
unsafe { DeviceMemoryMapping::map(address, size_of::<T>(), Default::default()).unwrap() };
let address = io.address();
if address.is_multiple_of(align_of::<T>()) {
(address as *mut T).write_volatile(value)
unsafe { (address as *mut T).write_volatile(value) }
} else {
(address as *mut T).write_unaligned(value)
unsafe { (address as *mut T).write_unaligned(value) }
}
}
#[unsafe(no_mangle)]
unsafe extern "C" fn memcpy(p0: *mut c_void, p1: *const c_void, len: usize) -> *mut c_void {
compiler_builtins::mem::memcpy(p0 as _, p1 as _, len) as _
unsafe { compiler_builtins::mem::memcpy(p0 as _, p1 as _, len) as _ }
}
#[unsafe(no_mangle)]
unsafe extern "C" fn memcmp(p0: *const c_void, p1: *const c_void, len: usize) -> i32 {
compiler_builtins::mem::memcmp(p0 as _, p1 as _, len)
unsafe { compiler_builtins::mem::memcmp(p0 as _, p1 as _, len) }
}
#[unsafe(no_mangle)]
unsafe extern "C" fn memmove(dst: *mut c_void, src: *const c_void, len: usize) -> *mut c_void {
compiler_builtins::mem::memmove(dst as _, src as _, len) as _
unsafe { compiler_builtins::mem::memmove(dst as _, src as _, len) as _ }
}
#[unsafe(no_mangle)]
unsafe extern "C" fn memset(dst: *mut c_void, val: i32, len: usize) -> *mut c_void {
compiler_builtins::mem::memset(dst as _, val, len) as _
unsafe { compiler_builtins::mem::memset(dst as _, val, len) as _ }
}
kernel/src/task/mod.rs
+1 -1
View File
@@ -75,5 +75,5 @@ pub unsafe fn enter() -> ! {
let queue = CpuQueue::for_cpu(cpu.queue_index());
cpu.set_scheduler(queue);
queue.enter()
unsafe { queue.enter() }
}
kernel/src/util/mod.rs
+1 -1
View File
@@ -90,7 +90,7 @@ pub unsafe fn call_init_array() {
}
let size = (end - base.addr()) / size_of::<InitFn>();
let init_array: &[InitFn] = core::slice::from_raw_parts(base.cast(), size);
let init_array: &[InitFn] = unsafe { core::slice::from_raw_parts(base.cast(), size) };
for function in init_array {
function();
lib/abi-lib/Cargo.toml
+2 -6
View File
@@ -1,18 +1,14 @@
[package]
name = "abi-lib"
version = "0.1.0"
edition = "2021"
edition = "2024"
[dependencies]
core = { version = "1.0.0", optional = true, package = "rustc-std-workspace-core" }
compiler_builtins = { version = "0.1", optional = true }
[features]
default = []
rustc-dep-of-std = [
"core",
"compiler_builtins/rustc-dep-of-std",
]
rustc-dep-of-std = ["core"]
[lints.rust]
unexpected_cfgs = { level = "allow", check-cfg = ['cfg(rust_analyzer)'] }
lib/abi-serde/Cargo.toml
+1 -3
View File
@@ -1,10 +1,9 @@
[package]
name = "abi-serde"
version = "0.1.0"
edition = "2021"
edition = "2024"
[dependencies]
compiler_builtins = { version = "0.1", optional = true }
core = { version = "1.0.0", optional = true, package = "rustc-std-workspace-core" }
rustc_std_alloc = { version = "1.0.0", optional = true, package = "rustc-std-workspace-alloc" }
@@ -13,7 +12,6 @@ default = []
rustc-dep-of-std = [
"core",
"rustc_std_alloc",
"compiler_builtins/rustc-dep-of-std",
]
[lints]
lib/abi/Cargo.toml
+1 -3
View File
@@ -1,7 +1,7 @@
[package]
name = "yggdrasil-abi"
version = "0.1.0"
edition = "2021"
edition = "2024"
authors = ["Mark Poliakov <mark@alnyan.me>"]
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -9,7 +9,6 @@ authors = ["Mark Poliakov <mark@alnyan.me>"]
[dependencies]
core = { version = "1.0.0", optional = true, package = "rustc-std-workspace-core" }
rustc_std_alloc = { version = "1.0.0", optional = true, package = "rustc-std-workspace-alloc" }
compiler_builtins = { version = "0.1", optional = true }
abi-serde = { path = "../abi-serde" }
@@ -33,7 +32,6 @@ serde_kernel = ["serde", "serde/alloc"]
rustc-dep-of-std = [
"core",
"rustc_std_alloc",
"compiler_builtins/rustc-dep-of-std",
"abi-lib/rustc-dep-of-std",
"abi-serde/rustc-dep-of-std"
]
lib/abi/src/lib.rs
+1 -1
View File
@@ -8,7 +8,7 @@
incomplete_features,
stable_features
)]
#![feature(trace_macros, const_trait_impl, ip_in_core)]
#![feature(ip_in_core)]
#![warn(missing_docs)]
#[cfg(all(any(feature = "alloc", test), not(feature = "rustc-dep-of-std")))]
lib/abi/src/time.rs
+8
View File
@@ -54,6 +54,14 @@ impl SystemTime {
nanoseconds: 0,
};
/// Minimum representable system time
pub const MIN: Self = Self::ZERO;
/// Maximum representable system time
pub const MAX: Self = Self {
seconds: u64::MAX,
nanoseconds: 999999999,
};
/// Constructs a new [SystemTime] from seconds and nanoseconds, without performing
/// any adjustments.
///
lib/libutil/Cargo.toml
+1 -1
View File
@@ -1,7 +1,7 @@
[package]
name = "libutil"
version = "0.1.0"
edition = "2021"
edition = "2024"
[dependencies]
lib/libyalloc/Cargo.toml
+1 -5
View File
@@ -1,15 +1,13 @@
[package]
name = "libyalloc"
version = "0.1.0"
edition = "2021"
edition = "2024"
authors = ["Mark Poliakov <mark@alnyan.me>"]
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
core = { version = "1.0.0", optional = true, package = "rustc-std-workspace-core" }
compiler_builtins = { version = "0.1", optional = true }
[target.'cfg(unix)'.dependencies]
libc = { version = "0.2.140", default-features = false }
@@ -22,8 +20,6 @@ global = []
dep-of-kernel = []
rustc-dep-of-std = [
"core",
"compiler_builtins",
"compiler_builtins/rustc-dep-of-std",
"libc/rustc-dep-of-std",
"yggdrasil-rt/rustc-dep-of-std"
]
lib/libyalloc/src/allocator.rs
+13 -11
View File
@@ -62,7 +62,7 @@ where
unsafe fn free(&mut self, ptr: NonNull<u8>) {
let mut node = self.head;
while let Some(mut bucket) = node {
let bucket = bucket.as_mut();
let bucket = unsafe { bucket.as_mut() };
if let (true, _last) = bucket.free(ptr) {
// TODO free the node if last?
@@ -137,16 +137,18 @@ impl<P: PageProvider> BucketAllocator<P> {
pub unsafe fn free(&mut self, ptr: NonNull<u8>, layout: Layout) {
let aligned = layout.pad_to_align();
match aligned.size() {
size if size <= 32 => self.buckets_32.free(ptr),
size if size <= 64 => self.buckets_64.free(ptr),
size if size <= 128 => self.buckets_128.free(ptr),
size if size <= 256 => self.buckets_256.free(ptr),
size if size <= 512 => self.buckets_512.free(ptr),
size if size <= 1024 => self.buckets_1024.free(ptr),
size => {
assert_eq!(usize::from(ptr.addr()) % sys::PAGE_SIZE, 0);
P::unmap_pages(ptr, size.div_ceil(sys::PAGE_SIZE));
unsafe {
match aligned.size() {
size if size <= 32 => self.buckets_32.free(ptr),
size if size <= 64 => self.buckets_64.free(ptr),
size if size <= 128 => self.buckets_128.free(ptr),
size if size <= 256 => self.buckets_256.free(ptr),
size if size <= 512 => self.buckets_512.free(ptr),
size if size <= 1024 => self.buckets_1024.free(ptr),
size => {
assert_eq!(usize::from(ptr.addr()) % sys::PAGE_SIZE, 0);
P::unmap_pages(ptr, size.div_ceil(sys::PAGE_SIZE));
}
}
}
}
lib/libyalloc/src/global.rs
+2 -2
View File
@@ -22,7 +22,7 @@ unsafe impl GlobalAlloc for GlobalAllocator {
#[inline]
unsafe fn dealloc(&self, ptr: *mut u8, layout: Layout) {
let ptr = NonNull::new(ptr).expect("Invalid pointer");
GLOBAL_ALLOCATOR.lock().free(ptr, layout);
unsafe { GLOBAL_ALLOCATOR.lock().free(ptr, layout) };
}
}
@@ -33,7 +33,7 @@ unsafe impl Allocator for GlobalAllocator {
}
unsafe fn deallocate(&self, ptr: NonNull<u8>, layout: Layout) {
GLOBAL_ALLOCATOR.lock().free(ptr, layout);
unsafe { GLOBAL_ALLOCATOR.lock().free(ptr, layout) };
}
}
lib/libyalloc/src/lib.rs
+2 -2
View File
@@ -2,8 +2,6 @@
generic_const_exprs,
arbitrary_self_types,
let_chains,
test,
allocator_api,
unsigned_is_multiple_of
)]
#![cfg_attr(not(test), no_std)]
@@ -13,6 +11,8 @@
clippy::new_without_default,
stable_features
)]
#![cfg_attr(test, feature(test))]
#![cfg_attr(feature = "global", feature(allocator_api))]
#[cfg(test)]
extern crate test;
lib/libyalloc/src/util.rs
+1 -1
View File
@@ -17,7 +17,7 @@ pub trait NonNullExt<T> {
impl<T> NonNullExt<T> for NonNull<T> {
unsafe fn add_ext(self, offset: usize) -> Self {
NonNull::new_unchecked(self.as_ptr().add(offset))
unsafe { NonNull::new_unchecked(self.as_ptr().add(offset)) }
}
}
lib/qemu/Cargo.toml
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "qemu"
version = "0.1.0"
edition = "2021"
edition = "2024"
[dependencies]
lib/runtime/Cargo.toml
+3 -4
View File
@@ -1,7 +1,7 @@
[package]
name = "yggdrasil-rt"
version = "0.1.0"
edition = "2021"
edition = "2024"
authors = ["Mark Poliakov <mark@alnyan.me>"]
build = "build.rs"
@@ -10,8 +10,7 @@ yggdrasil-abi = { path = "../abi", features = ["alloc"] }
core = { version = "1.0.0", optional = true, package = "rustc-std-workspace-core" }
alloc = { version = "1.0.0", optional = true, package = "rustc-std-workspace-alloc" }
compiler_builtins = { version = "0.1", optional = true }
libm = { git = "https://git.alnyan.me/yggdrasil/libm.git", optional = true }
libm = { path = "/home/alnyan/build/sandbox/yggdrasil-packages/libm", optional = true }
abi-lib = { path = "../abi-lib" }
abi-serde = { path = "../abi-serde" }
@@ -27,7 +26,7 @@ __tls_get_addr = []
rustc-dep-of-std = [
"core",
"alloc",
"compiler_builtins/rustc-dep-of-std",
"__tls_get_addr",
"yggdrasil-abi/rustc-dep-of-std",
"abi-lib/rustc-dep-of-std",
"abi-serde/rustc-dep-of-std",
lib/runtime/build.rs
+5 -1
View File
@@ -28,10 +28,14 @@ fn build_libm() {
let mut build = cc::Build::new();
let rust_target = env::var("TARGET").unwrap();
let cc_target = rust_target.replace("-lp64", "");
build
.compiler("clang")
.flag("-ffreestanding")
.flag("-nostdlib");
.flag("-nostdlib")
.target(&cc_target);
add_file(&mut build, "libm/e_fmodf.c");
add_file(&mut build, "libm/e_hypotf.c");
lib/runtime/src/lib.rs
+4 -3
View File
@@ -8,13 +8,14 @@
generic_const_exprs,
maybe_uninit_array_assume_init
)]
#![allow(unused_features)]
#![no_std]
#![warn(missing_docs)]
#![allow(nonstandard_style, clippy::new_without_default, incomplete_features)]
#[cfg(not(rust_analyzer))]
#[allow(unused_extern_crates)]
extern crate compiler_builtins;
// #[cfg(not(any(rust_analyzer, test)))]
// #[allow(unused_extern_crates)]
// extern crate compiler_builtins;
#[allow(unused_extern_crates)]
extern crate alloc;

Some files were not shown because too many files have changed in this diff Show More