实现内核日志系统

.github/actions/import-toolchain/action.yml

@@ -15,7 +15,8 @@ runs:
         with:
           path: |
             ~/opt
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('tools/build_gcc_toolchain.sh') }}-${{ hashFiles('tools/install_musl_gcc.sh') }}
+            ~/.bashrc
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('tools/build_gcc_toolchain.sh') }}
 
       - name: Cache build tools
         id: cache-build-tools
@@ -28,7 +29,8 @@ runs:
             ~/.cargo
             ~/.rustup
             ~/.bashrc
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ env.dadk_version }}-${{ hashFiles('.github/workflows/cache-toolchain.yml') }}
+            ~/opt
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ env.dadk_version }}-${{ hashFiles('.github/workflows/cache-toolchain.yml') }}-${{ hashFiles('tools/install_musl_gcc.sh') }}
 
       - uses: ./.github/actions/install-apt-packages
 

.github/workflows/cache-toolchain.yml

@@ -18,14 +18,14 @@ jobs:
           with:
             path: |
               ~/opt
-            key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('tools/build_gcc_toolchain.sh') }}-${{ hashFiles('tools/install_musl_gcc.sh') }}
+              ~/.bashrc
+            key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('tools/build_gcc_toolchain.sh') }}
 
         - if: ${{ steps.cache-dragonos-gcc.outputs.cache-hit != 'true' }}
           name: build dragonos-gcc
           continue-on-error: true
           run: |
               bash tools/build_gcc_toolchain.sh -f
-              bash tools/install_musl_gcc.sh
 
         - uses: ./.github/actions/install-apt-packages
 
@@ -40,13 +40,15 @@ jobs:
               ~/.cargo
               ~/.rustup
               ~/.bashrc
-            key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ env.dadk_version }}-${{ hashFiles('.github/workflows/cache-toolchain.yml') }}
+              ~/opt
+            key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ env.dadk_version }}-${{ hashFiles('.github/workflows/cache-toolchain.yml') }}-${{ hashFiles('tools/install_musl_gcc.sh') }}
 
         - if: ${{ steps.cache-build-tools.outputs.cache-hit != 'true' }}
           name: Install toolchain
           continue-on-error: false
           run:  | 
-
+            USE_GITHUB=1 bash tools/install_musl_gcc.sh
+
             cargo install cargo-binutils
             rustup toolchain install nightly-x86_64-unknown-linux-gnu
             rustup toolchain install nightly-2023-01-21-x86_64-unknown-linux-gnu

.github/workflows/makefile.yml

@@ -2,7 +2,7 @@ name: Build Check
 
 on:
   push:
-    branches: [ "master", "patch-add-riscv64-github-workflow" ]
+    branches: [ "master" ]
   pull_request:
     branches: [ "master" ]
 
@@ -50,6 +50,7 @@ jobs:
     - uses: ./.github/actions/import-toolchain
 
     - name: Run kernel static test
+      shell: bash -ileo pipefail {0}
       env:
           ARCH: ${{ matrix.arch }}
       run: bash -c "source ~/.cargo/env && cd kernel && make test"
@@ -68,7 +69,14 @@ jobs:
     - name: build the DragonOS
       env:
           ARCH: x86_64
-      run: bash -c "source ~/.cargo/env && export DragonOS_GCC=$HOME/opt/dragonos-gcc/gcc-x86_64-unknown-none/bin && make -j $(nproc) "
+      shell: bash -ileo pipefail {0}
+
+      run: |
+        source ~/.bashrc
+        source ~/.cargo/env
+        export DragonOS_GCC=$HOME/opt/dragonos-gcc/gcc-x86_64-unknown-none/bin
+
+        make -j $(nproc)
 
 
   build-riscv64:
@@ -84,8 +92,9 @@ jobs:
     - uses: ./.github/actions/import-toolchain
 
     - name: build the DragonOS
+      shell: bash -ileo pipefail {0}
       env:
           ARCH: riscv64
 
-      run: bash -c "source ~/.cargo/env && make kernel -j $(nproc)"
+      run: source ~/.bashrc && source ~/.cargo/env && make kernel -j $(nproc)
 

.vscode/settings.json

@@ -172,7 +172,13 @@
         "clocksource.h": "c",
         "ata.h": "c",
         "barrier": "c",
-        "charconv": "c"
+        "charconv": "c",
+        "printf.h": "c",
+        "klog.h": "c",
+        "sqlite3ext.h": "c",
+        "malloc.h": "c",
+        "*.o": "c",
+        "k_log.h": "c"
     },
     "C_Cpp.errorSquiggles": "enabled",
     "esbonio.sphinx.confDir": "",

kernel/crates/kdepends/Cargo.toml

@@ -7,6 +7,7 @@ description = "需要导出的依赖项（为保持内核依赖版本与调试
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+ringbuffer = "0.15.0"
 memoffset = "0.9.0"
 crc = { path = "../crc" }
 

kernel/crates/kdepends/src/lib.rs

@@ -6,4 +6,6 @@ pub extern crate thingbuf;
 
 pub extern crate memoffset;
 
+pub extern crate ringbuffer;
+
 pub extern crate crc;

kernel/src/arch/x86_64/ipc/signal.rs

@@ -491,7 +491,7 @@ impl SignalArch for X86_64SignalArch {
                 "Error occurred when handling signal: {}, pid={:?}, errcode={:?}",
                 sig_number as i32,
                 ProcessManager::current_pcb().pid(),
-                res.unwrap_err()
+                res.as_ref().unwrap_err()
             );
         }
     }

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

@@ -8,6 +8,7 @@ use x86::time::rdtsc;
 use x86_64::registers::model_specific::EferFlags;
 
 use crate::driver::tty::serial::serial8250::send_to_default_serial8250_port;
+use crate::filesystem::procfs::kmsg::kmsg_init;
 use crate::include::bindings::bindings::{
     multiboot2_get_load_base, multiboot2_get_memory, multiboot2_iter, multiboot_mmap_entry_t,
     multiboot_tag_load_base_addr_t,
@@ -419,6 +420,8 @@ pub fn mm_init() {
     unsafe { allocator_init() };
     // enable mmio
     mmio_init();
+    // enable KMSG
+    kmsg_init();
 }
 
 unsafe fn allocator_init() {

kernel/src/driver/net/e1000e/e1000e.rs

@@ -594,8 +594,12 @@ pub extern "C" fn rs_e1000e_init() {
 
 pub fn e1000e_init() -> () {
     match e1000e_probe() {
-        Ok(_code) => kinfo!("Successfully init e1000e device!"),
-        Err(_error) => kinfo!("Error occurred!"),
+        Ok(_code) => {
+            kinfo!("Successfully init e1000e device!");
+        }
+        Err(_error) => {
+            kinfo!("Error occurred!");
+        }
     }
 }
 

kernel/src/filesystem/fat/fs.rs

@@ -1196,7 +1196,7 @@ impl Drop for FATFileSystem {
         if r.is_err() {
             kerror!(
                 "Umount FAT filesystem failed: errno={:?}, FS detail:{self:?}",
-                r.unwrap_err()
+                r.as_ref().unwrap_err()
             );
         }
     }

kernel/src/filesystem/procfs/kmsg.rs

@@ -0,0 +1,151 @@
+use super::log::{LogLevel, LogMessage};
+
+use crate::libs::spinlock::SpinLock;
+
+use alloc::{borrow::ToOwned, string::ToString, vec::Vec};
+
+use kdepends::ringbuffer::{AllocRingBuffer, RingBuffer};
+
+use system_error::SystemError;
+
+/// 缓冲区容量
+const KMSG_BUFFER_CAPACITY: usize = 1024;
+
+/// 全局环形缓冲区
+pub static mut KMSG: Option<SpinLock<Kmsg>> = None;
+
+/// 初始化KMSG
+pub fn kmsg_init() {
+    let kmsg = SpinLock::new(Kmsg::new());
+    unsafe { KMSG = Some(kmsg) };
+}
+
+/// 日志
+pub struct Kmsg {
+    /// 环形缓冲区
+    buffer: AllocRingBuffer<LogMessage>,
+    /// 缓冲区字节数组
+    data: Vec<u8>,
+    /// 能够输出到控制台的日志级别，当console_loglevel为DEFAULT时，表示可以打印所有级别的日志消息到控制台
+    console_loglevel: LogLevel,
+    /// 判断buffer在上一次转成字节数组之后是否发生变动
+    is_changed: bool,
+}
+
+impl Kmsg {
+    pub fn new() -> Self {
+        Kmsg {
+            buffer: AllocRingBuffer::new(KMSG_BUFFER_CAPACITY),
+            data: Vec::new(),
+            console_loglevel: LogLevel::DEFAULT,
+            is_changed: false,
+        }
+    }
+
+    /// 添加日志消息
+    pub fn push(&mut self, msg: LogMessage) {
+        self.buffer.push(msg);
+        self.is_changed = true;
+    }
+
+    /// 读取缓冲区
+    pub fn read(&mut self, buf: &mut [u8]) -> Result<usize, SystemError> {
+        self.tobytes();
+
+        match self.console_loglevel {
+            LogLevel::DEFAULT => self.read_all(buf),
+            _ => self.read_level(buf),
+        }
+    }
+
+    /// 读取缓冲区所有日志消息
+    fn read_all(&mut self, buf: &mut [u8]) -> Result<usize, SystemError> {
+        let len = self.data.len().min(buf.len());
+
+        // 拷贝数据
+        let src = &self.data[0..len];
+        buf[0..src.len()].copy_from_slice(src);
+
+        return Ok(src.len());
+    }
+
+    /// 读取缓冲区特定level的日志消息
+    fn read_level(&mut self, buf: &mut [u8]) -> Result<usize, SystemError> {
+        let mut data_level: Vec<u8> = Vec::new();
+
+        for msg in self.buffer.iter() {
+            if msg.level() == self.console_loglevel {
+                data_level.append(&mut msg.to_string().as_bytes().to_owned());
+            }
+        }
+
+        let len = data_level.len().min(buf.len());
+
+        // 拷贝数据
+        let src = &data_level[0..len];
+        buf[0..src.len()].copy_from_slice(src);
+
+        // 将控制台输出日志level改回默认，否则之后都是打印特定level的日志消息
+        self.console_loglevel = LogLevel::DEFAULT;
+
+        return Ok(data_level.len());
+    }
+
+    /// 读取并清空缓冲区
+    pub fn read_clear(&mut self, buf: &mut [u8]) -> Result<usize, SystemError> {
+        let r = self.read_all(buf);
+        self.clear()?;
+
+        return r;
+    }
+
+    /// 清空缓冲区
+    pub fn clear(&mut self) -> Result<usize, SystemError> {
+        self.buffer.clear();
+        self.data.clear();
+
+        return Ok(0);
+    }
+
+    /// 设置输出到控制台的日志级别
+    pub fn set_level(&mut self, log_level: usize) -> Result<usize, SystemError> {
+        let log_level = log_level - 1;
+
+        self.console_loglevel = match log_level {
+            0 => LogLevel::EMERG,
+            1 => LogLevel::ALERT,
+            2 => LogLevel::CRIT,
+            3 => LogLevel::ERR,
+            4 => LogLevel::WARN,
+            5 => LogLevel::NOTICE,
+            6 => LogLevel::INFO,
+            7 => LogLevel::DEBUG,
+            8 => LogLevel::DEFAULT,
+            _ => return Err(SystemError::EINVAL),
+        };
+
+        return Ok(0);
+    }
+
+    /// 将环形缓冲区的日志消息转成字节数组以拷入用户buf
+    fn tobytes(&mut self) -> usize {
+        if self.is_changed {
+            self.data.clear();
+
+            if self.console_loglevel == LogLevel::DEFAULT {
+                for msg in self.buffer.iter() {
+                    self.data.append(&mut msg.to_string().as_bytes().to_owned());
+                }
+            }
+
+            self.is_changed = false;
+        }
+
+        return self.data.len();
+    }
+
+    // 返回内核缓冲区所占字节数
+    pub fn data_size(&mut self) -> Result<usize, SystemError> {
+        return Ok(self.tobytes());
+    }
+}