mirror of
https://github.com/RGBCube/serenity
synced 2025-07-26 01:07:35 +00:00
Kernel: Allow process with multiple threads to call exec and exit
This allows a process wich has more than 1 thread to call exec, even from a thread. This kills all the other threads, but it won't wait for them to finish, just makes sure that they are not in a running/runable state. In the case where a thread does exec, the new program PID will be the thread TID, to keep the PID == TID in the new process. This introduces a new function inside the Process class, kill_threads_except_self which is called on exit() too (exit with multiple threads wasn't properly working either). Inside the Lock class, there is the need for a new function, clear_waiters, which removes all the waiters from the Process::big_lock. This is needed since after a exit/exec, there should be no other threads waiting for this lock, the threads should be simply killed. Only queued threads should wait for this lock at this point, since blocked threads are handled in set_should_die.
This commit is contained in:
parent
9fcb37ad30
commit
717cd5015e
8 changed files with 78 additions and 22 deletions
|
@ -86,4 +86,10 @@ bool Lock::force_unlock_if_locked()
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void Lock::clear_waiters()
|
||||||
|
{
|
||||||
|
InterruptDisabler disabler;
|
||||||
|
m_queue.clear();
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -47,6 +47,7 @@ public:
|
||||||
void unlock();
|
void unlock();
|
||||||
bool force_unlock_if_locked();
|
bool force_unlock_if_locked();
|
||||||
bool is_locked() const { return m_holder; }
|
bool is_locked() const { return m_holder; }
|
||||||
|
void clear_waiters();
|
||||||
|
|
||||||
const char* name() const { return m_name; }
|
const char* name() const { return m_name; }
|
||||||
|
|
||||||
|
|
|
@ -760,21 +760,45 @@ pid_t Process::sys$fork(RegisterState& regs)
|
||||||
return child->pid();
|
return child->pid();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void Process::kill_threads_except_self()
|
||||||
|
{
|
||||||
|
InterruptDisabler disabler;
|
||||||
|
|
||||||
|
if (m_thread_count <= 1)
|
||||||
|
return;
|
||||||
|
|
||||||
|
for_each_thread([&](Thread& thread) {
|
||||||
|
if (&thread == Thread::current
|
||||||
|
|| thread.state() == Thread::State::Dead
|
||||||
|
|| thread.state() == Thread::State::Dying)
|
||||||
|
return IterationDecision::Continue;
|
||||||
|
|
||||||
|
// At this point, we have no joiner anymore
|
||||||
|
thread.m_joiner = nullptr;
|
||||||
|
thread.set_should_die();
|
||||||
|
|
||||||
|
if (thread.state() != Thread::State::Dead)
|
||||||
|
thread.set_state(Thread::State::Dying);
|
||||||
|
|
||||||
|
return IterationDecision::Continue;
|
||||||
|
});
|
||||||
|
|
||||||
|
big_lock().clear_waiters();
|
||||||
|
}
|
||||||
|
|
||||||
|
void Process::kill_all_threads()
|
||||||
|
{
|
||||||
|
for_each_thread([&](Thread& thread) {
|
||||||
|
thread.set_should_die();
|
||||||
|
return IterationDecision::Continue;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
int Process::do_exec(NonnullRefPtr<FileDescription> main_program_description, Vector<String> arguments, Vector<String> environment, RefPtr<FileDescription> interpreter_description)
|
int Process::do_exec(NonnullRefPtr<FileDescription> main_program_description, Vector<String> arguments, Vector<String> environment, RefPtr<FileDescription> interpreter_description)
|
||||||
{
|
{
|
||||||
ASSERT(is_ring3());
|
ASSERT(is_ring3());
|
||||||
auto path = main_program_description->absolute_path();
|
auto path = main_program_description->absolute_path();
|
||||||
dbg() << "do_exec(" << path << ")";
|
dbg() << "do_exec(" << path << ")";
|
||||||
// FIXME(Thread): Kill any threads the moment we commit to the exec().
|
|
||||||
if (thread_count() != 1) {
|
|
||||||
dbgprintf("Gonna die because I have many threads! These are the threads:\n");
|
|
||||||
for_each_thread([](Thread& thread) {
|
|
||||||
dbgprintf("Thread{%p}: TID=%d, PID=%d\n", &thread, thread.tid(), thread.pid());
|
|
||||||
return IterationDecision::Continue;
|
|
||||||
});
|
|
||||||
ASSERT(thread_count() == 1);
|
|
||||||
ASSERT_NOT_REACHED();
|
|
||||||
}
|
|
||||||
|
|
||||||
size_t total_blob_size = 0;
|
size_t total_blob_size = 0;
|
||||||
for (auto& a : arguments)
|
for (auto& a : arguments)
|
||||||
|
@ -808,6 +832,10 @@ int Process::do_exec(NonnullRefPtr<FileDescription> main_program_description, Ve
|
||||||
bool was_profiling = is_profiling();
|
bool was_profiling = is_profiling();
|
||||||
TemporaryChange profiling_disabler(m_profiling, false);
|
TemporaryChange profiling_disabler(m_profiling, false);
|
||||||
|
|
||||||
|
// Mark this thread as the current thread that does exec
|
||||||
|
// No other thread from this process will be scheduled to run
|
||||||
|
m_exec_tid = Thread::current->tid();
|
||||||
|
|
||||||
auto old_page_directory = move(m_page_directory);
|
auto old_page_directory = move(m_page_directory);
|
||||||
auto old_regions = move(m_regions);
|
auto old_regions = move(m_regions);
|
||||||
m_page_directory = PageDirectory::create_for_userspace(*this);
|
m_page_directory = PageDirectory::create_for_userspace(*this);
|
||||||
|
@ -854,9 +882,7 @@ int Process::do_exec(NonnullRefPtr<FileDescription> main_program_description, Ve
|
||||||
m_regions = move(old_regions);
|
m_regions = move(old_regions);
|
||||||
MM.enter_process_paging_scope(*this);
|
MM.enter_process_paging_scope(*this);
|
||||||
});
|
});
|
||||||
|
|
||||||
loader = make<ELFLoader>(region->vaddr().as_ptr(), loader_metadata.size);
|
loader = make<ELFLoader>(region->vaddr().as_ptr(), loader_metadata.size);
|
||||||
|
|
||||||
// Load the correct executable -- either interp or main program.
|
// Load the correct executable -- either interp or main program.
|
||||||
// FIXME: Once we actually load both interp and main, we'll need to be more clever about this.
|
// FIXME: Once we actually load both interp and main, we'll need to be more clever about this.
|
||||||
// In that case, both will be ET_DYN objects, so they'll both be completely relocatable.
|
// In that case, both will be ET_DYN objects, so they'll both be completely relocatable.
|
||||||
|
@ -920,6 +946,8 @@ int Process::do_exec(NonnullRefPtr<FileDescription> main_program_description, Ve
|
||||||
// NOTE: At this point, we've committed to the new executable.
|
// NOTE: At this point, we've committed to the new executable.
|
||||||
entry_eip = loader->entry().offset(totally_random_offset).get();
|
entry_eip = loader->entry().offset(totally_random_offset).get();
|
||||||
|
|
||||||
|
kill_threads_except_self();
|
||||||
|
|
||||||
#ifdef EXEC_DEBUG
|
#ifdef EXEC_DEBUG
|
||||||
kprintf("Memory layout after ELF load:");
|
kprintf("Memory layout after ELF load:");
|
||||||
dump_regions();
|
dump_regions();
|
||||||
|
@ -999,6 +1027,7 @@ int Process::do_exec(NonnullRefPtr<FileDescription> main_program_description, Ve
|
||||||
m_master_tls_size = master_tls_size;
|
m_master_tls_size = master_tls_size;
|
||||||
m_master_tls_alignment = master_tls_alignment;
|
m_master_tls_alignment = master_tls_alignment;
|
||||||
|
|
||||||
|
m_pid = new_main_thread->tid();
|
||||||
new_main_thread->make_thread_specific_region({});
|
new_main_thread->make_thread_specific_region({});
|
||||||
new_main_thread->reset_fpu_state();
|
new_main_thread->reset_fpu_state();
|
||||||
|
|
||||||
|
@ -1198,6 +1227,9 @@ int Process::exec(String path, Vector<String> arguments, Vector<String> environm
|
||||||
// The bulk of exec() is done by do_exec(), which ensures that all locals
|
// The bulk of exec() is done by do_exec(), which ensures that all locals
|
||||||
// are cleaned up by the time we yield-teleport below.
|
// are cleaned up by the time we yield-teleport below.
|
||||||
int rc = do_exec(move(description), move(arguments), move(environment), move(interpreter_description));
|
int rc = do_exec(move(description), move(arguments), move(environment), move(interpreter_description));
|
||||||
|
|
||||||
|
m_exec_tid = 0;
|
||||||
|
|
||||||
if (rc < 0)
|
if (rc < 0)
|
||||||
return rc;
|
return rc;
|
||||||
|
|
||||||
|
@ -1211,6 +1243,7 @@ int Process::exec(String path, Vector<String> arguments, Vector<String> environm
|
||||||
int Process::sys$execve(const Syscall::SC_execve_params* user_params)
|
int Process::sys$execve(const Syscall::SC_execve_params* user_params)
|
||||||
{
|
{
|
||||||
REQUIRE_PROMISE(exec);
|
REQUIRE_PROMISE(exec);
|
||||||
|
|
||||||
// NOTE: Be extremely careful with allocating any kernel memory in exec().
|
// NOTE: Be extremely careful with allocating any kernel memory in exec().
|
||||||
// On success, the kernel stack will be lost.
|
// On success, the kernel stack will be lost.
|
||||||
Syscall::SC_execve_params params;
|
Syscall::SC_execve_params params;
|
||||||
|
@ -3053,14 +3086,7 @@ void Process::die()
|
||||||
if (m_tracer)
|
if (m_tracer)
|
||||||
m_tracer->set_dead();
|
m_tracer->set_dead();
|
||||||
|
|
||||||
{
|
kill_all_threads();
|
||||||
// Tell the threads to unwind and die.
|
|
||||||
InterruptDisabler disabler;
|
|
||||||
for_each_thread([](Thread& thread) {
|
|
||||||
thread.set_should_die();
|
|
||||||
return IterationDecision::Continue;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
size_t Process::amount_dirty_private() const
|
size_t Process::amount_dirty_private() const
|
||||||
|
|
|
@ -141,6 +141,8 @@ public:
|
||||||
gid_t egid() const { return m_egid; }
|
gid_t egid() const { return m_egid; }
|
||||||
pid_t ppid() const { return m_ppid; }
|
pid_t ppid() const { return m_ppid; }
|
||||||
|
|
||||||
|
pid_t exec_tid() const { return m_exec_tid; }
|
||||||
|
|
||||||
mode_t umask() const { return m_umask; }
|
mode_t umask() const { return m_umask; }
|
||||||
|
|
||||||
bool in_group(gid_t) const;
|
bool in_group(gid_t) const;
|
||||||
|
@ -417,6 +419,9 @@ private:
|
||||||
|
|
||||||
Region& add_region(NonnullOwnPtr<Region>);
|
Region& add_region(NonnullOwnPtr<Region>);
|
||||||
|
|
||||||
|
void kill_threads_except_self();
|
||||||
|
void kill_all_threads();
|
||||||
|
|
||||||
int do_exec(NonnullRefPtr<FileDescription> main_program_description, Vector<String> arguments, Vector<String> environment, RefPtr<FileDescription> interpreter_description);
|
int do_exec(NonnullRefPtr<FileDescription> main_program_description, Vector<String> arguments, Vector<String> environment, RefPtr<FileDescription> interpreter_description);
|
||||||
ssize_t do_write(FileDescription&, const u8*, int data_size);
|
ssize_t do_write(FileDescription&, const u8*, int data_size);
|
||||||
|
|
||||||
|
@ -448,6 +453,8 @@ private:
|
||||||
pid_t m_sid { 0 };
|
pid_t m_sid { 0 };
|
||||||
pid_t m_pgid { 0 };
|
pid_t m_pgid { 0 };
|
||||||
|
|
||||||
|
pid_t m_exec_tid { 0 };
|
||||||
|
|
||||||
static const int m_max_open_file_descriptors { FD_SETSIZE };
|
static const int m_max_open_file_descriptors { FD_SETSIZE };
|
||||||
|
|
||||||
struct FileDescriptionAndFlags {
|
struct FileDescriptionAndFlags {
|
||||||
|
|
|
@ -409,6 +409,9 @@ bool Scheduler::pick_next()
|
||||||
if (thread->process().is_being_inspected())
|
if (thread->process().is_being_inspected())
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
|
if (thread->process().exec_tid() && thread->process().exec_tid() != thread->tid())
|
||||||
|
continue;
|
||||||
|
|
||||||
ASSERT(thread->state() == Thread::Runnable || thread->state() == Thread::Running);
|
ASSERT(thread->state() == Thread::Runnable || thread->state() == Thread::Running);
|
||||||
|
|
||||||
if (!thread_to_schedule) {
|
if (!thread_to_schedule) {
|
||||||
|
|
|
@ -162,11 +162,17 @@ Thread::~Thread()
|
||||||
void Thread::unblock()
|
void Thread::unblock()
|
||||||
{
|
{
|
||||||
if (current == this) {
|
if (current == this) {
|
||||||
set_state(Thread::Running);
|
if (m_should_die)
|
||||||
|
set_state(Thread::Dying);
|
||||||
|
else
|
||||||
|
set_state(Thread::Running);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
ASSERT(m_state != Thread::Runnable && m_state != Thread::Running);
|
ASSERT(m_state != Thread::Runnable && m_state != Thread::Running);
|
||||||
set_state(Thread::Runnable);
|
if (m_should_die)
|
||||||
|
set_state(Thread::Dying);
|
||||||
|
else
|
||||||
|
set_state(Thread::Runnable);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Thread::set_should_die()
|
void Thread::set_should_die()
|
||||||
|
|
|
@ -65,4 +65,10 @@ void WaitQueue::wake_all()
|
||||||
Scheduler::stop_idling();
|
Scheduler::stop_idling();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void WaitQueue::clear()
|
||||||
|
{
|
||||||
|
InterruptDisabler disabler;
|
||||||
|
m_threads.clear();
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -40,6 +40,7 @@ public:
|
||||||
void enqueue(Thread&);
|
void enqueue(Thread&);
|
||||||
void wake_one(Atomic<bool>* lock = nullptr);
|
void wake_one(Atomic<bool>* lock = nullptr);
|
||||||
void wake_all();
|
void wake_all();
|
||||||
|
void clear();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
typedef IntrusiveList<Thread, &Thread::m_wait_queue_node> ThreadList;
|
typedef IntrusiveList<Thread, &Thread::m_wait_queue_node> ThreadList;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue