equation314
d7511d8120
aarch64/fb: add mailbox property interfaces
2018-12-14 21:19:44 +08:00
WangRunji
557f021c08
fix DelayHandler & MemoryAttr
2018-12-14 02:31:46 +08:00
equation314
4257b76183
aarch64/fb: add bcm2837 mailbox
2018-12-12 01:24:36 +08:00
equation314
81af2c82fd
aarch64: reduce some warnings, config system/generic timer in Makefile
2018-12-11 16:58:04 +08:00
equation314
5a165178cc
aarch64: implement IRQ register & serial IRQ
2018-12-11 15:07:13 +08:00
WangRunji
ff806d4465
move common codes to InactivePageTable trait
2018-12-08 12:50:50 +08:00
WangRunji
102866bcf9
introduce MemoryHandler and refactor MemorySet. temporary disable swap.
...
This is a manual rebase of LCY's code
2018-12-08 00:29:55 +08:00
equation314
28d872064d
Merge branch 'master' of https://github.com/wangrunji0408/RustOS into arch-aarch64
2018-12-07 11:35:07 +08:00
equation314
aa5e7a4e6f
remove #![feature(extern_crate_item_prelude)]
2018-12-03 17:22:11 +08:00
Wang Runji
3f2beab52d
Merge branch 'master' into user-img
2018-12-02 22:39:59 +08:00
WangRunji
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
2018-12-02 00:27:10 +08:00
equation314
75b039c924
aarch64/mmu: move crate aarch64 to remote
2018-12-01 22:26:55 +08:00
equation314
a59a7fbe9a
aarch64/mmu: simply handle page fault
2018-12-01 20:00:35 +08:00
equation314
d6a54496f0
arch64/mmu: invalidate all icaches in InactivePageTable::with()
2018-12-01 19:43:58 +08:00
equation314
0eb33b661f
aarch64/mmu: fix some bugs
2018-12-01 19:31:46 +08:00
WangRunji
fcf5074500
impl M-mode kernel for riscv32
2018-12-01 17:37:37 +08:00
equation314
f882a085d6
user: link created SFS image in kernel
2018-11-29 17:33:31 +08:00
equation314
94bc8353f7
user: create SFS image in Makefile
2018-11-29 12:49:58 +08:00
WangRunji
18640b7537
impl NoMMU
2018-11-27 01:23:07 +08:00
WangRunji
52fe93188d
disable delay allocating frame, remove memory_set_record
2018-11-27 01:18:30 +08:00
WangRunji
2db453556d
try to fix interrupt & deadlock on RV32
2018-11-26 16:58:45 +08:00
equation314
d30c7e59ca
aarch64: minor modify
2018-11-25 20:01:13 +08:00
equation314
264600f145
aarch64/mmu: add io remap
2018-11-25 18:27:31 +08:00
equation314
a8b334123a
aarch64/mmu: add memory region attribute config
2018-11-25 17:58:17 +08:00
equation314
f9e47b2fd8
aarch64/mmu: refactor PageTableFlags
2018-11-25 00:29:39 +08:00
equation314
de6354ddd3
aarch64/mmu: use ASID to avoid flush TLB frequently in context switch
2018-11-23 23:25:15 +08:00
equation314
33d4b6975b
aarch64/mmu: use DSB instead of TLB flush after modifying PTE
2018-11-23 15:23:48 +08:00
equation314
55087fc5a2
aarch64/mmu: use both TTBR0_EL1 & TTBR1_EL1
2018-11-23 00:43:18 +08:00
equation314
bb1c1abaa4
aarch64/mmu: can run on the real raspi3
2018-11-21 20:02:34 +08:00
equation314
a9de99d3a9
aarch64/mmu: remap kernel memory ranges at the end of memory::init()
2018-11-21 01:50:34 +08:00
equation314
9e8124abbb
aarch64/mmu: mmu enabled
2018-11-20 16:46:16 +08:00
WangRunji
b1bdac7d0f
fix merge for aarch64. now it works!
2018-11-20 01:08:39 +08:00
WangRunji
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
2018-11-20 00:15:19 +08:00
WangRunji
4495622317
update process crate to 2018 edition
2018-11-19 15:46:40 +08:00
WangRunji
12457f10cb
update memory crate to 2018 edition
2018-11-19 15:43:28 +08:00
lcy1996
76d2c6ec7b
Fix the bug of active_table_swap() wrongly force unlock in pg fault handler
2018-11-17 23:17:42 +08:00
lcy1996
b2fec2b16b
Fix a bug in context for smp
2018-11-17 21:34:21 +08:00
lcy1996
9d803e87d9
replace some unwrap() and comment the cow pgfault handler
2018-11-17 16:25:24 +08:00
WangRunji
df485d506e
simplify ProcessManager
...
- given that a proc can only be waited by its parent, wait_queue is no longer needed.
2018-11-17 12:58:40 +08:00
WangRunji
ef75c8a072
fix unwrap panic. now user shell is working.
2018-11-17 12:40:51 +08:00
WangRunji
da399dca96
remove Process struct
2018-11-16 22:27:03 +08:00
WangRunji
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
2018-11-16 18:58:29 +08:00
WangRunji
5ce7d0a9c0
use user shell by default. fix kernel shell removing user thread.
2018-11-16 01:22:59 +08:00
equation314
576ae1d911
add setup_page_table
2018-11-15 19:12:02 +08:00
koumingyang
ef213d60bb
mmu
2018-11-15 14:22:57 +08:00
lcy1996
eb00b2bfd3
merge conflict
2018-11-14 21:54:26 +08:00
lcy1996
a8da42d521
Add expr4 report and some trace for synctest
2018-11-14 21:45:56 +08:00
chenqiuhao
4d8d48cf4d
repair some bugs and move child control to processmanager
2018-11-14 18:36:47 +08:00
lcy1996
c5499a62c5
Fix bug in swap in/out. Address ailign to 4K.
2018-11-14 00:32:59 +08:00
chenqiuhao
6652f8daf6
repair some bugs
2018-11-13 22:52:11 +08:00
chenqiuhao
8d6d3b7c37
debug for sleepkill
2018-11-13 19:56:17 +08:00
lcy1996
5ee44588e0
Enlarge the physical and kernel heap memory. Fix the bug in map the kernel.
2018-11-09 11:08:45 +08:00
lcy1996
990ce51007
Code Transplanting: unwrap -> expect
2018-11-08 19:58:30 +08:00
lcy1996
9adcea44d5
Code transplanting: Fix bugs. Pass test 'spin'
2018-11-08 19:21:13 +08:00
koumingyang
a13f39149b
add basic alloc
2018-11-07 10:44:24 +08:00
WangRunji
16fb733497
Blocking getchar
2018-11-05 22:55:59 +08:00
lcy1996
fcdee71f9d
Merge confilt
2018-11-05 21:31:04 +08:00
lcy1996
c8ea2cb0cf
Fix bug and enable swap in/out and frame delayed allocating.
2018-11-05 20:37:05 +08:00
equation314
7b6173a7bd
aarch64: move function delay() into mod timer in crate bcm2837
2018-11-04 18:27:28 +08:00
equation314
3e1d8c5827
aarch64: implement ARM generic timer, can work in qemu
2018-11-04 18:15:26 +08:00
chenqiuhao
2002ddd5fa
move processor from wrj
2018-11-03 21:45:03 +08:00
lcy1996
b1425a53f9
finish frame delayed allocating
2018-11-03 14:33:36 +08:00
WangRunji
e5a196c00f
Fix processor. Disable interrupt on switching.
2018-11-02 10:25:41 +08:00
WangRunji
5852881611
unwrap -> expect
2018-11-01 23:45:48 +08:00
WangRunji
b7d6b2989d
Fix bugs. Pass test 'spin'
...
- Fix ACK IRQ on x86.
- Add process exit handler.
2018-11-01 21:10:19 +08:00
WangRunji
74facd8e87
Use Vec to replace array in ProcessManager.
2018-11-01 00:16:32 +08:00
equation314
07aa9a0686
aarch64: implement IRQ & system timer, but don't work in qemu
2018-10-31 16:10:22 +08:00
equation314
430bf508e2
aarch64: add some comments to crate bcm2837
2018-10-30 23:18:15 +08:00
lcy1996
504401355f
Add expr3 report(not finiished.
2018-10-30 21:50:38 +08:00
WangRunji
7229b49eb8
Use rust-lld for RV32. Remove riscv git submodule.
2018-10-30 13:30:20 +08:00
lcy1996
edde416052
Finish swap for multi-user process
2018-10-30 12:45:09 +08:00
equation314
632baedabd
aarch64: can run on the real raspi3
2018-10-29 18:53:14 +08:00
equation314
517a78d114
aarch64: implement mini UART for bcm2837
2018-10-29 13:25:29 +08:00
WangRunji
72dc3f62ad
Remove kernel stack from MemorySet.
2018-10-27 15:17:15 +08:00
equation314
faa5f01f31
aarch64: fix a bug of bcm2837::asm::dealy()
2018-10-27 02:55:19 +08:00
equation314
addf49ffdb
aarch64: add crate bcm2837, implement GPIO
2018-10-27 02:45:47 +08:00
WangRunji
438e290b6d
Fix PageTable::get_entry -> Option.
2018-10-26 23:43:12 +08:00
WangRunji
0680023e35
Recover wait/sleep
2018-10-26 00:49:19 +08:00
WangRunji
c734f79699
Drop context when process exit. Remove util mod.
2018-10-25 01:04:31 +08:00
WangRunji
85a1dca684
Use weak linkage to provide dependencies for process::thread.
2018-10-24 21:32:23 +08:00
WangRunji
80b161db98
Recover set_priority and fork
2018-10-24 21:29:41 +08:00
WangRunji
5db908b1c5
Separate ProcessManager to a mod.
2018-10-24 00:38:22 +08:00
WangRunji
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.
2018-10-24 00:28:29 +08:00
lcy1996
ec27ed8d2e
add comment
2018-10-23 00:19:37 +08:00
lcy1996
63349ade19
Finish add more comment for kernel and finish set user memory swappable.
2018-10-23 00:00:09 +08:00
WangRunji
5bc392f388
Enable RV32 IPI.
2018-10-21 21:47:17 +08:00
lcy1996
0a81014007
Add page handler for swap in/out in riscv32's pagefault
2018-10-16 21:51:17 +08:00
Ben Pig Chu
fc727b9618
Merge branch 'OsTrain2018-g4' of https://github.com/oscourse-tsinghua/RustOS into crate-memory-comment
2018-10-09 21:42:13 +08:00
Ben Pig Chu
4a17ce8f16
comments of crate/memory
2018-10-09 21:39:34 +08:00
chenqiuhao
5bc40fd5d4
Merge branch 'OsTrain2018-g4' of https://github.com/oscourse-tsinghua/RustOS into OsTrain2018-g4
2018-10-05 12:01:21 +08:00
chenqiuhao
e05be94c80
finish the comment of the process
2018-10-05 12:01:00 +08:00
lcy1996
b3e2ca8aa0
Merge conflict
2018-10-05 11:08:50 +08:00
chenqiuhao
c4b53dc8e5
finish comment of sync
2018-10-05 09:28:17 +08:00
chenqiuhao
ddb679ce2b
update comment for bbl module, but have not finished.
2018-10-04 20:56:11 +08:00
WangRunji
fc2fd18c36
Add docs for thread::spawn()
2018-09-22 17:32:16 +08:00
WangRunji
7dd9494389
Add Scheduler.move_to_head(pid) to replace Processor.next
...
Rename `set_reschedule` to `yield_now`
2018-09-22 15:54:22 +08:00
WangRunji
501ce6c4be
Fix memory crate test compile.
2018-09-21 16:00:48 +08:00
WangRunji
cd1bd55729
Update README, travis, riscv crate.
2018-09-19 20:58:00 +08:00
WangRunji
924c061d64
Merge branch 'x86-boot'
...
# Conflicts:
# crate/riscv
# kernel/Makefile
2018-09-19 20:18:14 +08:00
dzy
5a0ce1e464
Refactored RISC-V page table identity mapping into a function.
2018-09-14 21:44:25 +08:00
dzy
906019f7c6
Add little notes for BitAllocator
2018-09-07 20:53:37 +08:00
WangRunji
caeff9ad97
Update packages and fit for new Rust nightly
2018-09-04 13:19:23 +08:00
WangRunji
b88648ff44
Fit for newest Rust nightly. x86_64 ok, riscv32 broken.
2018-08-04 16:20:25 +08:00
WangRunji
a2111a928f
Move thread mod to ucore-process crate
2018-07-17 19:06:30 +08:00
WangRunji
776dc976c9
Fix for user
2018-07-17 12:07:21 +08:00
WangRunji
06b39ed521
Impl remove any for StrideScheduler
2018-07-17 11:01:51 +08:00
WangRunji
04b62ec79f
Use Vec instead of array in Scheduler
2018-07-17 02:13:42 +08:00
WangRunji
c8a9eaf3e6
Split process mod to extern crate
2018-07-17 01:56:28 +08:00
WangRunji
0c9679b710
Fix fork and syscall return value.
2018-07-15 01:07:25 +08:00
WangRunji
27daa6d491
Fix user trap
2018-07-15 00:45:53 +08:00
WangRunji
1ad3ed738e
Can run user program in RV32
2018-07-14 11:56:55 +08:00
WangRunji
89bcd5f660
Fix kernel thread
2018-07-13 01:45:48 +08:00
WangRunji
96d8af8034
Use CowExt for RV32
2018-07-12 19:44:13 +08:00
WangRunji
7d856fe009
Fix memory::cow LLVM error for RV32
2018-07-12 19:35:21 +08:00
WangRunji
5530549a54
Recover process thread sync mod for RV32. Pass compile.
2018-07-12 18:56:29 +08:00
WangRunji
7c7dbc9ded
Add CR3 to Context (x86_64)
2018-07-12 16:42:21 +08:00
WangRunji
95ab3a2f3b
Allocate kernel stack from heap, remove stack allocator, remove guard page.
2018-07-12 00:33:43 +08:00
WangRunji
81ff6f13e5
Fix recursive mapping, finish kernel remap.
2018-07-11 23:43:28 +08:00
WangRunji
d3ed84ba61
Fix compile
2018-07-11 00:53:40 +08:00
WangRunji
aecb85d5e7
Move MemorySet out to memory crate
2018-07-10 21:54:16 +08:00
WangRunji
5c14673fe0
Setup a simple page table, enable paging.
2018-07-10 17:37:38 +08:00
WangRunji
b26fee1990
Make more mods common for both x86_64 & riscv32.
2018-07-10 17:07:03 +08:00
WangRunji
ee242b44b2
Timer interrupt
2018-07-08 01:03:33 +08:00
WangRunji
aeb7fce0e6
SBI: Support RISCV64
2018-07-08 01:02:43 +08:00
WangRunji
02b94db859
Fix crate riscv version
2018-07-07 22:59:07 +08:00
WangRunji
bf2ad7c6a5
Change target arch to RISCV32IMA. Recover some dependencies.
2018-07-06 22:33:28 +08:00
WangRunji
a44231435f
Fork crate riscv as a submodule
2018-07-05 14:17:30 +08:00
WangRunji
ced765fb5b
New crate bbl, port sbi mod.
2018-07-04 22:04:59 +08:00
WangRunji
98be93e215
Fix Fifo & Clock SwapManager, pass test.
2018-07-02 20:03:06 +08:00
WangRunji
a7a34835d5
Basic swap framework, temporarily disable SwapManagers
2018-06-24 01:44:14 +08:00
WangRunji
e47f57a12a
Cow test pass in OS
2018-06-23 22:30:57 +08:00
WangRunji
ade0f0110f
Use PageTable interface in OS
2018-06-23 19:11:41 +08:00
WangRunji
f500086b9e
Copy-on-write for PageTable interface.
2018-06-20 18:55:49 +08:00
WangRunji
978faf46c5
Split test for MockPageTable
2018-06-20 16:50:14 +08:00
WangRunji
aa109498f1
Clear memory crate, redefine PageTable interface, reimplement MockPageTable.
2018-06-20 16:33:03 +08:00
WangRunji
f3d62a5b8f
Replace AreaFrameAllocator by BitAllocator. Set opt-level=1 to avoid stack overflow.
2018-06-03 19:29:11 +08:00
WangRunji
2762fded9c
New crate bit-allocator
2018-06-03 17:40:46 +08:00
WangRunji
beffc302f0
Std based dining-philosophers-problem (mutex & condvar version)
2018-06-01 14:34:15 +08:00
WangRunji
09098f0d2f
Add physical mod and reorganize.
2018-04-26 16:23:54 +08:00
WangRunji
e2e9ead17c
Improve MockPageTable. Fix tests.
2018-04-25 16:17:15 +08:00
WangRunji
733c102836
EnhancedClockSwapManager
2018-04-25 15:32:43 +08:00
WangRunji
c0d83ef75b
Make tests safe, by using Arc & RefCell.
2018-04-25 13:50:31 +08:00
WangRunji
e5e27db4ec
New page_table mod. Addr -> VirtAddr.
2018-04-23 19:05:44 +08:00
WangRunji
8d304da4b4
MockSwapper
2018-04-23 18:48:20 +08:00
WangRunji
470d5692fe
Pass test for FifoSwapManager. Change interface.
2018-04-19 15:28:32 +08:00
WangRunji
be6ff50d7f
Test framework for FifoSwapManager. Not passed.
2018-04-19 12:42:24 +08:00
WangRunji
a1e9ee36b2
Basic SwapManager & MockPageTable
2018-04-19 11:37:13 +08:00
WangRunji
0420e85e4d
Simple VMA & MM struct at extern crate.
2018-04-19 00:22:03 +08:00
