Skip to content
GitLab
Projects Groups Topics Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in
  • O OSKernel2026-StellaOS
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributor statistics
    • Graph
    • Compare revisions
  • Issues 0
    • Issues 0
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 0
    • Merge requests 0
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Packages and registries
    • Packages and registries
    • Package Registry
    • Terraform modules
  • Monitor
    • Monitor
    • Metrics
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • StellaOS
  • OSKernel2026-StellaOS
  • Merge requests
  • !50

feat(munmap): Phase 1 — cross-area munmap via vma_split

  • Review changes

  • Download
  • Patches
  • Plain diff
Merged Hoyou requested to merge fix/mm-phase1 into merge_6.8 Jun 09, 2026
  • Overview 0
  • Commits 4
  • Pipelines 0
  • Changes 6

改动内容

1. munmap Phase 1 — 跨 area 拆分 (42a0aaec)

  • 新增 vma_split / split_area_at / prepare_munmap / commit_munmap 两阶段模式
  • 持锁时拆分 VMA 边界 + 收集写回计划,解锁后做文件 I/O,重新持锁提交删除
  • heap_area_idx → heap_start_vpn,用 VPN 定位避免 munmap 后索引漂移
  • sys_munmap 和 sys_mmap(MAP_FIXED) 共用这套 infrastructure

2. MAP_SHARED fork dirty tracking (886e9940)

  • fork 时对共享文件映射/共享内存的子进程 PTE 强制摘 W 位
  • 新增 scan_dirty_file_pages_in_range:PTE.D → page.dirty 同步
  • 防止子进程继承 W 位后写入不触发 fault,导致 munmap 丢失写回

3. MAP_FIXED 隐式 unmap (482ded42)

  • POSIX 语义:MAP_FIXED 要求先删除目标范围内的已有映射
  • 复用 munmap 的两阶段 prepare/commit 模式

4. VFS 挂载点 LRU 逐出修复 (85d0f6d2)

  • 根因:dcache 为固定 2048 条目 LRU,du/find 等全文件系统遍历会逐出 /proc、/dev 挂载点
  • 修复:新增 MOUNT_DENTRIES 强引用表,dcache miss 时自动重新注入
  • 修复前 busybox ps/free/hwclock 在 du 后全部 ENOENT,修复后 54/54 全过

5. try_fault_page + scan/write_protect 顺序 + 警告抑制

  • 补上了 translate.rs 依赖但缺失的 try_fault_page() 实现
  • scan_dirty 和 write_protect 调换顺序,消除 TOCTOU 窗口
  • dotcargo 加 -A warnings

测试

  • basic (musl+glibc): 33/33 通过
  • busybox (glibc): 54/54 通过(含之前失败的 ps/free/hwclock)
Assignee
Assign to
Reviewers
Request review from
Time tracking
Source branch: fix/mm-phase1