misc(kernel): refactor and make clippy happier

Signed-off-by: Anhad Singh <[email protected]>

Author: Andy-Python-Programmer

.vscode/settings.json

@@ -1,7 +1,7 @@
 {
     "rust-analyzer.linkedProjects": [
         "./src/Cargo.toml",
-        "./userland/Cargo.toml"
+        // "./userland/Cargo.toml"
     ],
     "rust-analyzer.checkOnSave.allTargets": false,
     // "rust-analyzer.checkOnSave.extraArgs": [

src/aero_kernel/src/drivers/block/nvme/command.rs

@@ -351,7 +351,7 @@ pub struct CompletionEntry {
 
 #[repr(C)]
 pub union Command {
-    common: CommonCommand,
+    pub(super) common: CommonCommand,
     identify: IdentifyCommand,
     rw: ReadWriteCommand,
     create_sq: CreateSQCommand,

src/aero_kernel/src/drivers/block/nvme/queue.rs

@@ -1,11 +1,13 @@
 use core::cell::UnsafeCell;
+use core::ptr;
 use core::sync::atomic::{AtomicU16, Ordering};
 
 use crate::mem::paging::PhysAddr;
 use crate::utils::dma::Dma;
+use crate::utils::VolatileCell;
 
 use super::command::{Command, CompletionEntry};
-use super::*;
+use super::{Error, Registers};
 
 const fn calculate_doorbell_offset(queue_id: u16, multiplier: usize, dstrd: usize) -> usize {
     0x1000 + ((((queue_id as usize) * 2) + multiplier) * (4 << dstrd))
@@ -136,11 +138,9 @@ impl<'a> QueuePair<'a> {
         let mut command = command.into();
 
         unsafe {
-            // SAFETY: Command Layout:
-            //              - opcode: u8
-            //              - flags: u8
-            //              - command_id: u16 (offset=2 bytes))
-            *(&mut command as *mut Command as *mut u16).offset(1) = self.cid;
+            // SAFETY: The offset of the `command_id` field is the same, regardless of the command
+            // type.
+            command.common.command_id = self.cid;
         }
 
         self.cid += 1;

src/aero_kernel/src/drivers/drm/rawfb.rs

@@ -16,12 +16,13 @@
 // along with Aero. If not, see <https://www.gnu.org/licenses/>.
 
 use alloc::sync::Arc;
+use uapi::drm::DrmModeConStatus;
 
 use crate::fs::{devfs, FileSystem};
 
 use crate::mem::paging::*;
 
-use super::*;
+use super::{make_dmt_modes, BufferObject, Connector, Crtc, Drm, DrmDevice, Encoder};
 use crate::rendy;
 
 struct RawFramebuffer {}
@@ -54,7 +55,7 @@ impl DrmDevice for RawFramebuffer {
                     unsafe {
                         core::ptr::copy_nonoverlapping(
                             frame.as_slice_mut::<u8>().as_mut_ptr(),
-                            (fb.as_mut_ptr() as *mut u8)
+                            (fb.as_mut_ptr().cast::<u8>())
                                 .offset(i as isize * Size4KiB::SIZE as isize),
                             4096,
                         )

src/aero_kernel/src/drivers/e1000.rs

@@ -15,6 +15,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Aero. If not, see <https://www.gnu.org/licenses/>.
 
+use core::ptr;
+
 use alloc::boxed::Box;
 use alloc::sync::Arc;
 use spin::Once;
@@ -570,14 +572,14 @@ impl E1000 {
 
     unsafe fn write_raw(&self, register: u32, value: u32) {
         unsafe {
-            let register = self.base.as_mut_ptr::<u8>().add(register as usize);
-            core::ptr::write_volatile(register as *mut u32, value);
+            let register = self.base.as_mut_ptr::<u32>().byte_add(register as usize);
+            ptr::write_volatile(register, value);
         }
     }
 
     unsafe fn read_raw(&self, register: u32) -> u32 {
-        let register = self.base.as_ptr::<u8>().add(register as usize);
-        core::ptr::read_volatile(register as *const u32)
+        let register = self.base.as_ptr::<u32>().byte_add(register as usize);
+        ptr::read_volatile(register)
     }
 }
 

src/aero_kernel/src/fs/cache.rs

@@ -351,7 +351,7 @@ impl Cacheable<INodeCacheKey> for CachedINode {
 
 impl INodeCacheItem {
     pub fn make_key(fs: Weak<dyn FileSystem>, id: usize) -> INodeCacheKey {
-        (Weak::as_ptr(&fs) as *const () as usize, id)
+        (Weak::as_ptr(&fs).addr(), id)
     }
 }
 

src/aero_kernel/src/fs/ext2/disk.rs

@@ -15,11 +15,12 @@
 // You should have received a copy of the GNU General Public License
 // along with Aero. If not, see <https://www.gnu.org/licenses/>.
 
+use core::ptr;
+
 use bit_field::BitField;
 
 use crate::fs::inode;
-
-trait Revsion {}
+use crate::utils::IncompleteArrayField;
 
 #[derive(Debug, PartialEq)]
 pub enum Revision {
@@ -142,13 +143,14 @@ pub struct GroupDescriptor {
 
 const_assert_eq!(core::mem::size_of::<GroupDescriptor>(), 32);
 
-#[derive(Debug, Copy, Clone)]
-#[repr(C, packed)]
+#[derive(Debug)]
+#[repr(C)]
 pub struct DirEntry {
     pub inode: u32,
     pub entry_size: u16,
     pub name_size: u8,
     pub file_type: u8,
+    name: IncompleteArrayField<u8>,
 }
 
 impl DirEntry {
@@ -157,10 +159,7 @@ impl DirEntry {
 
         self.name_size = name.len() as u8;
 
-        // SAFETY: Above we have verified that the name will fit in the entry.
-        let name_ptr = unsafe { (self as *mut _ as *mut u8).add(core::mem::size_of::<Self>()) };
-        let name_bytes = unsafe { core::slice::from_raw_parts_mut(name_ptr, name.len()) };
-
+        let name_bytes = unsafe { self.name.as_mut_slice(name.len()) };
         name_bytes.copy_from_slice(name.as_bytes());
     }
 }

src/aero_kernel/src/utils/dma.rs

@@ -19,7 +19,7 @@ use alloc::boxed::Box;
 
 use core::alloc::{AllocError, Allocator, Layout};
 use core::mem::MaybeUninit;
-use core::ptr::NonNull;
+use core::ptr::{self, NonNull};
 
 use crate::mem::paging::*;
 
@@ -114,7 +114,7 @@ impl<T: ?Sized + core::fmt::Debug> core::fmt::Debug for Dma<T> {
 impl<T: ?Sized> Dma<T> {
     pub fn addr(&self) -> PhysAddr {
         unsafe {
-            let phys = (&*self.0 as *const T as *const u8) as u64;
+            let phys = ptr::addr_of!(*self.0).addr() as u64;
             PhysAddr::new(phys - crate::PHYSICAL_MEMORY_OFFSET.as_u64())
         }
     }

src/aero_kernel/src/utils/mod.rs

@@ -20,6 +20,7 @@ use alloc::sync::Arc;
 use core::alloc::Layout;
 use core::any::Any;
 use core::cell::UnsafeCell;
+use core::marker::PhantomData;
 use core::mem;
 use core::ptr::Unique;
 
@@ -235,3 +236,19 @@ macro_rules! extern_sym {
         unsafe { ::core::ptr::addr_of!($sym) }
     }};
 }
+
+#[repr(C)]
+#[derive(Debug, Default)]
+pub struct IncompleteArrayField<T>(PhantomData<T>, [T; 0]);
+
+impl<T> IncompleteArrayField<T> {
+    #[inline]
+    pub unsafe fn as_mut_ptr(&mut self) -> *mut T {
+        self as *mut _ as *mut T
+    }
+
+    #[inline]
+    pub unsafe fn as_mut_slice(&mut self, len: usize) -> &mut [T] {
+        core::slice::from_raw_parts_mut(self.as_mut_ptr(), len)
+    }
+}