a51b9dbd90
Implement tls setup code(not working yet), tcp sys_bind and sys_connect
6 years ago
738554386b
introduce VMError to simplify EFAULT error handling
6 years ago
2a6c4554d1
Merge remote-tracking branch 'course/biscuit' into biscuit
6 years ago
e543449836
Implement basic version of sys_munmap and sys_time
6 years ago
a979b6b5ec
impl sys_getppid. fix checking pointer for process syscalls
6 years ago
6d78206f77
impl finding free area for mmap
6 years ago
254663e976
impl a simple work-stealing scheduler
6 years ago
5a1b3e0dff
no longer support 'remove' in Scheduler
6 years ago
a224e85c8d
split scheduler mod, make Scheduler Sync
...
biscuit: fix argc, argv
6 years ago
e678186b3d
support idle for rcore-thread, remove idle thread in kernel
6 years ago
ca45f8f152
fix check user ptr in syscalls
6 years ago
7927c7c168
Merge branch 'thread' into biscuit
...
# Conflicts:
# kernel/src/process/mod.rs
# kernel/src/process/structs.rs
# kernel/src/syscall.rs
6 years ago
8313b8854e
cherry-pick virtio improvement from lab8-rv32
...
Move mandelbrot to test mod, cleanup virtio feature negotiation and add addr2line script to Makefile
Implement full virtqueue operations, virtio input driver
Use new virtqueue implementation for virtio net driver
Implement virtio blk device support and use it instead of memory sfs when available
fix dirty hack for virtio_blk
6 years ago
fc8888db72
update for new paging mechanism on riscv. move kernel va to 0x(ffffffff)c0000000.
6 years ago
086fcd4079
rename 'event_hub' to 'timer', add doc and simplify
6 years ago
1541282ad7
add example for 'thread' crate
6 years ago
5bffce787b
rename 'process' crate to 'thread'
6 years ago
047f4ffdcc
cherry-pick jiegec's work ( #3 ) from lab8-rv32: virtio drivers, network stack
...
Read and parse dtb upon boot
Implement virtio net device detection
Negotiate feature bits for virtio-net
Read MAC address from virtio-net device and detect virtqueues
Receiving from virtio net device is working for the first time
Implement driver interface and interrupt handling routines
Rearrange drivers into upper directory
Implement initial support for processing arp request and reply packet
Refactor MAC address and IPv4 address into structs, and implement ICMP echo reply
Fix typos
Implement initial support for virtio gpu driver
Complete first working version of virtio gpu driver with mandelbrot example
Use smoltcp and implement a udp and tcp server on top of it
Cleanup virtio net code
6 years ago
2d5178d0b7
rename ucore to rcore
6 years ago
61dfcb5558
Merge remote-tracking branch 'equation314/arch-aarch64' into merging
...
# Conflicts:
# kernel/Makefile
# kernel/src/arch/aarch64/board/raspi3/irq.rs
# kernel/src/arch/aarch64/memory.rs
# kernel/src/arch/riscv32/paging.rs
# kernel/src/arch/x86_64/paging.rs
6 years ago
1aa8436d71
aarch64/doc: add interruption & timer drivers
6 years ago
5d7e97d9e9
fix interrupt in process crate
6 years ago
33eaded142
Merge remote-tracking branch 'bpc/user-lib-bin' into merge-1228
...
# Conflicts:
# kernel/src/arch/riscv32/compiler_rt.c
# kernel/src/arch/riscv32/consts.rs
# kernel/src/arch/riscv32/context.rs
# kernel/src/arch/riscv32/io.rs
# kernel/src/arch/riscv32/memory.rs
# kernel/src/arch/riscv32/paging.rs
# user/ucore-ulib/src/syscall.rs
6 years ago
c65b7357a4
use riscv crate from github
6 years ago
a852c96136
Merge branch 'master' into rust-rv64
...
# Conflicts:
# crate/memory/src/memory_set.rs
# kernel/src/arch/riscv32/compiler_rt.rs
# kernel/src/arch/riscv32/memory.rs
# kernel/src/arch/riscv32/paging.rs
# kernel/src/memory.rs
# kernel/src/process/mod.rs
6 years ago
b3a8e95d78
merge interrupt & context switch for rv32 & rv64
6 years ago
6f2d059ba5
implement map_kernel, now enters the kernel well
6 years ago
21adebb203
run until ms.token()
6 years ago
a4348428a6
can run until update
6 years ago
d67a224494
add wrj's 704af94 patch
6 years ago
ed3fb6d423
another temporary
6 years ago
0dbffbc0fa
temporary
6 years ago
b7e124930d
fix compilation errors
6 years ago
3910f71521
preliminary support for riscv64, not tested.
...
riscv32 runs fine.
6 years ago
aa5bd3041b
Merge branch 'master' into arch-aarch64
6 years ago
d737b1e7ba
maually remove warning, pt6
6 years ago
6eb49a0106
maually remove warning, pt5
6 years ago
07b8a063ec
maually remove warning, pt2
6 years ago
1ca2bde069
maually remove warning, pt1
6 years ago
61a3beb8ba
Start porting for rv64
6 years ago
b5cc79d1b2
modify mmio() & set_mmio() in PageEntry
6 years ago
5987c2068b
aarch64/fb: remap framebuffer base address
6 years ago
9b0b0064d0
Merge remote-tracking branch 'equation314/arch-aarch64' into dev
...
# Conflicts:
# kernel/src/arch/aarch64/memory.rs
# kernel/src/arch/aarch64/paging.rs
# kernel/src/process/context.rs
6 years ago
d7511d8120
aarch64/fb: add mailbox property interfaces
6 years ago
557f021c08
fix DelayHandler & MemoryAttr
6 years ago
4257b76183
aarch64/fb: add bcm2837 mailbox
6 years ago
81af2c82fd
aarch64: reduce some warnings, config system/generic timer in Makefile
6 years ago
5a165178cc
aarch64: implement IRQ register & serial IRQ
6 years ago
ff806d4465
move common codes to InactivePageTable trait
6 years ago
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
Jiajie Chen
WangRunji
Jiajie Chen
equation314
dzy
Ben Pig Chu
lcy1996
koumingyang
chenqiuhao