Samuka007/asterinas
1
0
Fork 0
mirror of https://github.com/asterinas/asterinas.git synced 2025-06-27 03:13:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix memory leak of Task structures

Browse Source
This commit is contained in:
Ruihan Li
2024-05-08 18:38:36 +08:00
committed by Tate, Hongliang Tian
parent faf9cf7da8
commit e0c6c29481
5 changed files with 45 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
kernel/aster-nix/src/process/program_loader/elf/load_elf.rs
View File

@ -7,7 +7,7 @@
//! When create a process from elf file, we will use the elf_load_info to construct the VmSpace
use align_ext::AlignExt;
use aster_frame::{mm::VmIo, task::Task};
use aster_frame::mm::VmIo;
use aster_rights::{Full, Rights};
use xmas_elf::program::{self, ProgramHeader64};
@ -75,7 +75,7 @@ pub fn load_elf_to_vm(
user_stack_top,
})
}
Err(_) => {
Err(err) => {
// Since the process_vm is in invalid state,
// the process cannot return to user space again,
// so `Vmar::clear` and `do_exit_group` are called here.
@ -87,7 +87,9 @@ pub fn load_elf_to_vm(
// the macro will panic. This corner case should be handled later.
// FIXME: how to set the correct exit status?
do_exit_group(TermStatus::Exited(1));
Task::current().exit();
// The process will exit and the error code will be ignored.
Err(err)
}
}
}

5
kernel/aster-nix/src/process/signal/mod.rs
View File

@ -16,7 +16,7 @@ pub mod signals;
use core::{mem, sync::atomic::Ordering};
use align_ext::AlignExt;
use aster_frame::{cpu::UserContext, task::Task, user::UserContextApi};
use aster_frame::{cpu::UserContext, user::UserContextApi};
use c_types::{siginfo_t, ucontext_t};
pub use events::{SigEvents, SigEventsFilter};
pub use pauser::Pauser;
@ -90,9 +90,8 @@ pub fn handle_pending_signal(
current.executable_path(),
sig_num.sig_name()
);
do_exit_group(TermStatus::Killed(sig_num));
// We should exit current here, since we cannot restore a valid status from trap now.
Task::current().exit();
do_exit_group(TermStatus::Killed(sig_num));
}
SigDefaultAction::Ign => {}
SigDefaultAction::Stop => {

10
kernel/aster-nix/src/thread/task.rs
View File

@ -57,22 +57,20 @@ pub fn create_new_user_task(user_space: Arc<UserSpace>, thread_ref: Weak<Thread>
break;
}
handle_pending_signal(context, &current_thread).unwrap();
if current_thread.status().is_exited() {
debug!("exit due to signal");
break;
}
// If current is suspended, wait for a signal to wake up self
while current_thread.status().is_stopped() {
Thread::yield_now();
debug!("{} is suspended.", current_thread.tid());
handle_pending_signal(context, &current_thread).unwrap();
}
if current_thread.status().is_exited() {
debug!("exit due to signal");
break;
}
// a preemption point after handling user event.
preempt(current_task);
}
debug!("exit user loop");
// FIXME: This is a work around: exit in kernel task entry may be not called. Why this will happen?
current_task.exit();
}
TaskOptions::new(user_task_entry)