Tateisi/rcore-tutorial
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #92 from justxuewei/fix/kstack-leak

Browse source
This commit is contained in:
Yifan Wu 2023-02-08 11:08:51 +08:00 • committed by GitHub
commit 3924a5f756
8 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
README.md
View file

@ -50,7 +50,7 @@ Here we manually compile and install Qemu 7.0.0. For example, on Ubuntu 18.04:
# install dependency packages # install dependency packages
$ sudo apt install autoconf automake autotools-dev curl libmpc-dev libmpfr-dev libgmp-dev \ $ sudo apt install autoconf automake autotools-dev curl libmpc-dev libmpfr-dev libgmp-dev \
gawk build-essential bison flex texinfo gperf libtool patchutils bc \ gawk build-essential bison flex texinfo gperf libtool patchutils bc \
zlib1g-dev libexpat-dev pkg-config libglib2.0-dev libpixman-1-dev git tmux python3 python3-pip zlib1g-dev libexpat-dev pkg-config libglib2.0-dev libpixman-1-dev git tmux python3 python3-pip ninja-build
# download Qemu source code # download Qemu source code
$ wget https://download.qemu.org/qemu-7.0.0.tar.xz $ wget https://download.qemu.org/qemu-7.0.0.tar.xz
# extract to qemu-7.0.0/ # extract to qemu-7.0.0/
@ -64,9 +64,7 @@ $ make -j$(nproc)
Then, add following contents to `~/.bashrc`(please adjust these paths according to your environment): Then, add following contents to `~/.bashrc`(please adjust these paths according to your environment):
``` ```
export PATH=$PATH:/home/shinbokuow/Downloads/built/qemu-7.0.0 export PATH=$PATH:/path/to/qemu-7.0.0/build
export PATH=$PATH:/home/shinbokuow/Downloads/built/qemu-7.0.0/riscv64-softmmu
export PATH=$PATH:/home/shinbokuow/Downloads/built/qemu-7.0.0/riscv64-linux-user
``` ```
Finally, update the current shell: Finally, update the current shell:

2
easy-fs-fuse/Cargo.toml
View file

@ -13,4 +13,4 @@ rand = "0.8.0"
# [features] # [features]
# board_qemu = [] # board_qemu = []
# board_k210 = [] # board_k210 = []

BIN
figures/logo.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 54 KiB

1
os/src/drivers/block/virtio_blk.rs
View file

@ -5,6 +5,7 @@ use crate::task::schedule;
use crate::DEV_NON_BLOCKING_ACCESS; use crate::DEV_NON_BLOCKING_ACCESS;
use alloc::collections::BTreeMap; use alloc::collections::BTreeMap;
use virtio_drivers::{BlkResp, RespStatus, VirtIOBlk, VirtIOHeader}; use virtio_drivers::{BlkResp, RespStatus, VirtIOBlk, VirtIOHeader};
use crate::drivers::bus::virtio::VirtioHal;
#[allow(unused)] #[allow(unused)]
const VIRTIO0: usize = 0x10008000; const VIRTIO0: usize = 0x10008000;

1
os/src/drivers/gpu/mod.rs
View file

@ -5,6 +5,7 @@ use core::any::Any;
use embedded_graphics::pixelcolor::Rgb888; use embedded_graphics::pixelcolor::Rgb888;
use tinybmp::Bmp; use tinybmp::Bmp;
use virtio_drivers::{VirtIOGpu, VirtIOHeader}; use virtio_drivers::{VirtIOGpu, VirtIOHeader};
use crate::drivers::bus::virtio::VirtioHal;
const VIRTIO7: usize = 0x10007000; const VIRTIO7: usize = 0x10007000;
pub trait GpuDevice: Send + Sync + Any { pub trait GpuDevice: Send + Sync + Any {
fn update_cursor(&self); fn update_cursor(&self);

2
os/src/drivers/mod.rs
View file

@ -11,4 +11,4 @@ pub use bus::*;
pub use chardev::UART; pub use chardev::UART;
pub use gpu::*; pub use gpu::*;
pub use input::*; pub use input::*;
pub use net::*; pub use net::*;

1
os/src/task/id.rs
View file

@ -87,6 +87,7 @@ impl Drop for KernelStack {
KERNEL_SPACE KERNEL_SPACE
.exclusive_access() .exclusive_access()
.remove_area_with_start_vpn(kernel_stack_bottom_va.into()); .remove_area_with_start_vpn(kernel_stack_bottom_va.into());
KSTACK_ALLOCATOR.exclusive_access().dealloc(self.0);
} }
} }

2
user/Cargo.toml
View file

@ -16,4 +16,4 @@ oorandom ="11"
virtio-input-decoder = "0.1.4" virtio-input-decoder = "0.1.4"
[profile.release] [profile.release]
debug = true debug = true