实现SystemV共享内存

kernel/src/arch/x86_64/mm/mod.rs

@@ -599,7 +599,8 @@ pub fn test_buddy() {
 pub struct LockedFrameAllocator;
 
 impl FrameAllocator for LockedFrameAllocator {
-    unsafe fn allocate(&mut self, count: PageFrameCount) -> Option<(PhysAddr, PageFrameCount)> {
+    unsafe fn allocate(&mut self, mut count: PageFrameCount) -> Option<(PhysAddr, PageFrameCount)> {
+        count = count.next_power_of_two();
         if let Some(ref mut allocator) = *INNER_ALLOCATOR.lock_irqsave() {
             return allocator.allocate(count);
         } else {

kernel/src/driver/net/dma.rs

@@ -3,7 +3,7 @@ use crate::arch::mm::kernel_page_flags;
 use crate::arch::MMArch;
 
 use crate::mm::kernel_mapper::KernelMapper;
-use crate::mm::page::{page_manager_lock_irasave, PageFlags};
+use crate::mm::page::{page_manager_lock_irqsave, PageFlags};
 use crate::mm::{
     allocator::page_frame::{
         allocate_page_frames, deallocate_page_frames, PageFrameCount, PhysPageFrame,
@@ -60,7 +60,7 @@ pub unsafe fn dma_dealloc(paddr: usize, vaddr: NonNull<u8>, pages: usize) -> i32
         deallocate_page_frames(
             PhysPageFrame::new(PhysAddr::new(paddr)),
             page_count,
-            &mut page_manager_lock_irasave(),
+            &mut page_manager_lock_irqsave(),
         );
     }
     return 0;

kernel/src/driver/virtio/virtio_impl.rs

@@ -3,7 +3,7 @@ use crate::arch::mm::kernel_page_flags;
 use crate::arch::MMArch;
 
 use crate::mm::kernel_mapper::KernelMapper;
-use crate::mm::page::{page_manager_lock_irasave, PageFlags};
+use crate::mm::page::{page_manager_lock_irqsave, PageFlags};
 use crate::mm::{
     allocator::page_frame::{
         allocate_page_frames, deallocate_page_frames, PageFrameCount, PhysPageFrame,
@@ -71,7 +71,7 @@ unsafe impl Hal for HalImpl {
             deallocate_page_frames(
                 PhysPageFrame::new(PhysAddr::new(paddr)),
                 page_count,
-                &mut page_manager_lock_irasave(),
+                &mut page_manager_lock_irqsave(),
             );
         }
         return 0;

kernel/src/ipc/mod.rs

@@ -1,4 +1,5 @@
 pub mod pipe;
+pub mod shm;
 pub mod signal;
 pub mod signal_types;
 pub mod syscall;