alloc::slab: add SlabHeader::from_object and as_slab to cleanup

Signed-off-by: Andy-Python-Programmer <[email protected]>

Author: Andy-Python-Programmer

src/aero_kernel/src/mem/alloc.rs

@@ -83,10 +83,8 @@ impl Allocator {
 
         let _guard = IrqGuard::new();
         if layout.size() <= 1024 {
-            let slab_header = (ptr as usize & !(0xfff)) as *mut SlabHeader;
-
-            let slab_header = unsafe { &mut *slab_header };
-            slab_header.ptr.dealloc(ptr);
+            let slab_header = SlabHeader::from_object(ptr);
+            slab_header.as_slab().dealloc(ptr);
         }
     }
 }

src/aero_kernel/src/mem/slab.rs

@@ -26,11 +26,30 @@ use crate::utils::sync::Mutex;
 
 #[repr(C)]
 pub struct SlabHeader {
-    pub ptr: UnsafeRef<SmallSlab>,
+    /// Reference to the slab pool.
+    ptr: UnsafeRef<SmallSlab>,
+}
+
+impl SlabHeader {
+    /// Gets the [`SlabHeader`] from an allocated object.
+    pub fn from_object<'a>(ptr: *const u8) -> &'a Self {
+        assert!(!ptr.is_null());
+
+        let ptr = (ptr as usize & !(0xfff)) as *mut SlabHeader;
+        unsafe { &*ptr }
+    }
+
+    /// Returns the slab pool to which this header belongs to.
+    pub fn as_slab<'a>(&'a self) -> &'a SmallSlab {
+        self.ptr.as_ref()
+    }
 }
 
 const_assert_eq!(core::mem::size_of::<SlabHeader>(), 8);
 
+unsafe impl Send for SlabHeader {}
+unsafe impl Sync for SlabHeader {}
+
 /// For small slabs, the [`BufCtl`]s are stored inline.
 struct BufCtl(Option<NonNull<BufCtl>>);
 
@@ -48,6 +67,9 @@ impl BufCtl {
 
 const_assert_eq!(core::mem::size_of::<BufCtl>(), 8);
 
+unsafe impl Send for BufCtl {}
+unsafe impl Sync for BufCtl {}
+
 /// Used for allocations smaller than `1/8` of a page.
 pub struct SmallSlab {
     /// Size of the slab.
@@ -136,6 +158,3 @@ impl SmallSlab {
         self.size
     }
 }
-
-unsafe impl Send for SmallSlab {}
-unsafe impl Sync for SmallSlab {}