mirror/moss-kernel
1
0
Fork 0
mirror of https://github.com/hexagonal-sun/moss-kernel.git synced 2026-04-20 07:08:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into handle-sigsev

Browse Source
This commit is contained in:
Troy Neubauer
2026-03-01 03:32:47 -08:00
parent 6a7c40c545 912dc0f713
commit 1bcd8b90ae
6 changed files with 152 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
README.md
View File

@@ -108,12 +108,9 @@ sudo apt install qemu-system-aarch64 wget jq e2fsprogs just
brew install qemu wget jq e2fsprogs just
```
#### NixOS
Run the following command:
#### Nix/NixOS
```bash
nix shell nixpkgs#pkgsCross.aarch64-embedded.stdenv.cc nixpkgs#pkgsCross.aarch64-embedded.stdenv.cc.bintools
nix develop
```
### Running via QEMU

100
flake.lock generated Normal file
View File

@@ -0,0 +1,100 @@
{
"nodes": {
"fenix": {
"inputs": {
"nixpkgs": [
"nixpkgs"
],
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
"lastModified": 1772261909,
"narHash": "sha256-8XbJXrhMFhLgoBrjFIJx5XJi+SD+7/gbvaIXCuqy9Z0=",
"owner": "nix-community",
"repo": "fenix",
"rev": "e4c413b9546d6c9e6426b33b4d6de1a49a375024",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "fenix",
"type": "github"
}
},
"flake-utils": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1772198003,
"narHash": "sha256-I45esRSssFtJ8p/gLHUZ1OUaaTaVLluNkABkk6arQwE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "dd9b079222d43e1943b6ebd802f04fd959dc8e61",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"fenix": "fenix",
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs"
}
},
"rust-analyzer-src": {
"flake": false,
"locked": {
"lastModified": 1772178959,
"narHash": "sha256-DkjUvrEnnhHjOcjMx6aXfYGIZ0PWmcYzvVayhRj1r4M=",
"owner": "rust-lang",
"repo": "rust-analyzer",
"rev": "8494a8b3b769c17e8594d811012cc1b0fab090c7",
"type": "github"
},
"original": {
"owner": "rust-lang",
"ref": "nightly",
"repo": "rust-analyzer",
"type": "github"
}
},
"systems": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
}
},
"root": "root",
"version": 7
}

37
flake.nix Normal file
View File

@@ -0,0 +1,37 @@
{
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
flake-utils.url = "github:numtide/flake-utils";
fenix.url = "github:nix-community/fenix";
fenix.inputs.nixpkgs.follows = "nixpkgs";
};
outputs = { self, nixpkgs, fenix, flake-utils }:
flake-utils.lib.eachDefaultSystem(system:
let
pkgs = import nixpkgs { inherit system; };
toolchain = fenix.packages.${system}.fromToolchainFile {
file = ./rust-toolchain.toml;
sha256 = "sha256-ggvRZZFjlAlrZVjqul/f/UpU5CEhDbdKZU0OCR8Uzbc=";
};
shell = pkgs.mkShell {
buildInputs = with pkgs; [
dosfstools
e2fsprogs
just
jq
pkg-config
python3
pkgsCross.aarch64-embedded.stdenv.cc
pkgsCross.aarch64-embedded.stdenv.cc.bintools
qemu
toolchain
minicom
wget
];
};
in
{
devShells.default = shell;
});
}

12
src/drivers/fs/proc/task/task.rs
View File

@@ -1,7 +1,7 @@
use crate::drivers::fs::proc::task::ProcTaskInode;
use crate::drivers::fs::proc::{get_inode_id, procfs};
use crate::process::thread_group::Tgid;
use crate::process::{TaskDescriptor, Tid, find_task_by_descriptor};
use crate::process::{TaskDescriptor, Tid, find_process_by_tgid, find_task_by_descriptor};
use alloc::boxed::Box;
use alloc::string::ToString;
use alloc::sync::Arc;
@@ -57,12 +57,10 @@ impl Inode for ProcTaskDirInode {
}
async fn readdir(&self, start_offset: u64) -> libkernel::error::Result<Box<dyn DirStream>> {
let task = find_task_by_descriptor(&TaskDescriptor::from_tgid_tid(
self.tgid,
Tid::from_tgid(self.tgid),
))
.ok_or(FsError::NotFound)?;
let tasks = task.process.tasks.lock_save_irq();
let process = &find_process_by_tgid(self.tgid)
.ok_or(FsError::NotFound)?
.process;
let tasks = process.tasks.lock_save_irq();
let mut entries = Vec::new();
for (i, (_tid, task)) in tasks.iter().enumerate().skip(start_offset as usize) {
let Some(task) = task.upgrade() else {

10
src/memory/process_vm.rs
View File

@@ -4,12 +4,10 @@ use super::{
PageOffsetTranslator,
uaccess::{copy_obj_array_from_user, copy_to_user_slice},
};
use crate::process::find_process_by_tgid;
use crate::{
fs::syscalls::iov::IoVec,
process::{
TaskDescriptor, Tid, find_task_by_descriptor,
thread_group::{Tgid, pid::PidT},
},
process::thread_group::{Tgid, pid::PidT},
};
use libkernel::{
error::{KernelError, Result},
@@ -25,9 +23,7 @@ pub async fn sys_process_vm_readv(
_flags: usize,
) -> Result<usize> {
let tgid = Tgid::from_pid_t(pid);
let remote_proc =
find_task_by_descriptor(&TaskDescriptor::from_tgid_tid(tgid, Tid::from_tgid(tgid)))
.ok_or(KernelError::NoProcess)?;
let remote_proc = find_process_by_tgid(tgid).ok_or(KernelError::NoProcess)?;
let local_iovs = copy_obj_array_from_user(local_iov, liov_count).await?;
let remote_iovs = copy_obj_array_from_user(remote_iov, riov_count).await?;

5
src/process/mod.rs
View File

@@ -315,6 +315,11 @@ pub fn find_task_by_descriptor(descriptor: &TaskDescriptor) -> Option<Arc<Task>>
.and_then(|x| x.upgrade())
}
/// Finds the root task for the given thread group
pub fn find_process_by_tgid(tgid: Tgid) -> Option<Arc<Task>> {
find_task_by_descriptor(&TaskDescriptor::from_tgid_tid(tgid, Tid::from_tgid(tgid)))
}
pub static TASK_LIST: SpinLock<BTreeMap<TaskDescriptor, Weak<Task>>> =
SpinLock::new(BTreeMap::new());