102866bcf9
introduce MemoryHandler and refactor MemorySet. temporary disable swap.
...
This is a manual rebase of LCY's code
6 years ago
28d872064d
Merge branch 'master' of https://github.com/wangrunji0408/RustOS into arch-aarch64
6 years ago
aa5e7a4e6f
remove #![feature(extern_crate_item_prelude)]
6 years ago
3f2beab52d
Merge branch 'master' into user-img
6 years ago
2afe8c731e
Merge remote-tracking branch 'equation314/arch-aarch64' into dev
...
# Conflicts:
# crate/memory/src/memory_set.rs
# kernel/Cargo.lock
# kernel/src/arch/aarch64/interrupt/handler.rs
# kernel/src/arch/aarch64/interrupt/mod.rs
# kernel/src/arch/aarch64/memory.rs
# kernel/src/arch/aarch64/mod.rs
# kernel/src/arch/aarch64/paging.rs
# kernel/src/consts.rs
# kernel/src/fs.rs
# kernel/src/lib.rs
# kernel/src/memory.rs
# kernel/src/process/context.rs
# tools/riscv-pk/.gitignore
# tools/riscv-pk/LICENSE
# tools/riscv-pk/Makefile.in
# tools/riscv-pk/README.md
# tools/riscv-pk/aclocal.m4
# tools/riscv-pk/bbl/bbl.ac
# tools/riscv-pk/bbl/bbl.c
# tools/riscv-pk/bbl/bbl.h
# tools/riscv-pk/bbl/bbl.lds
# tools/riscv-pk/bbl/bbl.mk.in
# tools/riscv-pk/bbl/logo.c
# tools/riscv-pk/bbl/payload.S
# tools/riscv-pk/bbl/raw_logo.S
# tools/riscv-pk/bbl/riscv_logo.txt
# tools/riscv-pk/config.h.in
# tools/riscv-pk/configure
# tools/riscv-pk/configure.ac
# tools/riscv-pk/dummy_payload/dummy_entry.S
# tools/riscv-pk/dummy_payload/dummy_payload.lds
# tools/riscv-pk/dummy_payload/dummy_payload.mk.in
# tools/riscv-pk/machine/atomic.h
# tools/riscv-pk/machine/bits.h
# tools/riscv-pk/machine/disabled_hart_mask.h
# tools/riscv-pk/machine/emulation.c
# tools/riscv-pk/machine/emulation.h
# tools/riscv-pk/machine/encoding.h
# tools/riscv-pk/machine/fdt.c
# tools/riscv-pk/machine/fdt.h
# tools/riscv-pk/machine/finisher.c
# tools/riscv-pk/machine/finisher.h
# tools/riscv-pk/machine/flush_icache.c
# tools/riscv-pk/machine/htif.c
# tools/riscv-pk/machine/htif.h
# tools/riscv-pk/machine/machine.ac
# tools/riscv-pk/machine/machine.mk.in
# tools/riscv-pk/machine/mcall.h
# tools/riscv-pk/machine/mentry.S
# tools/riscv-pk/machine/minit.c
# tools/riscv-pk/machine/misaligned_ldst.c
# tools/riscv-pk/machine/mtrap.c
# tools/riscv-pk/machine/mtrap.h
# tools/riscv-pk/machine/muldiv_emulation.c
# tools/riscv-pk/machine/uart.c
# tools/riscv-pk/machine/uart.h
# tools/riscv-pk/machine/uart16550.c
# tools/riscv-pk/machine/uart16550.h
# tools/riscv-pk/machine/unprivileged_memory.h
# tools/riscv-pk/machine/vm.h
# tools/riscv-pk/scripts/config.guess
# tools/riscv-pk/scripts/config.sub
# tools/riscv-pk/scripts/install.sh
# tools/riscv-pk/scripts/mk-install-dirs.sh
# tools/riscv-pk/scripts/vcs-version.sh
# tools/riscv-pk/util/snprintf.c
# tools/riscv-pk/util/string.c
# tools/riscv-pk/util/util.mk.in
6 years ago
75b039c924
aarch64/mmu: move crate aarch64 to remote
6 years ago
a59a7fbe9a
aarch64/mmu: simply handle page fault
6 years ago
d6a54496f0
arch64/mmu: invalidate all icaches in InactivePageTable::with()
6 years ago
0eb33b661f
aarch64/mmu: fix some bugs
6 years ago
fcf5074500
impl M-mode kernel for riscv32
6 years ago
f882a085d6
user: link created SFS image in kernel
6 years ago
94bc8353f7
user: create SFS image in Makefile
6 years ago
18640b7537
impl NoMMU
6 years ago
52fe93188d
disable delay allocating frame, remove `memory_set_record`
6 years ago
2db453556d
try to fix interrupt & deadlock on RV32
6 years ago
d30c7e59ca
aarch64: minor modify
6 years ago
264600f145
aarch64/mmu: add io remap
6 years ago
a8b334123a
aarch64/mmu: add memory region attribute config
6 years ago
f9e47b2fd8
aarch64/mmu: refactor PageTableFlags
6 years ago
de6354ddd3
aarch64/mmu: use ASID to avoid flush TLB frequently in context switch
6 years ago
33d4b6975b
aarch64/mmu: use DSB instead of TLB flush after modifying PTE
6 years ago
55087fc5a2
aarch64/mmu: use both TTBR0_EL1 & TTBR1_EL1
6 years ago
bb1c1abaa4
aarch64/mmu: can run on the real raspi3
6 years ago
a9de99d3a9
aarch64/mmu: remap kernel memory ranges at the end of memory::init()
6 years ago
9e8124abbb
aarch64/mmu: mmu enabled
6 years ago
b1bdac7d0f
fix merge for aarch64. now it works!
6 years ago
2daf8c188d
Merge remote-tracking branch 'equation314/arch-aarch64' into dev
...
# Conflicts:
# .gitignore
# kernel/Cargo.lock
# kernel/Cargo.toml
# kernel/Makefile
# kernel/riscv32-blog_os.json
# kernel/src/consts.rs
# kernel/src/fs.rs
# kernel/src/lib.rs
# kernel/src/process/context.rs
# kernel/src/process/mod.rs
6 years ago
4495622317
update `process` crate to 2018 edition
6 years ago
12457f10cb
update `memory` crate to 2018 edition
6 years ago
76d2c6ec7b
Fix the bug of active_table_swap() wrongly force unlock in pg fault handler
6 years ago
b2fec2b16b
Fix a bug in context for smp
6 years ago
9d803e87d9
replace some unwrap() and comment the cow pgfault handler
6 years ago
df485d506e
simplify ProcessManager
...
- given that a proc can only be waited by its parent, wait_queue is no longer needed.
6 years ago
ef75c8a072
fix unwrap panic. now user shell is working.
6 years ago
da399dca96
remove Process struct
6 years ago
205f90a264
Merge branch 'dev' into g4-merge
...
# Conflicts:
# crate/memory/src/cow.rs
# crate/memory/src/memory_set.rs
# crate/memory/src/paging/mod.rs
# crate/memory/src/swap/mod.rs
# crate/process/src/lib.rs
# crate/process/src/process_manager.rs
# crate/process/src/processor.rs
# crate/process/src/thread.rs
# crate/riscv
# kernel/Cargo.lock
# kernel/src/arch/riscv32/compiler_rt.rs
# kernel/src/arch/riscv32/consts.rs
# kernel/src/arch/riscv32/context.rs
# kernel/src/arch/riscv32/interrupt.rs
# kernel/src/arch/riscv32/memory.rs
# kernel/src/arch/riscv32/mod.rs
# kernel/src/arch/riscv32/paging.rs
# kernel/src/arch/x86_64/driver/ide.rs
# kernel/src/arch/x86_64/interrupt/handler.rs
# kernel/src/arch/x86_64/mod.rs
# kernel/src/console.rs
# kernel/src/consts.rs
# kernel/src/fs.rs
# kernel/src/lib.rs
# kernel/src/memory.rs
# kernel/src/process/context.rs
# kernel/src/process/mod.rs
# kernel/src/syscall.rs
# kernel/src/trap.rs
6 years ago
5ce7d0a9c0
use user shell by default. fix kernel shell removing user thread.
6 years ago
576ae1d911
add setup_page_table
6 years ago
ef213d60bb
mmu
6 years ago
eb00b2bfd3
merge conflict
6 years ago
a8da42d521
Add expr4 report and some trace for synctest
6 years ago
4d8d48cf4d
repair some bugs and move child control to processmanager
6 years ago
c5499a62c5
Fix bug in swap in/out. Address ailign to 4K.
6 years ago
6652f8daf6
repair some bugs
6 years ago
8d6d3b7c37
debug for sleepkill
6 years ago
5ee44588e0
Enlarge the physical and kernel heap memory. Fix the bug in map the kernel.
6 years ago
990ce51007
Code Transplanting: unwrap -> expect
6 years ago
9adcea44d5
Code transplanting: Fix bugs. Pass test 'spin'
6 years ago
a13f39149b
add basic alloc
6 years ago
16fb733497
Blocking getchar
6 years ago
fcdee71f9d
Merge confilt
6 years ago
c8ea2cb0cf
Fix bug and enable swap in/out and frame delayed allocating.
6 years ago
7b6173a7bd
aarch64: move function delay() into mod timer in crate bcm2837
6 years ago
3e1d8c5827
aarch64: implement ARM generic timer, can work in qemu
6 years ago
2002ddd5fa
move processor from wrj
6 years ago
b1425a53f9
finish frame delayed allocating
6 years ago
e5a196c00f
Fix processor. Disable interrupt on switching.
6 years ago
5852881611
unwrap -> expect
6 years ago
b7d6b2989d
Fix bugs. Pass test 'spin'
...
- Fix ACK IRQ on x86.
- Add process exit handler.
6 years ago
74facd8e87
Use Vec to replace array in ProcessManager.
6 years ago
07aa9a0686
aarch64: implement IRQ & system timer, but don't work in qemu
6 years ago
430bf508e2
aarch64: add some comments to crate bcm2837
6 years ago
504401355f
Add expr3 report(not finiished.
6 years ago
7229b49eb8
Use rust-lld for RV32. Remove riscv git submodule.
6 years ago
edde416052
Finish swap for multi-user process
6 years ago
632baedabd
aarch64: can run on the real raspi3
6 years ago
517a78d114
aarch64: implement mini UART for bcm2837
6 years ago
72dc3f62ad
Remove kernel stack from MemorySet.
6 years ago
faa5f01f31
aarch64: fix a bug of bcm2837::asm::dealy()
6 years ago
addf49ffdb
aarch64: add crate bcm2837, implement GPIO
6 years ago
438e290b6d
Fix PageTable::get_entry -> Option.
6 years ago
0680023e35
Recover wait/sleep
6 years ago
c734f79699
Drop context when process exit. Remove util mod.
6 years ago
85a1dca684
Use weak linkage to provide dependencies for process::thread.
6 years ago
80b161db98
Recover set_priority and fork
6 years ago
5db908b1c5
Separate ProcessManager to a mod.
6 years ago
f7eb09e856
Multicore processing WORKS! Basically ...
...
- Rewrite processor.rs
Refactor to `Processor` & `ProcessManager`
- Use Box<dyn> instead of generic.
- Wait/sleep/wakeup is not supported yet.
I'm considering to implement them with WaitQueue.
6 years ago
ec27ed8d2e
add comment
6 years ago
63349ade19
Finish add more comment for kernel and finish set user memory swappable.
6 years ago
5bc392f388
Enable RV32 IPI.
6 years ago
0a81014007
Add page handler for swap in/out in riscv32's pagefault
6 years ago
fc727b9618
Merge branch 'OsTrain2018-g4' of https://github.com/oscourse-tsinghua/RustOS into crate-memory-comment
6 years ago
4a17ce8f16
comments of crate/memory
6 years ago
5bc40fd5d4
Merge branch 'OsTrain2018-g4' of https://github.com/oscourse-tsinghua/RustOS into OsTrain2018-g4
6 years ago
e05be94c80
finish the comment of the process
6 years ago
b3e2ca8aa0
Merge conflict
6 years ago
c4b53dc8e5
finish comment of sync
6 years ago
ddb679ce2b
update comment for bbl module, but have not finished.
6 years ago
fc2fd18c36
Add docs for thread::spawn()
6 years ago
7dd9494389
Add `Scheduler.move_to_head(pid)` to replace `Processor.next`
...
Rename `set_reschedule` to `yield_now`
6 years ago
501ce6c4be
Fix memory crate test compile.
6 years ago
cd1bd55729
Update README, travis, riscv crate.
6 years ago
924c061d64
Merge branch 'x86-boot'
...
# Conflicts:
# crate/riscv
# kernel/Makefile
6 years ago
5a0ce1e464
Refactored RISC-V page table identity mapping into a function.
6 years ago
906019f7c6
Add little notes for BitAllocator
6 years ago
caeff9ad97
Update packages and fit for new Rust nightly
6 years ago
b88648ff44
Fit for newest Rust nightly. x86_64 ok, riscv32 broken.
6 years ago
a2111a928f
Move thread mod to ucore-process crate
6 years ago
776dc976c9
Fix for user
6 years ago
06b39ed521
Impl remove any for StrideScheduler
6 years ago
04b62ec79f
Use Vec instead of array in Scheduler
6 years ago
c8a9eaf3e6
Split process mod to extern crate
6 years ago
0c9679b710
Fix fork and syscall return value.
6 years ago
27daa6d491
Fix user trap
6 years ago
1ad3ed738e
Can run user program in RV32
6 years ago
89bcd5f660
Fix kernel thread
6 years ago
96d8af8034
Use CowExt for RV32
6 years ago
7d856fe009
Fix memory::cow LLVM error for RV32
6 years ago
5530549a54
Recover `process` `thread` `sync` mod for RV32. Pass compile.
6 years ago
7c7dbc9ded
Add CR3 to Context (x86_64)
6 years ago
95ab3a2f3b
Allocate kernel stack from heap, remove stack allocator, remove guard page.
6 years ago
81ff6f13e5
Fix recursive mapping, finish kernel remap.
6 years ago
d3ed84ba61
Fix compile
6 years ago
aecb85d5e7
Move MemorySet out to memory crate
6 years ago
5c14673fe0
Setup a simple page table, enable paging.
6 years ago
b26fee1990
Make more mods common for both x86_64 & riscv32.
6 years ago
ee242b44b2
Timer interrupt
6 years ago
aeb7fce0e6
SBI: Support RISCV64
6 years ago
02b94db859
Fix crate `riscv` version
6 years ago
bf2ad7c6a5
Change target arch to RISCV32IMA. Recover some dependencies.
6 years ago
a44231435f
Fork crate `riscv` as a submodule
6 years ago
ced765fb5b
New crate `bbl`, port `sbi` mod.
6 years ago
98be93e215
Fix Fifo & Clock SwapManager, pass test.
6 years ago
a7a34835d5
Basic swap framework, temporarily disable SwapManagers
7 years ago
e47f57a12a
Cow test pass in OS
7 years ago
ade0f0110f
Use PageTable interface in OS
7 years ago
f500086b9e
Copy-on-write for PageTable interface.
7 years ago
978faf46c5
Split test for MockPageTable
7 years ago
aa109498f1
Clear memory crate, redefine PageTable interface, reimplement MockPageTable.
7 years ago
f3d62a5b8f
Replace `AreaFrameAllocator` by `BitAllocator`. Set opt-level=1 to avoid stack overflow.
7 years ago
2762fded9c
New crate `bit-allocator`
7 years ago
beffc302f0
Std based dining-philosophers-problem (mutex & condvar version)
7 years ago
09098f0d2f
Add physical mod and reorganize.
7 years ago
e2e9ead17c
Improve MockPageTable. Fix tests.
7 years ago
733c102836
EnhancedClockSwapManager
7 years ago
c0d83ef75b
Make tests safe, by using Arc & RefCell.
7 years ago
e5e27db4ec
New page_table mod. Addr -> VirtAddr.
7 years ago
8d304da4b4
MockSwapper
7 years ago
470d5692fe
Pass test for FifoSwapManager. Change interface.
7 years ago
be6ff50d7f
Test framework for FifoSwapManager. Not passed.
7 years ago
a1e9ee36b2
Basic SwapManager & MockPageTable
7 years ago
0420e85e4d
Simple VMA & MM struct at extern crate.
7 years ago
WangRunji
equation314
lcy1996
koumingyang
chenqiuhao
Ben Pig Chu
dzy