Clean ffi 1 (#8)

* clean the tcb debug

* add the map_kernel_devices of aarch64,but need fix the riscv64

* clean warnings and fmt

* add the riscv64 map_kernel_devices

src/boot/mod.rs

@@ -6,7 +6,7 @@ mod utils;
 
 use core::mem::size_of;
 
-use crate::ffi::tcbDebugAppend;
+// use crate::ffi::tcbDebugAppend;
 use crate::{BIT, ROUND_UP};
 use log::debug;
 use sel4_common::arch::config::PADDR_TOP;
@@ -142,26 +142,26 @@ pub fn bi_finalise(dtb_size: usize, dtb_phys_addr: usize, extra_bi_size: usize)
 }
 
 pub fn init_core_state(scheduler_action: *mut tcb_t) {
- unsafe {
-   #[cfg(feature = "ENABLE_SMP")]
-   if scheduler_action as usize != 0 && scheduler_action as usize != 1 {
-   tcbDebugAppend(scheduler_action);
-   }
-   let idle_thread = {
-   #[cfg(not(feature = "ENABLE_SMP"))]
-   {
-   ksIdleThread as *mut tcb_t
-   }
-   #[cfg(feature = "ENABLE_SMP")]
-   {
-   ksSMP[cpu_id()].ksIdleThread as *mut tcb_t
-   }
-   };
-
-  tcbDebugAppend(idle_thread);
- set_current_scheduler_action(scheduler_action as usize);
-  set_current_thread(get_idle_thread());
- }
+ // unsafe {
+ // #[cfg(feature = "ENABLE_SMP")]
+ // if scheduler_action as usize != 0 && scheduler_action as usize != 1 {
+ // tcbDebugAppend(scheduler_action);
+ // }
+ // let idle_thread = {
+ // #[cfg(not(feature = "ENABLE_SMP"))]
+ // {
+ // ksIdleThread as *mut tcb_t
+ // }
+ // #[cfg(feature = "ENABLE_SMP")]
+ // {
+ // ksSMP[cpu_id()].ksIdleThread as *mut tcb_t
+ // }
+ // };
+ // tcbDebugAppend(idle_thread);
+ // }
+
+ set_current_scheduler_action(scheduler_action as usize);
+ set_current_thread(get_idle_thread());
 }
 
 #[cfg(feature = "ENABLE_SMP")]

src/ffi.rs

@@ -1,12 +1,8 @@
-use sel4_task::tcb_t;
-
 extern "C" {
  // #[cfg(target_arch = "aarch64")]
  // pub fn kernel_stack_alloc();
  #[cfg(target_arch = "riscv64")]
  pub fn init_plat();
- pub fn tcbDebugAppend(action: *mut tcb_t);
- pub fn tcbDebugRemove(tcb: *mut tcb_t);
 }
 
 #[cfg(feature = "ENABLE_SMP")]

src/interfaces_impl/cspace.rs

@@ -1,5 +1,5 @@
 use crate::config::CONFIG_MAX_NUM_WORK_UNITS_PER_PREEMPTION;
-use crate::ffi::tcbDebugRemove;
+// use crate::ffi::tcbDebugRemove;
 use crate::interrupt::{deletingIRQHandler, isIRQPending, setIRQState, IRQState};
 use crate::kernel::boot::current_lookup_fault;
 use crate::syscall::safe_unbind_notification;
@@ -199,9 +199,10 @@ pub fn finaliseCap(cap: &cap_t, _final: bool, _exposed: bool) -> finaliseCap_ret
  safe_unbind_notification(tcb);
  tcb.cancel_ipc();
  tcb.suspend();
- unsafe {
- tcbDebugRemove(tcb as *mut tcb_t);
- }
+ // #[cfg(feature="DEBUG_BUILD")]
+ // unsafe {
+ // tcbDebugRemove(tcb as *mut tcb_t);
+ // }
  fc_ret.remainder =
  Zombie_new(tcbCNodeEntries, ZombieType_ZombieTCB, cte_ptr.get_ptr());
  fc_ret.cleanupInfo = cap_t::new_null_cap();

src/kernel/fastpath.rs

@@ -134,7 +134,7 @@ pub fn fastpath_copy_mrs(length: usize, src: &mut tcb_t, dest: &mut tcb_t) {
 #[no_mangle]
 #[cfg(target_arch = "aarch64")]
 pub fn fastpath_restore(_badge: usize, _msgInfo: usize, cur_thread: *mut tcb_t) {
- use core::arch::asm;
+ use core::arch::asm;
  unsafe {
  (*cur_thread).tcbArch.load_thread_local();
  asm!(
@@ -180,13 +180,13 @@ pub fn fastpath_restore(_badge: usize, _msgInfo: usize, cur_thread: *mut tcb_t)
 pub fn fastpath_restore(_badge: usize, _msgInfo: usize, cur_thread: *mut tcb_t) {
  #[cfg(feature = "ENABLE_SMP")]
  {}
- extern "C" {
- pub fn __fastpath_restore(badge: usize, msgInfo: usize, cur_thread_reg: usize);
- }
- unsafe {
- __fastpath_restore(_badge,_msgInfo,(*cur_thread).tcbArch.raw_ptr());
- }
- panic!("unreachable")
+ extern "C" {
+ pub fn __fastpath_restore(badge: usize, msgInfo: usize, cur_thread_reg: usize);
+ }
+ unsafe {
+ __fastpath_restore(_badge, _msgInfo, (*cur_thread).tcbArch.raw_ptr());
+ }
+ panic!("unreachable")
 }
 
 #[inline]
@@ -262,7 +262,7 @@ pub fn fastpath_call(cptr: usize, msgInfo: usize) {
  info.set_caps_unwrapped(0);
  let msgInfo1 = info.to_word();
  let badge = ep_cap.get_ep_badge();
- fastpath_restore(badge, msgInfo1, get_currenct_thread());
+ fastpath_restore(badge, msgInfo1, get_currenct_thread());
 }
 
 #[inline]
@@ -344,18 +344,18 @@ pub fn fastpath_reply_recv(cptr: usize, msgInfo: usize) {
  );
 
  // unsafe {
-  let node = convert_to_mut_type_ref::<cte_t>(caller_slot.cteMDBNode.get_prev());
-  mdb_node_ptr_mset_mdbNext_mdbRevocable_mdbFirstBadged(&mut node.cteMDBNode, 0, 1, 1);
-  caller_slot.cap = cap_t::new_null_cap();
-  caller_slot.cteMDBNode = mdb_node_t::new(0, 0, 0, 0);
-  fastpath_copy_mrs(length, current, caller);
-
-  caller.tcbState.words[0] = ThreadState::ThreadStateRunning as usize;
-  let cap_pd = new_vtable.get_pt_base_ptr() as *mut PTE;
-  let stored_hw_asid: PTE = PTE(new_vtable.get_pt_mapped_asid());
-  switchToThread_fp(caller, cap_pd, stored_hw_asid);
-  info.set_caps_unwrapped(0);
-  let msg_info1 = info.to_word();
-  fastpath_restore(0, msg_info1, get_currenct_thread() as *mut tcb_t);
+ let node = convert_to_mut_type_ref::<cte_t>(caller_slot.cteMDBNode.get_prev());
+ mdb_node_ptr_mset_mdbNext_mdbRevocable_mdbFirstBadged(&mut node.cteMDBNode, 0, 1, 1);
+ caller_slot.cap = cap_t::new_null_cap();
+ caller_slot.cteMDBNode = mdb_node_t::new(0, 0, 0, 0);
+ fastpath_copy_mrs(length, current, caller);
+
+ caller.tcbState.words[0] = ThreadState::ThreadStateRunning as usize;
+ let cap_pd = new_vtable.get_pt_base_ptr() as *mut PTE;
+ let stored_hw_asid: PTE = PTE(new_vtable.get_pt_mapped_asid());
+ switchToThread_fp(caller, cap_pd, stored_hw_asid);
+ info.set_caps_unwrapped(0);
+ let msg_info1 = info.to_word();
+ fastpath_restore(0, msg_info1, get_currenct_thread() as *mut tcb_t);
  // }
 }

src/kernel/mod.rs

@@ -1,5 +1,5 @@
 pub mod boot;
 pub mod fastpath;
 pub mod fault;
-#[cfg(target_arch="riscv64")]
-core::arch::global_asm!(include_str!("fastpath_restore.S"));
+#[cfg(target_arch = "riscv64")]
+core::arch::global_asm!(include_str!("fastpath_restore.S"));

src/syscall/invocation/invoke_untyped.rs

@@ -1,4 +1,4 @@
-use crate::ffi::tcbDebugAppend;
+// use crate::ffi::tcbDebugAppend;
 use crate::syscall::{
  FREE_INDEX_TO_OFFSET, GET_FREE_INDEX, GET_OFFSET_FREE_PTR, OFFSET_TO_FREE_IDNEX,
 };
@@ -48,9 +48,10 @@ fn create_object(
  tcb.init();
  tcb.tcbTimeSlice = CONFIG_TIME_SLICE;
  tcb.domain = get_current_domain();
- unsafe {
- tcbDebugAppend(tcb as *mut tcb_t);
- }
+ // #[cfg(feature="DEBUG_BUILD")]
+ // unsafe {
+ // tcbDebugAppend(tcb as *mut tcb_t);
+ // }
  return cap_t::new_thread_cap(tcb.get_ptr());
  }
 
@@ -89,9 +90,10 @@ fn create_object(
  tcb.init();
  tcb.tcbTimeSlice = CONFIG_TIME_SLICE;
  tcb.domain = get_current_domain();
- unsafe {
- tcbDebugAppend(tcb as *mut tcb_t);
- }
+ // #[cfg(feature="DEBUG_BUILD")]
+ // unsafe {
+ // tcbDebugAppend(tcb as *mut tcb_t);
+ // }
  return cap_t::new_thread_cap(tcb.get_ptr());
  }
 

src/utils.rs

@@ -1,9 +1,9 @@
-#[cfg(target_arch="aarch64")]
+#[cfg(target_arch = "aarch64")]
 use sel4_common::{
  sel4_config::{ID_AA64PFR0_EL1_ASIMD, ID_AA64PFR0_EL1_FP},
  MASK,
 };
-#[cfg(target_arch="aarch64")]
+#[cfg(target_arch = "aarch64")]
 use sel4_vspace::{dsb, isb};
 
 use crate::BIT;
@@ -62,7 +62,7 @@ pub fn clear_memory_pt(ptr: *mut u8, bits: usize) {
 }
 
 #[inline]
-#[cfg(target_arch="aarch64")]
+#[cfg(target_arch = "aarch64")]
 pub fn setVTable(addr: usize) {
  dsb();
  unsafe {
@@ -72,7 +72,7 @@ pub fn setVTable(addr: usize) {
 }
 
 #[inline]
-#[cfg(target_arch="aarch64")]
+#[cfg(target_arch = "aarch64")]
 pub fn fpsimd_HWCapTest() -> bool {
  let mut id_aa64pfr0: usize;