Drop duplicate public re-exports

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,
 };

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};
 

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,
 };

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};
 

kernel/src/arch/x86/cpu.rs

@@ -7,8 +7,10 @@ use alloc::{
 };
 
 use ostd::{
-    arch::tsc_freq,
+    arch::{
         cpu::context::{cpuid, CpuException, PageFaultErrorCode, RawPageFaultInfo, UserContext},
+        tsc_freq,
+    },
     mm::Vaddr,
     Pod,
 };

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,

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;

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},

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,
 };

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::{

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::{

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::{

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};

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::*;

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::{

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,
 };
 

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::{

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 {
                 $(

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,
 };
 

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};

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::{

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::*,

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},
 };
 

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,
 };
 

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},

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;

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::*;
 

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,
 };
 

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,
 };

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,

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;

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! {

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,

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;

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},
 };

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;

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},

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.

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},
 };

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::{

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},

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,

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,

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,

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`]
 ///