Samuka007/asterinas
1
0
Fork 0
mirror of https://github.com/asterinas/asterinas.git synced 2025-06-11 06:16:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix a bug of InitStack during doing fork+exec

Browse Source
This commit is contained in:
Chen Chengjun 2024-08-24 09:40:37 +08:00 committed by Tate, Hongliang Tian
parent d22277a3e6
commit 6bde87d33a
3 changed files with 41 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
kernel/src/process/process_vm/init_stack/mod.rs
View File

@ -106,7 +106,6 @@ pub struct InitStack {
/// After initialized, `pos` points to the user stack pointer(rsp)
/// of the process.
pos: Arc<AtomicUsize>,
vmo: Vmo<Full>,
}
impl Clone for InitStack {
@ -114,8 +113,7 @@ impl Clone for InitStack {
Self {
initial_top: self.initial_top,
max_size: self.max_size,
pos: self.pos.clone(),
vmo: self.vmo.dup(),
pos: Arc::new(AtomicUsize::new(self.pos.load(Ordering::Relaxed))),
}
}
}
@ -130,36 +128,13 @@ impl InitStack {
let initial_top = MAX_USERSPACE_VADDR - PAGE_SIZE * nr_pages_padding;
let max_size = INIT_STACK_SIZE;
let vmo = {
let vmo_options = VmoOptions::<Full>::new(max_size);
vmo_options.alloc().unwrap()
};
Self {
initial_top,
max_size,
pos: Arc::new(AtomicUsize::new(initial_top)),
vmo,
}
}
/// Maps the vmo of the init stack.
pub(super) fn map_init_stack_vmo(&self, root_vmar: &Vmar<Full>) -> Result<()> {
let vmar_map_options = {
let perms = VmPerms::READ | VmPerms::WRITE;
let map_addr = self.initial_top - self.max_size;
debug_assert!(map_addr % PAGE_SIZE == 0);
root_vmar
.new_map(self.max_size, perms)?
.offset(map_addr)
.vmo(self.vmo.dup().to_dyn())
};
vmar_map_options.build()?;
self.set_uninitialized();
Ok(())
}
/// Returns the user stack top(highest address), used to setup rsp.
///
/// This method should only be called after the stack is initialized.
@ -170,32 +145,48 @@ impl InitStack {
stack_top
}
/// Constructs a writer to initialize the content of an `InitStack`.
pub(super) fn writer(
/// Maps the VMO of the init stack and constructs a writer to initialize its content.
pub(super) fn map_and_write(
&self,
root_vmar: &Vmar<Full>,
argv: Vec<CString>,
envp: Vec<CString>,
auxvec: AuxVec,
) -> InitStackWriter<'_> {
// The stack should be written only once.
debug_assert!(!self.is_initialized());
InitStackWriter {
) -> Result<()> {
self.set_uninitialized();
let vmo = {
let vmo_options = VmoOptions::<Full>::new(self.max_size);
vmo_options.alloc()?
};
let vmar_map_options = {
let perms = VmPerms::READ | VmPerms::WRITE;
let map_addr = self.initial_top - self.max_size;
debug_assert!(map_addr % PAGE_SIZE == 0);
root_vmar
.new_map(self.max_size, perms)?
.offset(map_addr)
.vmo(vmo.dup().to_dyn())
};
vmar_map_options.build()?;
let writer = InitStackWriter {
pos: self.pos.clone(),
vmo: &self.vmo,
vmo,
argv,
envp,
auxvec,
map_addr: self.initial_top - self.max_size,
}
};
writer.write()
}
/// Constructs a reader to parse the content of an `InitStack`.
/// The `InitStack` should only be read after initialized
pub(super) fn reader(&self) -> InitStackReader<'_> {
pub(super) fn reader(&self) -> InitStackReader {
debug_assert!(self.is_initialized());
InitStackReader {
base: self.pos(),
vmo: &self.vmo,
map_addr: self.initial_top - self.max_size,
}
}
@ -214,9 +205,9 @@ impl InitStack {
}
/// A writer to initialize the content of an `InitStack`.
pub struct InitStackWriter<'a> {
struct InitStackWriter {
pos: Arc<AtomicUsize>,
vmo: &'a Vmo<Full>,
vmo: Vmo<Full>,
argv: Vec<CString>,
envp: Vec<CString>,
auxvec: AuxVec,
@ -224,8 +215,8 @@ pub struct InitStackWriter<'a> {
map_addr: usize,
}
impl<'a> InitStackWriter<'a> {
pub fn write(mut self) -> Result<()> {
impl InitStackWriter {
fn write(mut self) -> Result<()> {
// FIXME: Some OSes may put the first page of excutable file here
// for interpreting elf headers.
@ -371,18 +362,17 @@ fn generate_random_for_aux_vec() -> [u8; 16] {
}
/// A reader to parse the content of an `InitStack`.
pub struct InitStackReader<'a> {
pub struct InitStackReader {
base: Vaddr,
vmo: &'a Vmo<Full>,
/// The mapping address of the `InitStack`.
map_addr: usize,
}
impl<'a> InitStackReader<'a> {
impl InitStackReader {
/// Reads argc from the process init stack
pub fn argc(&self) -> Result<u64> {
let stack_base = self.init_stack_bottom();
Ok(self.vmo.read_val(stack_base - self.map_addr)?)
CurrentUserSpace::get().read_val(stack_base)
}
/// Reads argv from the process init stack

13
kernel/src/process/process_vm/mod.rs
View File

@ -19,8 +19,8 @@ pub use self::{
heap::USER_HEAP_SIZE_LIMIT,
init_stack::{
aux_vec::{AuxKey, AuxVec},
InitStack, InitStackReader, InitStackWriter, INIT_STACK_SIZE, MAX_ARGV_NUMBER, MAX_ARG_LEN,
MAX_ENVP_NUMBER, MAX_ENV_LEN,
InitStack, InitStackReader, INIT_STACK_SIZE, MAX_ARGV_NUMBER, MAX_ARG_LEN, MAX_ENVP_NUMBER,
MAX_ENV_LEN,
},
};
use crate::{prelude::*, vm::vmar::Vmar};
@ -83,7 +83,6 @@ impl ProcessVm {
pub fn alloc() -> Self {
let root_vmar = Vmar::<Full>::new_root();
let init_stack = InitStack::new();
init_stack.map_init_stack_vmo(&root_vmar).unwrap();
let heap = Heap::new();
heap.alloc_and_map_vmo(&root_vmar).unwrap();
Self {
@ -120,13 +119,14 @@ impl ProcessVm {
self.init_stack.user_stack_top()
}
pub(super) fn init_stack_writer(
pub(super) fn map_and_write_init_stack(
&self,
argv: Vec<CString>,
envp: Vec<CString>,
aux_vec: AuxVec,
) -> InitStackWriter {
self.init_stack.writer(argv, envp, aux_vec)
) -> Result<()> {
self.init_stack
.map_and_write(self.root_vmar(), argv, envp, aux_vec)
}
pub(super) fn heap(&self) -> &Heap {
@ -136,7 +136,6 @@ impl ProcessVm {
/// Clears existing mappings and then maps stack and heap vmo.
pub(super) fn clear_and_map(&self) {
self.root_vmar.clear().unwrap();
self.init_stack.map_init_stack_vmo(&self.root_vmar).unwrap();
self.heap.alloc_and_map_vmo(&self.root_vmar).unwrap();
}
}

3
kernel/src/process/program_loader/elf/load_elf.rs
View File

@ -54,8 +54,7 @@ pub fn load_elf_to_vm(
.unwrap();
}
let init_stack_writer = process_vm.init_stack_writer(argv, envp, aux_vec);
init_stack_writer.write().unwrap();
process_vm.map_and_write_init_stack(argv, envp, aux_vec)?;
let user_stack_top = process_vm.user_stack_top();
Ok(ElfLoadInfo {