From 652657fba5b2976d66cb6fd59e454c1b4357fdf0 Mon Sep 17 00:00:00 2001 From: Ruihan Li Date: Thu, 28 Aug 2025 14:07:33 +0800 Subject: [PATCH] Drop duplicate public re-exports --- kernel/src/arch/loongarch/cpu.rs | 2 +- kernel/src/arch/loongarch/signal.rs | 2 +- kernel/src/arch/riscv/cpu.rs | 2 +- kernel/src/arch/riscv/signal.rs | 2 +- kernel/src/arch/x86/cpu.rs | 6 ++++-- kernel/src/arch/x86/signal.rs | 2 +- kernel/src/lib.rs | 2 +- kernel/src/process/clone.rs | 2 +- kernel/src/process/posix_thread/builder.rs | 6 ++---- kernel/src/process/posix_thread/thread_local.rs | 2 +- kernel/src/process/process/init_proc.rs | 2 +- kernel/src/process/signal/c_types.rs | 2 +- kernel/src/process/signal/mod.rs | 2 +- kernel/src/syscall/arch_prctl.rs | 2 +- kernel/src/syscall/clone.rs | 2 +- kernel/src/syscall/execve.rs | 2 +- kernel/src/syscall/fork.rs | 2 +- kernel/src/syscall/mod.rs | 4 ++-- kernel/src/syscall/rt_sigreturn.rs | 2 +- kernel/src/syscall/sched_affinity.rs | 2 +- kernel/src/syscall/sigaltstack.rs | 2 +- kernel/src/thread/exception.rs | 8 ++++---- kernel/src/thread/kernel_thread.rs | 2 +- kernel/src/thread/mod.rs | 2 +- kernel/src/thread/task.rs | 2 +- kernel/src/thread/work_queue/mod.rs | 4 ++-- kernel/src/thread/work_queue/work_item.rs | 2 +- kernel/src/thread/work_queue/worker.rs | 2 +- kernel/src/thread/work_queue/worker_pool.rs | 2 +- .../write_a_kernel_in_100_lines_templates/lib.rs | 2 +- ostd/src/arch/loongarch/mod.rs | 2 +- ostd/src/arch/loongarch/trap/mod.rs | 6 ++++-- ostd/src/arch/riscv/mm/mod.rs | 2 +- ostd/src/arch/riscv/mod.rs | 2 +- ostd/src/arch/riscv/timer/mod.rs | 4 ++-- ostd/src/arch/x86/mod.rs | 2 +- ostd/src/arch/x86/trap/mod.rs | 2 +- ostd/src/cpu/mod.rs | 3 --- ostd/src/mm/tlb.rs | 5 ++++- ostd/src/mm/vm_space.rs | 5 ++++- ostd/src/smp.rs | 2 +- ostd/src/sync/rcu/monitor.rs | 5 ++++- ostd/src/task/kernel_stack.rs | 5 ++++- ostd/src/task/scheduler/mod.rs | 2 +- ostd/src/user.rs | 2 +- 45 files changed, 69 insertions(+), 58 deletions(-) diff --git a/kernel/src/arch/loongarch/cpu.rs b/kernel/src/arch/loongarch/cpu.rs index d5d50169f..f8d78b668 100644 --- a/kernel/src/arch/loongarch/cpu.rs +++ b/kernel/src/arch/loongarch/cpu.rs @@ -3,7 +3,7 @@ use alloc::{format, string::String}; use ostd::{ - cpu::context::{CpuExceptionInfo, UserContext}, + arch::cpu::context::{CpuExceptionInfo, UserContext}, user::UserContextApi, Pod, }; diff --git a/kernel/src/arch/loongarch/signal.rs b/kernel/src/arch/loongarch/signal.rs index 130aecd33..81ded1803 100644 --- a/kernel/src/arch/loongarch/signal.rs +++ b/kernel/src/arch/loongarch/signal.rs @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MPL-2.0 -use ostd::cpu::context::{CpuExceptionInfo, UserContext}; +use ostd::arch::cpu::context::{CpuExceptionInfo, UserContext}; use crate::process::signal::{sig_num::SigNum, signals::fault::FaultSignal, SignalContext}; diff --git a/kernel/src/arch/riscv/cpu.rs b/kernel/src/arch/riscv/cpu.rs index 3894ffa31..11ba9c580 100644 --- a/kernel/src/arch/riscv/cpu.rs +++ b/kernel/src/arch/riscv/cpu.rs @@ -3,7 +3,7 @@ use alloc::{format, string::String}; use ostd::{ - cpu::context::{CpuExceptionInfo, UserContext}, + arch::cpu::context::{CpuExceptionInfo, UserContext}, user::UserContextApi, Pod, }; diff --git a/kernel/src/arch/riscv/signal.rs b/kernel/src/arch/riscv/signal.rs index 130aecd33..81ded1803 100644 --- a/kernel/src/arch/riscv/signal.rs +++ b/kernel/src/arch/riscv/signal.rs @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MPL-2.0 -use ostd::cpu::context::{CpuExceptionInfo, UserContext}; +use ostd::arch::cpu::context::{CpuExceptionInfo, UserContext}; use crate::process::signal::{sig_num::SigNum, signals::fault::FaultSignal, SignalContext}; diff --git a/kernel/src/arch/x86/cpu.rs b/kernel/src/arch/x86/cpu.rs index e4dca9464..d9bcb0971 100644 --- a/kernel/src/arch/x86/cpu.rs +++ b/kernel/src/arch/x86/cpu.rs @@ -7,8 +7,10 @@ use alloc::{ }; use ostd::{ - arch::tsc_freq, - cpu::context::{cpuid, CpuException, PageFaultErrorCode, RawPageFaultInfo, UserContext}, + arch::{ + cpu::context::{cpuid, CpuException, PageFaultErrorCode, RawPageFaultInfo, UserContext}, + tsc_freq, + }, mm::Vaddr, Pod, }; diff --git a/kernel/src/arch/x86/signal.rs b/kernel/src/arch/x86/signal.rs index 746df6b71..5a23c4c8b 100644 --- a/kernel/src/arch/x86/signal.rs +++ b/kernel/src/arch/x86/signal.rs @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MPL-2.0 -use ostd::cpu::context::{CpuException, PageFaultErrorCode, UserContext}; +use ostd::arch::cpu::context::{CpuException, PageFaultErrorCode, UserContext}; use crate::process::signal::{ constants::*, sig_num::SigNum, signals::fault::FaultSignal, SignalContext, diff --git a/kernel/src/lib.rs b/kernel/src/lib.rs index 5e8a542cf..c3a54b524 100644 --- a/kernel/src/lib.rs +++ b/kernel/src/lib.rs @@ -33,7 +33,7 @@ use kcmdline::KCmdlineArg; use ostd::{ arch::qemu::{exit_qemu, QemuExitCode}, boot::boot_info, - cpu::{CpuId, CpuSet}, + cpu::{set::CpuSet, CpuId}, }; use process::{spawn_init_process, Process}; use sched::SchedPolicy; diff --git a/kernel/src/process/clone.rs b/kernel/src/process/clone.rs index 120d66218..4fa187e47 100644 --- a/kernel/src/process/clone.rs +++ b/kernel/src/process/clone.rs @@ -2,7 +2,7 @@ use core::{num::NonZeroU64, sync::atomic::Ordering}; -use ostd::{cpu::context::UserContext, sync::RwArc, task::Task, user::UserContextApi}; +use ostd::{arch::cpu::context::UserContext, sync::RwArc, task::Task, user::UserContextApi}; use super::{ posix_thread::{AsPosixThread, PosixThreadBuilder, ThreadName}, diff --git a/kernel/src/process/posix_thread/builder.rs b/kernel/src/process/posix_thread/builder.rs index 21831381a..695060bce 100644 --- a/kernel/src/process/posix_thread/builder.rs +++ b/kernel/src/process/posix_thread/builder.rs @@ -3,10 +3,8 @@ use core::sync::atomic::AtomicU32; use ostd::{ - cpu::{ - context::{FpuContext, UserContext}, - CpuSet, - }, + arch::cpu::context::{FpuContext, UserContext}, + cpu::set::CpuSet, sync::RwArc, task::Task, }; diff --git a/kernel/src/process/posix_thread/thread_local.rs b/kernel/src/process/posix_thread/thread_local.rs index 19e4cf5b2..12c7433f8 100644 --- a/kernel/src/process/posix_thread/thread_local.rs +++ b/kernel/src/process/posix_thread/thread_local.rs @@ -3,7 +3,7 @@ use core::cell::{Cell, Ref, RefCell, RefMut}; use aster_rights::Full; -use ostd::{cpu::context::FpuContext, mm::Vaddr, sync::RwArc, task::CurrentTask}; +use ostd::{arch::cpu::context::FpuContext, mm::Vaddr, sync::RwArc, task::CurrentTask}; use super::RobustListHead; use crate::{ diff --git a/kernel/src/process/process/init_proc.rs b/kernel/src/process/process/init_proc.rs index 6052c3e64..1defb6d46 100644 --- a/kernel/src/process/process/init_proc.rs +++ b/kernel/src/process/process/init_proc.rs @@ -2,7 +2,7 @@ //! This module defines functions related to spawning the init process. -use ostd::{cpu::context::UserContext, task::Task, user::UserContextApi}; +use ostd::{arch::cpu::context::UserContext, task::Task, user::UserContextApi}; use super::Process; use crate::{ diff --git a/kernel/src/process/signal/c_types.rs b/kernel/src/process/signal/c_types.rs index 138ea616d..630cebb6d 100644 --- a/kernel/src/process/signal/c_types.rs +++ b/kernel/src/process/signal/c_types.rs @@ -5,7 +5,7 @@ use aster_util::read_union_field; use inherit_methods_macro::inherit_methods; -use ostd::cpu::context::UserContext; +use ostd::arch::cpu::context::UserContext; use super::sig_num::SigNum; use crate::{ diff --git a/kernel/src/process/signal/mod.rs b/kernel/src/process/signal/mod.rs index 8c36e34ef..91c9022cc 100644 --- a/kernel/src/process/signal/mod.rs +++ b/kernel/src/process/signal/mod.rs @@ -20,7 +20,7 @@ use c_types::{siginfo_t, ucontext_t}; use constants::SIGSEGV; pub use events::{SigEvents, SigEventsFilter}; use ostd::{ - cpu::context::{FpuContext, UserContext}, + arch::cpu::context::{FpuContext, UserContext}, user::UserContextApi, }; pub use pause::{with_sigmask_changed, Pause}; diff --git a/kernel/src/syscall/arch_prctl.rs b/kernel/src/syscall/arch_prctl.rs index d8f7f1b45..437e2383c 100644 --- a/kernel/src/syscall/arch_prctl.rs +++ b/kernel/src/syscall/arch_prctl.rs @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MPL-2.0 -use ostd::cpu::context::UserContext; +use ostd::arch::cpu::context::UserContext; use super::SyscallReturn; use crate::prelude::*; diff --git a/kernel/src/syscall/clone.rs b/kernel/src/syscall/clone.rs index 03f51e578..16753510f 100644 --- a/kernel/src/syscall/clone.rs +++ b/kernel/src/syscall/clone.rs @@ -2,7 +2,7 @@ use core::num::NonZeroU64; -use ostd::cpu::context::UserContext; +use ostd::arch::cpu::context::UserContext; use super::SyscallReturn; use crate::{ diff --git a/kernel/src/syscall/execve.rs b/kernel/src/syscall/execve.rs index 14d6636d1..0adc84716 100644 --- a/kernel/src/syscall/execve.rs +++ b/kernel/src/syscall/execve.rs @@ -2,7 +2,7 @@ use aster_rights::WriteOp; use ostd::{ - cpu::context::{FpuContext, GeneralRegs, UserContext}, + arch::cpu::context::{FpuContext, GeneralRegs, UserContext}, user::UserContextApi, }; diff --git a/kernel/src/syscall/fork.rs b/kernel/src/syscall/fork.rs index 7878d43b2..0cd332e2c 100644 --- a/kernel/src/syscall/fork.rs +++ b/kernel/src/syscall/fork.rs @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MPL-2.0 -use ostd::cpu::context::UserContext; +use ostd::arch::cpu::context::UserContext; use super::SyscallReturn; use crate::{ diff --git a/kernel/src/syscall/mod.rs b/kernel/src/syscall/mod.rs index d7101ec45..7f90f3777 100644 --- a/kernel/src/syscall/mod.rs +++ b/kernel/src/syscall/mod.rs @@ -8,7 +8,7 @@ )] pub use clock_gettime::ClockId; -use ostd::cpu::context::UserContext; +use ostd::arch::cpu::context::UserContext; pub use timer_create::create_timer; use crate::{context::Context, cpu::LinuxAbi, prelude::*}; @@ -312,7 +312,7 @@ macro_rules! impl_syscall_nums_and_dispatch_fn { syscall_number: u64, args: [u64; 6], ctx: &crate::context::Context, - user_ctx: &mut ostd::cpu::context::UserContext, + user_ctx: &mut ostd::arch::cpu::context::UserContext, ) -> $crate::prelude::Result<$crate::syscall::SyscallReturn> { match syscall_number { $( diff --git a/kernel/src/syscall/rt_sigreturn.rs b/kernel/src/syscall/rt_sigreturn.rs index 969c20fd3..289efcf97 100644 --- a/kernel/src/syscall/rt_sigreturn.rs +++ b/kernel/src/syscall/rt_sigreturn.rs @@ -3,7 +3,7 @@ use core::sync::atomic::Ordering; use ostd::{ - cpu::context::{FpuContext, UserContext}, + arch::cpu::context::{FpuContext, UserContext}, user::UserContextApi, }; diff --git a/kernel/src/syscall/sched_affinity.rs b/kernel/src/syscall/sched_affinity.rs index ee35bc646..37cf5c250 100644 --- a/kernel/src/syscall/sched_affinity.rs +++ b/kernel/src/syscall/sched_affinity.rs @@ -2,7 +2,7 @@ use core::{cmp, sync::atomic::Ordering}; -use ostd::cpu::{num_cpus, CpuId, CpuSet}; +use ostd::cpu::{num_cpus, set::CpuSet, CpuId}; use super::SyscallReturn; use crate::{prelude::*, process::posix_thread::thread_table, thread::Tid}; diff --git a/kernel/src/syscall/sigaltstack.rs b/kernel/src/syscall/sigaltstack.rs index 3f24695c5..e2e25ac29 100644 --- a/kernel/src/syscall/sigaltstack.rs +++ b/kernel/src/syscall/sigaltstack.rs @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MPL-2.0 -use ostd::{cpu::context::UserContext, user::UserContextApi}; +use ostd::{arch::cpu::context::UserContext, user::UserContextApi}; use super::SyscallReturn; use crate::{ diff --git a/kernel/src/thread/exception.rs b/kernel/src/thread/exception.rs index 7a2857981..de3dfbc85 100644 --- a/kernel/src/thread/exception.rs +++ b/kernel/src/thread/exception.rs @@ -4,12 +4,12 @@ use aster_rights::Full; #[cfg(target_arch = "x86_64")] -use ostd::cpu::context::CpuException; +use ostd::arch::cpu::context::CpuException; #[cfg(target_arch = "riscv64")] -use ostd::cpu::context::CpuExceptionInfo as CpuException; +use ostd::arch::cpu::context::CpuExceptionInfo as CpuException; #[cfg(target_arch = "loongarch64")] -use ostd::cpu::context::CpuExceptionInfo as CpuException; -use ostd::{cpu::context::UserContext, task::Task}; +use ostd::arch::cpu::context::CpuExceptionInfo as CpuException; +use ostd::{arch::cpu::context::UserContext, task::Task}; use crate::{ prelude::*, diff --git a/kernel/src/thread/kernel_thread.rs b/kernel/src/thread/kernel_thread.rs index 5d966f35d..62770aae3 100644 --- a/kernel/src/thread/kernel_thread.rs +++ b/kernel/src/thread/kernel_thread.rs @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MPL-2.0 use ostd::{ - cpu::CpuSet, + cpu::set::CpuSet, task::{Task, TaskOptions}, }; diff --git a/kernel/src/thread/mod.rs b/kernel/src/thread/mod.rs index 725a16157..b8fe5b891 100644 --- a/kernel/src/thread/mod.rs +++ b/kernel/src/thread/mod.rs @@ -5,7 +5,7 @@ use core::sync::atomic::{AtomicBool, Ordering}; use ostd::{ - cpu::{AtomicCpuSet, CpuSet}, + cpu::set::{AtomicCpuSet, CpuSet}, task::Task, }; diff --git a/kernel/src/thread/task.rs b/kernel/src/thread/task.rs index c5a4c899c..ea9e610b8 100644 --- a/kernel/src/thread/task.rs +++ b/kernel/src/thread/task.rs @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MPL-2.0 use ostd::{ - cpu::context::UserContext, + arch::cpu::context::UserContext, sync::Waiter, task::{Task, TaskOptions}, user::{ReturnReason, UserContextApi, UserMode}, diff --git a/kernel/src/thread/work_queue/mod.rs b/kernel/src/thread/work_queue/mod.rs index d097b82d3..ce91fd452 100644 --- a/kernel/src/thread/work_queue/mod.rs +++ b/kernel/src/thread/work_queue/mod.rs @@ -48,7 +48,7 @@ //! Certainly, users can also create a dedicated WorkQueue and WorkerPool. //! //! ```rust -//! use ostd::cpu::CpuSet; +//! use ostd::cpu::set::CpuSet; //! use crate::thread::work_queue::{WorkQueue, WorkerPool, WorkItem}; //! //! fn deferred_task(){ @@ -65,7 +65,7 @@ //! ``` use intrusive_collections::linked_list::LinkedList; -use ostd::cpu::{CpuId, CpuSet}; +use ostd::cpu::{set::CpuSet, CpuId}; use spin::Once; use work_item::{WorkItem, WorkItemAdapter}; use worker_pool::WorkerPool; diff --git a/kernel/src/thread/work_queue/work_item.rs b/kernel/src/thread/work_queue/work_item.rs index 53e8f5700..74d79b742 100644 --- a/kernel/src/thread/work_queue/work_item.rs +++ b/kernel/src/thread/work_queue/work_item.rs @@ -5,7 +5,7 @@ use core::sync::atomic::{AtomicBool, Ordering}; use intrusive_collections::{intrusive_adapter, LinkedListAtomicLink}; -use ostd::cpu::{CpuId, CpuSet}; +use ostd::cpu::{set::CpuSet, CpuId}; use crate::prelude::*; diff --git a/kernel/src/thread/work_queue/worker.rs b/kernel/src/thread/work_queue/worker.rs index 20ec0eadd..cc74a2fe5 100644 --- a/kernel/src/thread/work_queue/worker.rs +++ b/kernel/src/thread/work_queue/worker.rs @@ -3,7 +3,7 @@ #![expect(dead_code)] use ostd::{ - cpu::{CpuId, CpuSet}, + cpu::{set::CpuSet, CpuId}, task::Task, }; diff --git a/kernel/src/thread/work_queue/worker_pool.rs b/kernel/src/thread/work_queue/worker_pool.rs index 3f7eb23ec..485c4d590 100644 --- a/kernel/src/thread/work_queue/worker_pool.rs +++ b/kernel/src/thread/work_queue/worker_pool.rs @@ -8,7 +8,7 @@ use core::{ }; use ostd::{ - cpu::{CpuId, CpuSet}, + cpu::{set::CpuSet, CpuId}, sync::WaitQueue, task::Task, }; diff --git a/osdk/tests/examples_in_book/write_a_kernel_in_100_lines_templates/lib.rs b/osdk/tests/examples_in_book/write_a_kernel_in_100_lines_templates/lib.rs index 7da3dcf95..3e3aa1176 100644 --- a/osdk/tests/examples_in_book/write_a_kernel_in_100_lines_templates/lib.rs +++ b/osdk/tests/examples_in_book/write_a_kernel_in_100_lines_templates/lib.rs @@ -11,8 +11,8 @@ use core::str; use alloc::sync::Arc; use alloc::vec; +use ostd::arch::cpu::context::UserContext; use ostd::arch::qemu::{exit_qemu, QemuExitCode}; -use ostd::cpu::context::UserContext; use ostd::mm::{ CachePolicy, FallibleVmRead, FrameAllocOptions, PageFlags, PageProperty, Vaddr, VmIo, VmSpace, VmWriter, PAGE_SIZE, diff --git a/ostd/src/arch/loongarch/mod.rs b/ostd/src/arch/loongarch/mod.rs index bef9058fb..dc982d468 100644 --- a/ostd/src/arch/loongarch/mod.rs +++ b/ostd/src/arch/loongarch/mod.rs @@ -5,7 +5,7 @@ #![expect(dead_code)] pub mod boot; -pub(crate) mod cpu; +pub mod cpu; pub mod device; mod io; pub(crate) mod iommu; diff --git a/ostd/src/arch/loongarch/trap/mod.rs b/ostd/src/arch/loongarch/trap/mod.rs index 277d46eaf..273e4de49 100644 --- a/ostd/src/arch/loongarch/trap/mod.rs +++ b/ostd/src/arch/loongarch/trap/mod.rs @@ -11,8 +11,10 @@ pub(super) use trap::RawUserContext; pub use trap::TrapFrame; use crate::{ - arch::mm::tlb_flush_addr, cpu::context::CpuExceptionInfo, cpu_local_cell, - mm::MAX_USERSPACE_VADDR, trap::call_irq_callback_functions, + arch::{cpu::context::CpuExceptionInfo, mm::tlb_flush_addr}, + cpu_local_cell, + mm::MAX_USERSPACE_VADDR, + trap::call_irq_callback_functions, }; cpu_local_cell! { diff --git a/ostd/src/arch/riscv/mm/mod.rs b/ostd/src/arch/riscv/mm/mod.rs index 7768f3fed..6ab846f4e 100644 --- a/ostd/src/arch/riscv/mm/mod.rs +++ b/ostd/src/arch/riscv/mm/mod.rs @@ -4,7 +4,7 @@ use alloc::fmt; use core::ops::Range; use crate::{ - cpu::extension::{has_extensions, IsaExtensions}, + arch::cpu::extension::{has_extensions, IsaExtensions}, mm::{ page_prop::{CachePolicy, PageFlags, PageProperty, PrivilegedPageFlags as PrivFlags}, page_table::PageTableEntryTrait, diff --git a/ostd/src/arch/riscv/mod.rs b/ostd/src/arch/riscv/mod.rs index 076d05114..8ecbd04a8 100644 --- a/ostd/src/arch/riscv/mod.rs +++ b/ostd/src/arch/riscv/mod.rs @@ -5,7 +5,7 @@ #![expect(dead_code)] pub mod boot; -pub(crate) mod cpu; +pub mod cpu; pub mod device; mod io; pub(crate) mod iommu; diff --git a/ostd/src/arch/riscv/timer/mod.rs b/ostd/src/arch/riscv/timer/mod.rs index 17cecd421..d1d97f840 100644 --- a/ostd/src/arch/riscv/timer/mod.rs +++ b/ostd/src/arch/riscv/timer/mod.rs @@ -10,8 +10,8 @@ use core::{ use spin::Once; use crate::{ - arch::{self, boot::DEVICE_TREE, trap::TrapFrame}, - cpu::{extension::IsaExtensions, CpuId, PinCurrentCpu}, + arch::{self, boot::DEVICE_TREE, cpu::extension::IsaExtensions, trap::TrapFrame}, + cpu::{CpuId, PinCurrentCpu}, timer::INTERRUPT_CALLBACKS, trap::{self, irq::IrqLine}, }; diff --git a/ostd/src/arch/x86/mod.rs b/ostd/src/arch/x86/mod.rs index f8f2de14b..e00d00b80 100644 --- a/ostd/src/arch/x86/mod.rs +++ b/ostd/src/arch/x86/mod.rs @@ -3,7 +3,7 @@ //! Platform-specific code for the x86 platform. pub mod boot; -pub(crate) mod cpu; +pub mod cpu; pub mod device; pub(crate) mod ex_table; pub(crate) mod io; diff --git a/ostd/src/arch/x86/trap/mod.rs b/ostd/src/arch/x86/trap/mod.rs index b850b5b2d..d53cfc30d 100644 --- a/ostd/src/arch/x86/trap/mod.rs +++ b/ostd/src/arch/x86/trap/mod.rs @@ -28,10 +28,10 @@ use spin::Once; use super::{cpu::context::GeneralRegs, ex_table::ExTable}; use crate::{ arch::{ + cpu::context::{CpuException, PageFaultErrorCode, RawPageFaultInfo}, if_tdx_enabled, irq::{disable_local, enable_local}, }, - cpu::context::{CpuException, PageFaultErrorCode, RawPageFaultInfo}, cpu_local_cell, mm::{ kspace::{KERNEL_PAGE_TABLE, LINEAR_MAPPING_BASE_VADDR, LINEAR_MAPPING_VADDR_RANGE}, diff --git a/ostd/src/cpu/mod.rs b/ostd/src/cpu/mod.rs index b7a4a8807..4d49d4649 100644 --- a/ostd/src/cpu/mod.rs +++ b/ostd/src/cpu/mod.rs @@ -5,9 +5,6 @@ pub mod local; pub mod set; -pub use set::{AtomicCpuSet, CpuSet}; - -pub use crate::arch::cpu::*; use crate::{cpu_local_cell, task::atomic_mode::InAtomicMode}; /// The ID of a CPU in the system. diff --git a/ostd/src/mm/tlb.rs b/ostd/src/mm/tlb.rs index 571f78707..0ff8d0fee 100644 --- a/ostd/src/mm/tlb.rs +++ b/ostd/src/mm/tlb.rs @@ -16,7 +16,10 @@ use super::{ use crate::{ arch::irq, const_assert, - cpu::{AtomicCpuSet, CpuSet, PinCurrentCpu}, + cpu::{ + set::{AtomicCpuSet, CpuSet}, + PinCurrentCpu, + }, cpu_local, sync::{LocalIrqDisabled, SpinLock}, }; diff --git a/ostd/src/mm/vm_space.rs b/ostd/src/mm/vm_space.rs index 326565968..394395471 100644 --- a/ostd/src/mm/vm_space.rs +++ b/ostd/src/mm/vm_space.rs @@ -13,7 +13,10 @@ use core::{ops::Range, sync::atomic::Ordering}; use super::{page_table::PageTableConfig, AnyUFrameMeta, PagingLevel}; use crate::{ arch::mm::{current_page_table_paddr, PageTableEntry, PagingConsts}, - cpu::{AtomicCpuSet, CpuSet, PinCurrentCpu}, + cpu::{ + set::{AtomicCpuSet, CpuSet}, + PinCurrentCpu, + }, cpu_local_cell, io::IoMem, mm::{ diff --git a/ostd/src/smp.rs b/ostd/src/smp.rs index 04c1bf5c8..0c1d88463 100644 --- a/ostd/src/smp.rs +++ b/ostd/src/smp.rs @@ -14,7 +14,7 @@ use crate::{ irq::{send_ipi, HwCpuId}, trap::TrapFrame, }, - cpu::{CpuSet, PinCurrentCpu}, + cpu::{set::CpuSet, PinCurrentCpu}, cpu_local, sync::SpinLock, trap::{self, irq::IrqLine}, diff --git a/ostd/src/sync/rcu/monitor.rs b/ostd/src/sync/rcu/monitor.rs index a247367c3..eb5d7d3c6 100644 --- a/ostd/src/sync/rcu/monitor.rs +++ b/ostd/src/sync/rcu/monitor.rs @@ -7,7 +7,10 @@ use core::sync::atomic::{ }; use crate::{ - cpu::{AtomicCpuSet, CpuId, CpuSet, PinCurrentCpu}, + cpu::{ + set::{AtomicCpuSet, CpuSet}, + CpuId, PinCurrentCpu, + }, prelude::*, sync::SpinLock, task::atomic_mode::AsAtomicModeGuard, diff --git a/ostd/src/task/kernel_stack.rs b/ostd/src/task/kernel_stack.rs index cf56c8dfa..4d27ffddf 100644 --- a/ostd/src/task/kernel_stack.rs +++ b/ostd/src/task/kernel_stack.rs @@ -4,7 +4,10 @@ use core::sync::atomic::Ordering; use crate::{ arch::mm::tlb_flush_addr_range, - cpu::{AtomicCpuSet, CpuSet, PinCurrentCpu}, + cpu::{ + set::{AtomicCpuSet, CpuSet}, + PinCurrentCpu, + }, impl_frame_meta_for, mm::{ kspace::kvirt_area::KVirtArea, diff --git a/ostd/src/task/scheduler/mod.rs b/ostd/src/task/scheduler/mod.rs index f898ebf1f..a734a6e54 100644 --- a/ostd/src/task/scheduler/mod.rs +++ b/ostd/src/task/scheduler/mod.rs @@ -72,7 +72,7 @@ use spin::Once; use super::{preempt::cpu_local, processor, Task}; use crate::{ - cpu::{CpuId, CpuSet, PinCurrentCpu}, + cpu::{set::CpuSet, CpuId, PinCurrentCpu}, prelude::*, task::disable_preempt, timer, diff --git a/ostd/src/user.rs b/ostd/src/user.rs index 351112199..cde26b869 100644 --- a/ostd/src/user.rs +++ b/ostd/src/user.rs @@ -2,7 +2,7 @@ //! User mode. -use crate::{arch::trap::TrapFrame, cpu::context::UserContext}; +use crate::arch::{cpu::context::UserContext, trap::TrapFrame}; /// Specific architectures need to implement this trait. This should only used in [`UserMode`] ///