vm: refactor file mappings and allow to mmap /dev/fb :^)

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

Author: Andy-Python-Programmer

misc/aero-doom.png

@@ -1,27 +1,27 @@
-From a9634a899b60b3d783c9aabc4d667435bdeb4270 Mon Sep 17 00:00:00 2001
+From 0005041b6e5c82519820a22e8d34f827a5abf11d Mon Sep 17 00:00:00 2001
 From: Andy-Python-Programmer <[email protected]>
 Date: Sat, 15 Jan 2022 18:07:32 +1100
 Subject: [PATCH] add aero doom
 
 Signed-off-by: Andy-Python-Programmer <[email protected]>
 ---
- .gitignore                     |   8 ++
- doomgeneric/Makefile.aero      |  80 +++++++++++
- doomgeneric/aero/framebuffer.h | 243 +++++++++++++++++++++++++++++++
+ .gitignore                     |   9 ++
+ doomgeneric/Makefile.aero      |  80 ++++++++++
+ doomgeneric/aero/framebuffer.h | 243 ++++++++++++++++++++++++++++++
  doomgeneric/d_main.c           |   4 +
- doomgeneric/doomgeneric_aero.c | 255 +++++++++++++++++++++++++++++++++
- 5 files changed, 590 insertions(+)
+ doomgeneric/doomgeneric_aero.c | 266 +++++++++++++++++++++++++++++++++
+ 5 files changed, 602 insertions(+)
  create mode 100644 .gitignore
  create mode 100644 doomgeneric/Makefile.aero
  create mode 100644 doomgeneric/aero/framebuffer.h
  create mode 100644 doomgeneric/doomgeneric_aero.c
 
 diff --git a/.gitignore b/.gitignore
 new file mode 100644
-index 0000000..6ac1485
+index 0000000..e610a33
 --- /dev/null
 +++ b/.gitignore
-@@ -0,0 +1,8 @@
+@@ -0,0 +1,9 @@
 +build
 +
 +doomgeneric/doomgeneric
@@ -30,7 +30,7 @@ index 0000000..6ac1485
 +doom1.wad
 +
 +.vscode
-\ No newline at end of file
++.clang-format
 diff --git a/doomgeneric/Makefile.aero b/doomgeneric/Makefile.aero
 new file mode 100644
 index 0000000..3cde87c
@@ -389,10 +389,10 @@ index c7cf977..435e76a 100644
      if (iwadfile == NULL)
 diff --git a/doomgeneric/doomgeneric_aero.c b/doomgeneric/doomgeneric_aero.c
 new file mode 100644
-index 0000000..6dd20b0
+index 0000000..a5adc60
 --- /dev/null
 +++ b/doomgeneric/doomgeneric_aero.c
-@@ -0,0 +1,255 @@
+@@ -0,0 +1,266 @@
 +/*
 + * Copyright (C) 2021-2022 The Aero Project Developers.
 + *
@@ -417,23 +417,26 @@ index 0000000..6dd20b0
 +
 +#include "aero/framebuffer.h"
 +
-+#include <stdint.h>
 +#include <fcntl.h>
-+#include <stdlib.h>
-+#include <stdio.h>
 +#include <stdarg.h>
++#include <stdbool.h>
++#include <stdint.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
 +#include <termios.h>
 +#include <unistd.h>
-+#include <stdbool.h>
 +
++#include <sys/mman.h>
 +#include <sys/time.h>
 +
-+#define LOG_INFO             0
-+#define KEYBOARD_QUEUE_SIZE  16
++#define LOG_INFO 0
++#define KEYBOARD_QUEUE_SIZE 16
 +
-+FILE *framebuffer = NULL;
 +FILE *keyboard = NULL;
 +
++static uint32_t *framebuffer_ptr = NULL;
++
 +static uint32_t s_screen_width = 0;
 +static uint32_t s_screen_height = 0;
 +
@@ -485,49 +488,49 @@ index 0000000..6dd20b0
 +    uint8_t key = 0;
 +
 +    switch (scancode) {
-+        case 28: // enter
-+            key = KEY_ENTER;
-+            break;
-+        
-+        case 1: // escape
-+            key = KEY_ESCAPE;
-+            break;
-+        
-+        case 105: // left
-+            key = KEY_LEFTARROW;
-+            break;
-+        
-+        case 106: // right
-+            key = KEY_RIGHTARROW;
-+            break;
-+        
-+        case 103: // up
-+            key = KEY_UPARROW;
-+            break;
-+        
-+        case 108: // down
-+            key = KEY_DOWNARROW;
-+            break;
-+        
-+        case 29: // left control
-+        case 97: // right control
-+            key = KEY_FIRE;
-+            break;
-+        
-+        case 57: // spacebar
-+            key = KEY_USE;
-+            break;
-+
-+        case 54: // rightshift
-+            key = KEY_RSHIFT;
-+            break;
-+        
-+        case 21: // y
-+            key = 'y';
-+            break;
-+
-+        default: 
-+            break;
++    case 28: // enter
++        key = KEY_ENTER;
++        break;
++
++    case 1: // escape
++        key = KEY_ESCAPE;
++        break;
++
++    case 105: // left
++        key = KEY_LEFTARROW;
++        break;
++
++    case 106: // right
++        key = KEY_RIGHTARROW;
++        break;
++
++    case 103: // up
++        key = KEY_UPARROW;
++        break;
++
++    case 108: // down
++        key = KEY_DOWNARROW;
++        break;
++
++    case 29: // left control
++    case 97: // right control
++        key = KEY_FIRE;
++        break;
++
++    case 57: // spacebar
++        key = KEY_USE;
++        break;
++
++    case 54: // rightshift
++        key = KEY_RSHIFT;
++        break;
++
++    case 21: // y
++        key = 'y';
++        break;
++
++    default:
++        break;
 +    }
 +
 +    return key;
@@ -561,13 +564,13 @@ index 0000000..6dd20b0
 +    }
 +}
 +
-+/// Initialize doomgeneric. This includes setting up the framebuffer and keyboard
-+/// devices.
++/// Initialize doomgeneric. This includes setting up the framebuffer and
++/// keyboard devices.
 +void DG_Init() {
 +    log_info("initializing framebuffer");
 +
 +    // Open up the framebuffer device.
-+    framebuffer = fopen("/dev/fb", "r+");
++    size_t framebuffer = fopen("/dev/fb", "r+");
 +
 +    // Make sure the there were no errors.
 +    if (framebuffer == NULL) {
@@ -588,11 +591,16 @@ index 0000000..6dd20b0
 +    s_screen_width = vinfo.xres;
 +    s_screen_height = vinfo.yres;
 +
-+    log_info("framebuffer: (width=%lu, height=%lu)", (uint64_t)s_screen_width, (uint64_t)s_screen_height);
++    log_info("framebuffer: (width=%lu, height=%lu)", (uint64_t)s_screen_width,
++             (uint64_t)s_screen_height);
 +
 +    s_position_x = (s_screen_width - DOOMGENERIC_RESX) / 2;
 +    s_position_y = (s_screen_height - DOOMGENERIC_RESY) / 2;
 +
++    uint32_t size = s_screen_width * s_screen_height * vinfo.bits_per_pixel / 8;
++    framebuffer_ptr = (uint32_t *)mmap(NULL, size, PROT_READ | PROT_WRITE,
++                                       MAP_PRIVATE, fileno(framebuffer), 0);
++
 +    enable_raw_tty();
 +    atexit(disable_raw_tty);
 +
@@ -610,16 +618,19 @@ index 0000000..6dd20b0
 +
 +void DG_DrawFrame() {
 +    for (int i = 0; i < DOOMGENERIC_RESY; i++) {
-+        fseek(framebuffer, s_position_x + (i + s_position_y) * s_screen_width, SEEK_SET);
-+        fwrite(DG_ScreenBuffer + i * DOOMGENERIC_RESX, 1, DOOMGENERIC_RESX * 4, framebuffer);
++        size_t index = s_position_x + (i + s_position_y) * s_screen_width;
++        size_t count = DOOMGENERIC_RESX * 4;
++
++        uint32_t *dest_ptr = &framebuffer_ptr[index];
++        uint32_t *src_ptr = DG_ScreenBuffer + i * DOOMGENERIC_RESX;
++
++        memcpy(dest_ptr, src_ptr, count);
 +    }
 +
 +    handle_keyboard_input();
 +}
 +
-+void DG_SleepMs(uint32_t ms) {
-+    usleep(ms * 1000000);
-+}
++void DG_SleepMs(uint32_t ms) { usleep(ms * 1000000); }
 +
 +uint32_t DG_GetTicksMs() {
 +    struct timeval tp;
@@ -646,7 +657,7 @@ index 0000000..6dd20b0
 +    return 1;
 +}
 +
-+// We dont need to set the window title :)
++// NOTE: We dont need to set the window title :)
 +void DG_SetWindowTitle(const char *title) {}
 -- 
 2.25.1

patches/doomgeneric/doomgeneric.patch

@@ -312,6 +312,8 @@ impl ArchTask {
             USERLAND_STACK_SIZE as usize,
             MMapProt::PROT_WRITE | MMapProt::PROT_READ,
             MMapFlags::MAP_FIXED | MMapFlags::MAP_PRIVATE | MMapFlags::MAP_ANONYOMUS,
+            0,
+            None,
         );
 
         vm.log();

src/aero_kernel/src/arch/x86_64/task.rs

@@ -31,6 +31,7 @@ use spin::{Once, RwLock};
 use crate::fs::lookup_path;
 use crate::fs::Path;
 use crate::logger;
+use crate::mem::paging::PhysAddr;
 use crate::rendy::RendyInfo;
 
 use super::cache::DirCacheItem;
@@ -39,7 +40,7 @@ use super::ramfs::RamFs;
 use super::FileSystemError;
 use super::{FileSystem, Result, MOUNT_MANAGER};
 
-use aero_syscall::prelude::*;
+use aero_syscall::{prelude::*, MMapFlags};
 
 lazy_static::lazy_static! {
     static ref DEV_FILESYSTEM: Arc<DevFs> = DevFs::new();
@@ -120,6 +121,10 @@ impl INodeInterface for DevINode {
         self.0.inode().read_at(offset, buffer)
     }
 
+    fn mmap(&self, offset: usize, flags: MMapFlags) -> Result<PhysAddr> {
+        self.0.inode().mmap(offset, flags)
+    }
+
     fn ioctl(&self, command: usize, arg: usize) -> Result<usize> {
         self.0.inode().ioctl(command, arg)
     }
@@ -273,6 +278,31 @@ impl INodeInterface for DevFb {
             .expect("/dev/fb: terminal not initialized")
     }
 
+    fn mmap(&self, offset: usize, _flags: MMapFlags) -> Result<PhysAddr> {
+        // NOTE: We dont need to check for the mmap flags here.
+        let rinfo = crate::rendy::get_rendy_info();
+
+        // Make sure we are in bounds.
+        if offset > rinfo.byte_len {
+            return Ok(PhysAddr::zero());
+        }
+
+        crate::rendy::DEBUG_RENDY
+            .get()
+            .map(|e| unsafe {
+                let mut lock = e.lock_irq();
+                let fb = lock.get_framebuffer();
+
+                let fb_ptr = fb.as_ptr() as *const u8;
+                let fb_ptr = fb_ptr.add(offset);
+
+                let fb_phys_ptr = fb_ptr.sub(crate::PHYSICAL_MEMORY_OFFSET.as_u64() as usize);
+
+                Ok(PhysAddr::new_unchecked(fb_phys_ptr as u64))
+            })
+            .expect("/dev/fb: terminal not initialized")
+    }
+
     fn ioctl(&self, command: usize, arg: usize) -> Result<usize> {
         match command {
             FBIOGET_VSCREENINFO => {

src/aero_kernel/src/fs/devfs.rs

@@ -106,6 +106,10 @@ impl FileHandle {
         Ok(new_offset)
     }
 
+    pub fn dirnode(&self) -> DirCacheItem {
+        self.inode.clone()
+    }
+
     pub fn inode(&self) -> INodeCacheItem {
         self.inode.inode()
     }

src/aero_kernel/src/fs/file_table.rs

@@ -19,6 +19,7 @@
 
 use core::sync::atomic::{AtomicUsize, Ordering};
 
+use aero_syscall::MMapFlags;
 use aero_syscall::{OpenFlags, SocketAddr};
 
 use alloc::string::String;
@@ -28,6 +29,7 @@ use alloc::sync::Weak;
 use alloc::vec::Vec;
 use spin::Once;
 
+use crate::mem::paging::PhysAddr;
 use crate::utils::sync::Mutex;
 use crate::utils::Downcastable;
 
@@ -135,6 +137,10 @@ pub trait INodeInterface: Send + Sync + Downcastable {
         Err(FileSystemError::NotSupported)
     }
 
+    fn mmap(&self, _offset: usize, _flags: MMapFlags) -> Result<PhysAddr> {
+        Err(FileSystemError::NotSupported)
+    }
+
     // Socket operations
     fn bind(&self, _address: &SocketAddr, _length: usize) -> Result<()> {
         Err(FileSystemError::NotSupported)