very small fixes

Author: mathisbot

beskar-lib/src/lib.rs

@@ -85,7 +85,7 @@ pub fn __init() {
 pub fn debug_break() {
     #[cfg(debug_assertions)]
     unsafe {
-        core::arch::asm!("int3");
+        core::arch::asm!("int3", options(nomem, nostack, preserves_flags));
     }
 }
 
@@ -96,6 +96,6 @@ pub fn debug_break() {
 pub fn debug_break_value(x: u64) {
     #[cfg(debug_assertions)]
     unsafe {
-        core::arch::asm!("int3", in("rax") x);
+        core::arch::asm!("int3", in("rax") x, options(nomem, nostack, preserves_flags));
     }
 }

hyperdrive/src/locks/mcs.rs

@@ -9,7 +9,7 @@
 //! The second one being a wrapper around the first one that allows to safely lock a `MaybeUninit` value.
 //!
 //! These structure accept a generic type `T` that is the type of the data protected by the lock.
-//! The second generic type `B` is the back-off strategy used by the lock.
+//! The second generic type `R` is the relax strategy used by the lock.
 //!
 //! ### `McsLock`
 //!
@@ -109,8 +109,8 @@ use core::sync::atomic::{AtomicBool, AtomicPtr, Ordering};
 pub struct McsLock<T: ?Sized, R: RelaxStrategy = Spin> {
     /// Tail of the queue.
     tail: AtomicPtr<McsNode>,
-    /// Back-off strategy.
-    _back_off: PhantomData<R>,
+    /// Relax strategy.
+    _relax: PhantomData<R>,
     /// Data protected by the lock.
     data: UnsafeCell<T>,
 }
@@ -163,7 +163,7 @@ impl<T, R: RelaxStrategy> McsLock<T, R> {
         Self {
             tail: AtomicPtr::new(ptr::null_mut()),
             data: UnsafeCell::new(value),
-            _back_off: PhantomData,
+            _relax: PhantomData,
         }
     }
 

hyperdrive/src/locks/rw.rs

@@ -4,7 +4,7 @@
 //! It is an evolution of the spinlock, where multiple readers can access the data at the same time.
 //!
 //! The structure accept a generic type `T` that is the type of the data protected by the lock.
-//! The second generic type `B` is the back-off strategy used by the lock.
+//! The second generic type `R` is the relax strategy used by the lock.
 //!
 //! ## Starvation-Resistance
 //!
@@ -154,8 +154,8 @@ struct AtomicState<R: RelaxStrategy = Spin> {
     readers: AtomicU32,
     /// Whether a writer has acquired the lock.
     writer: AtomicBool,
-    /// Back-off strategy.
-    _back_off: PhantomData<R>,
+    /// Relax strategy.
+    _relax: PhantomData<R>,
 }
 
 unsafe impl<R: RelaxStrategy> Send for AtomicState<R> {}
@@ -167,7 +167,7 @@ impl<R: RelaxStrategy> AtomicState<R> {
         Self {
             readers: AtomicU32::new(0),
             writer: AtomicBool::new(false),
-            _back_off: PhantomData,
+            _relax: PhantomData,
         }
     }
 

hyperdrive/src/locks/ticket.rs

@@ -38,8 +38,8 @@ pub struct TicketLock<T: ?Sized, R: RelaxStrategy = super::Spin> {
     next_ticket: AtomicU32,
     /// The ticket number of the current thread holding the lock.
     now_serving: AtomicU32,
-    /// The back-off strategy to use when the lock is contended.
-    _back_off: PhantomData<R>,
+    /// The relax strategy to use when the lock is contended.
+    _relax: PhantomData<R>,
     /// The inner data protected by the lock.
     data: UnsafeCell<T>,
 }
@@ -58,7 +58,7 @@ impl<T, R: RelaxStrategy> TicketLock<T, R> {
             next_ticket: AtomicU32::new(0),
             now_serving: AtomicU32::new(0),
             data: UnsafeCell::new(data),
-            _back_off: PhantomData,
+            _relax: PhantomData,
         }
     }
 

kernel/src/drivers/storage/nvme.rs

@@ -620,3 +620,11 @@ impl Status {
 
     // TODO: Implement the rest of the fields
 }
+
+#[inline]
+pub fn with_nvme_controller<F, R>(f: F) -> Option<R>
+where
+    F: FnOnce(&mut NvmeControllers) -> R,
+{
+    NVME_CONTROLLER.with_locked_if_init(f)
+}

kernel/src/storage.rs

@@ -29,9 +29,6 @@ pub fn init() {
     );
     device_fs.add_device(PathBuf::new("/fb"), Box::new(video::screen::ScreenDevice));
     VFS.mount(PathBuf::new("/dev"), Box::new(device_fs));
-
-    // TODO: Mount RAM disk (FAT32)
-    // VFS.mount(PathBuf::new("/ramdisk"), todo!());
 }
 
 #[must_use]