1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-22 15:55:07 +00:00

Kernel: Migrate process list locking to ProtectedValue

The existing recursive spinlock is repurposed for profiling only, as it
was shared with the process list.
This commit is contained in:
Jean-Baptiste Boric 2021-07-24 18:43:29 +02:00 committed by Andreas Kling
parent 8554b66d09
commit 08891e82a5
5 changed files with 76 additions and 86 deletions

View file

@ -43,9 +43,9 @@ namespace Kernel {
static void create_signal_trampoline(); static void create_signal_trampoline();
RecursiveSpinLock g_processes_lock; RecursiveSpinLock g_profiling_lock;
static Atomic<pid_t> next_pid; static Atomic<pid_t> next_pid;
static AK::Singleton<Process::List> s_processes; static AK::Singleton<ProtectedValue<Process::List>> s_processes;
READONLY_AFTER_INIT HashMap<String, OwnPtr<Module>>* g_modules; READONLY_AFTER_INIT HashMap<String, OwnPtr<Module>>* g_modules;
READONLY_AFTER_INIT Memory::Region* g_signal_trampoline_region; READONLY_AFTER_INIT Memory::Region* g_signal_trampoline_region;
@ -56,7 +56,7 @@ ProtectedValue<String>& hostname()
return *s_hostname; return *s_hostname;
} }
Process::List& processes() ProtectedValue<Process::List>& processes()
{ {
return *s_processes; return *s_processes;
} }
@ -88,20 +88,22 @@ UNMAP_AFTER_INIT void Process::initialize()
Vector<ProcessID> Process::all_pids() Vector<ProcessID> Process::all_pids()
{ {
Vector<ProcessID> pids; Vector<ProcessID> pids;
ScopedSpinLock lock(g_processes_lock); processes().with_shared([&](const auto& list) {
pids.ensure_capacity(processes().size_slow()); pids.ensure_capacity(list.size_slow());
for (auto& process : processes()) for (const auto& process : list)
pids.append(process.pid()); pids.append(process.pid());
});
return pids; return pids;
} }
NonnullRefPtrVector<Process> Process::all_processes() NonnullRefPtrVector<Process> Process::all_processes()
{ {
NonnullRefPtrVector<Process> output; NonnullRefPtrVector<Process> output;
ScopedSpinLock lock(g_processes_lock); processes().with_shared([&](const auto& list) {
output.ensure_capacity(processes().size_slow()); output.ensure_capacity(list.size_slow());
for (auto& process : processes()) for (const auto& process : list)
output.append(NonnullRefPtr<Process>(process)); output.append(NonnullRefPtr<Process>(process));
});
return output; return output;
} }
@ -149,10 +151,9 @@ void Process::register_new(Process& process)
{ {
// Note: this is essentially the same like process->ref() // Note: this is essentially the same like process->ref()
RefPtr<Process> new_process = process; RefPtr<Process> new_process = process;
{ processes().with_exclusive([&](auto& list) {
ScopedSpinLock lock(g_processes_lock); list.prepend(process);
processes().prepend(process); });
}
ProcFSComponentRegistry::the().register_new_process(process); ProcFSComponentRegistry::the().register_new_process(process);
} }
@ -162,14 +163,10 @@ RefPtr<Process> Process::create_user_process(RefPtr<Thread>& first_thread, const
if (arguments.is_empty()) { if (arguments.is_empty()) {
arguments.append(parts.last()); arguments.append(parts.last());
} }
RefPtr<Custody> cwd;
{
ScopedSpinLock lock(g_processes_lock);
if (auto parent = Process::from_pid(parent_pid)) {
cwd = parent->m_cwd;
}
}
RefPtr<Custody> cwd;
if (auto parent = Process::from_pid(parent_pid))
cwd = parent->m_cwd;
if (!cwd) if (!cwd)
cwd = VirtualFileSystem::the().root_custody(); cwd = VirtualFileSystem::the().root_custody();
@ -308,11 +305,10 @@ Process::~Process()
PerformanceManager::add_process_exit_event(*this); PerformanceManager::add_process_exit_event(*this);
{
ScopedSpinLock processes_lock(g_processes_lock);
if (m_list_node.is_in_list()) if (m_list_node.is_in_list())
processes().remove(*this); processes().with_exclusive([&](auto& list) {
} list.remove(*this);
});
} }
// Make sure the compiler doesn't "optimize away" this function: // Make sure the compiler doesn't "optimize away" this function:
@ -417,13 +413,13 @@ void Process::crash(int signal, FlatPtr ip, bool out_of_memory)
RefPtr<Process> Process::from_pid(ProcessID pid) RefPtr<Process> Process::from_pid(ProcessID pid)
{ {
ScopedSpinLock lock(g_processes_lock); return processes().with_shared([&](const auto& list) -> RefPtr<Process> {
for (auto& process : processes()) { for (auto& process : list) {
process.pid();
if (process.pid() == pid) if (process.pid() == pid)
return &process; return &process;
} }
return {}; return {};
});
} }
const Process::FileDescriptionAndFlags& Process::FileDescriptions::at(size_t i) const const Process::FileDescriptionAndFlags& Process::FileDescriptions::at(size_t i) const
@ -637,15 +633,12 @@ void Process::finalize()
} }
} }
{
ScopedSpinLock processses_lock(g_processes_lock);
if (!!ppid()) { if (!!ppid()) {
if (auto parent = Process::from_pid(ppid())) { if (auto parent = Process::from_pid(ppid())) {
parent->m_ticks_in_user_for_dead_children += m_ticks_in_user + m_ticks_in_user_for_dead_children; parent->m_ticks_in_user_for_dead_children += m_ticks_in_user + m_ticks_in_user_for_dead_children;
parent->m_ticks_in_kernel_for_dead_children += m_ticks_in_kernel + m_ticks_in_kernel_for_dead_children; parent->m_ticks_in_kernel_for_dead_children += m_ticks_in_kernel + m_ticks_in_kernel_for_dead_children;
} }
} }
}
unblock_waiters(Thread::WaitBlocker::UnblockFlags::Terminated); unblock_waiters(Thread::WaitBlocker::UnblockFlags::Terminated);
@ -692,9 +685,8 @@ void Process::die()
m_threads_for_coredump.append(thread); m_threads_for_coredump.append(thread);
}); });
{ processes().with_shared([&](const auto& list) {
ScopedSpinLock lock(g_processes_lock); for (auto it = list.begin(); it != list.end();) {
for (auto it = processes().begin(); it != processes().end();) {
auto& process = *it; auto& process = *it;
++it; ++it;
if (process.has_tracee_thread(pid())) { if (process.has_tracee_thread(pid())) {
@ -705,7 +697,7 @@ void Process::die()
dbgln("Failed to send the SIGSTOP signal to {} ({})", process.name(), process.pid()); dbgln("Failed to send the SIGSTOP signal to {} ({})", process.name(), process.pid());
} }
} }
} });
kill_all_threads(); kill_all_threads();
#ifdef ENABLE_KERNEL_COVERAGE_COLLECTION #ifdef ENABLE_KERNEL_COVERAGE_COLLECTION

View file

@ -9,6 +9,7 @@
#include <AK/Concepts.h> #include <AK/Concepts.h>
#include <AK/HashMap.h> #include <AK/HashMap.h>
#include <AK/IntrusiveList.h> #include <AK/IntrusiveList.h>
#include <AK/IntrusiveListRelaxedConst.h>
#include <AK/NonnullRefPtrVector.h> #include <AK/NonnullRefPtrVector.h>
#include <AK/String.h> #include <AK/String.h>
#include <AK/Userspace.h> #include <AK/Userspace.h>
@ -580,7 +581,7 @@ private:
return nullptr; return nullptr;
} }
IntrusiveListNode<Process> m_list_node; mutable IntrusiveListNode<Process> m_list_node;
String m_name; String m_name;
@ -777,32 +778,33 @@ private:
NonnullRefPtrVector<Thread> m_threads_for_coredump; NonnullRefPtrVector<Thread> m_threads_for_coredump;
public: public:
using List = IntrusiveList<Process, RawPtr<Process>, &Process::m_list_node>; using List = IntrusiveListRelaxedConst<Process, RawPtr<Process>, &Process::m_list_node>;
}; };
Process::List& processes(); extern RecursiveSpinLock g_profiling_lock;
extern RecursiveSpinLock g_processes_lock;
ProtectedValue<Process::List>& processes();
template<IteratorFunction<Process&> Callback> template<IteratorFunction<Process&> Callback>
inline void Process::for_each(Callback callback) inline void Process::for_each(Callback callback)
{ {
VERIFY_INTERRUPTS_DISABLED(); VERIFY_INTERRUPTS_DISABLED();
ScopedSpinLock lock(g_processes_lock); processes().with_shared([&](const auto& list) {
for (auto it = processes().begin(); it != processes().end();) { for (auto it = list.begin(); it != list.end();) {
auto& process = *it; auto& process = *it;
++it; ++it;
if (callback(process) == IterationDecision::Break) if (callback(process) == IterationDecision::Break)
break; break;
} }
});
} }
template<IteratorFunction<Process&> Callback> template<IteratorFunction<Process&> Callback>
inline void Process::for_each_child(Callback callback) inline void Process::for_each_child(Callback callback)
{ {
VERIFY_INTERRUPTS_DISABLED();
ProcessID my_pid = pid(); ProcessID my_pid = pid();
ScopedSpinLock lock(g_processes_lock); processes().with_shared([&](const auto& list) {
for (auto it = processes().begin(); it != processes().end();) { for (auto it = list.begin(); it != list.end();) {
auto& process = *it; auto& process = *it;
++it; ++it;
if (process.ppid() == my_pid || process.has_tracee_thread(pid())) { if (process.ppid() == my_pid || process.has_tracee_thread(pid())) {
@ -810,6 +812,7 @@ inline void Process::for_each_child(Callback callback)
break; break;
} }
} }
});
} }
template<IteratorFunction<Thread&> Callback> template<IteratorFunction<Thread&> Callback>
@ -839,9 +842,8 @@ inline IterationDecision Process::for_each_thread(Callback callback)
template<IteratorFunction<Process&> Callback> template<IteratorFunction<Process&> Callback>
inline void Process::for_each_in_pgrp(ProcessGroupID pgid, Callback callback) inline void Process::for_each_in_pgrp(ProcessGroupID pgid, Callback callback)
{ {
VERIFY_INTERRUPTS_DISABLED(); processes().with_shared([&](const auto& list) {
ScopedSpinLock lock(g_processes_lock); for (auto it = list.begin(); it != list.end();) {
for (auto it = processes().begin(); it != processes().end();) {
auto& process = *it; auto& process = *it;
++it; ++it;
if (!process.is_dead() && process.pgid() == pgid) { if (!process.is_dead() && process.pgid() == pgid) {
@ -849,6 +851,7 @@ inline void Process::for_each_in_pgrp(ProcessGroupID pgid, Callback callback)
break; break;
} }
} }
});
} }
template<VoidFunction<Process&> Callback> template<VoidFunction<Process&> Callback>

View file

@ -65,8 +65,7 @@ KResult Process::do_killall(int signal)
KResult error = KSuccess; KResult error = KSuccess;
// Send the signal to all processes we have access to for. // Send the signal to all processes we have access to for.
ScopedSpinLock lock(g_processes_lock); processes().for_each_shared([&](auto& process) {
for (auto& process : processes()) {
KResult res = KSuccess; KResult res = KSuccess;
if (process.pid() == pid()) if (process.pid() == pid())
res = do_killself(signal); res = do_killself(signal);
@ -77,7 +76,7 @@ KResult Process::do_killall(int signal)
any_succeeded = true; any_succeeded = true;
else else
error = res; error = res;
} });
if (any_succeeded) if (any_succeeded)
return KSuccess; return KSuccess;
@ -117,7 +116,6 @@ KResultOr<FlatPtr> Process::sys$kill(pid_t pid_or_pgid, int signal)
return do_killself(signal); return do_killself(signal);
} }
VERIFY(pid_or_pgid >= 0); VERIFY(pid_or_pgid >= 0);
ScopedSpinLock lock(g_processes_lock);
auto peer = Process::from_pid(pid_or_pgid); auto peer = Process::from_pid(pid_or_pgid);
if (!peer) if (!peer)
return ESRCH; return ESRCH;

View file

@ -31,7 +31,7 @@ KResultOr<FlatPtr> Process::sys$profiling_enable(pid_t pid, u64 event_mask)
else else
g_global_perf_events = PerformanceEventBuffer::try_create_with_size(32 * MiB).leak_ptr(); g_global_perf_events = PerformanceEventBuffer::try_create_with_size(32 * MiB).leak_ptr();
ScopedSpinLock lock(g_processes_lock); ScopedSpinLock lock(g_profiling_lock);
if (!TimeManagement::the().enable_profile_timer()) if (!TimeManagement::the().enable_profile_timer())
return ENOTSUP; return ENOTSUP;
g_profiling_all_threads = true; g_profiling_all_threads = true;
@ -44,7 +44,6 @@ KResultOr<FlatPtr> Process::sys$profiling_enable(pid_t pid, u64 event_mask)
return 0; return 0;
} }
ScopedSpinLock lock(g_processes_lock);
auto process = Process::from_pid(pid); auto process = Process::from_pid(pid);
if (!process) if (!process)
return ESRCH; return ESRCH;
@ -52,6 +51,7 @@ KResultOr<FlatPtr> Process::sys$profiling_enable(pid_t pid, u64 event_mask)
return ESRCH; return ESRCH;
if (!is_superuser() && process->uid() != euid()) if (!is_superuser() && process->uid() != euid())
return EPERM; return EPERM;
ScopedSpinLock lock(g_profiling_lock);
g_profiling_event_mask = PERF_EVENT_PROCESS_CREATE | PERF_EVENT_THREAD_CREATE | PERF_EVENT_MMAP; g_profiling_event_mask = PERF_EVENT_PROCESS_CREATE | PERF_EVENT_THREAD_CREATE | PERF_EVENT_MMAP;
process->set_profiling(true); process->set_profiling(true);
if (!process->create_perf_events_buffer_if_needed()) { if (!process->create_perf_events_buffer_if_needed()) {
@ -81,12 +81,12 @@ KResultOr<FlatPtr> Process::sys$profiling_disable(pid_t pid)
return 0; return 0;
} }
ScopedSpinLock lock(g_processes_lock);
auto process = Process::from_pid(pid); auto process = Process::from_pid(pid);
if (!process) if (!process)
return ESRCH; return ESRCH;
if (!is_superuser() && process->uid() != euid()) if (!is_superuser() && process->uid() != euid())
return EPERM; return EPERM;
ScopedSpinLock lock(g_profiling_lock);
if (!process->is_profiling()) if (!process->is_profiling())
return EINVAL; return EINVAL;
// FIXME: If we enabled the profile timer and it's not supported, how do we disable it now? // FIXME: If we enabled the profile timer and it's not supported, how do we disable it now?
@ -117,12 +117,12 @@ KResultOr<FlatPtr> Process::sys$profiling_free_buffer(pid_t pid)
return 0; return 0;
} }
ScopedSpinLock lock(g_processes_lock);
auto process = Process::from_pid(pid); auto process = Process::from_pid(pid);
if (!process) if (!process)
return ESRCH; return ESRCH;
if (!is_superuser() && process->uid() != euid()) if (!is_superuser() && process->uid() != euid())
return EPERM; return EPERM;
ScopedSpinLock lock(g_profiling_lock);
if (process->is_profiling()) if (process->is_profiling())
return EINVAL; return EINVAL;
process->delete_perf_events_buffer(); process->delete_perf_events_buffer();

View file

@ -16,7 +16,6 @@ KResultOr<FlatPtr> Process::sys$getsid(pid_t pid)
REQUIRE_PROMISE(proc); REQUIRE_PROMISE(proc);
if (pid == 0) if (pid == 0)
return sid().value(); return sid().value();
ScopedSpinLock lock(g_processes_lock);
auto process = Process::from_pid(pid); auto process = Process::from_pid(pid);
if (!process) if (!process)
return ESRCH; return ESRCH;
@ -51,7 +50,6 @@ KResultOr<FlatPtr> Process::sys$getpgid(pid_t pid)
REQUIRE_PROMISE(proc); REQUIRE_PROMISE(proc);
if (pid == 0) if (pid == 0)
return pgid().value(); return pgid().value();
ScopedSpinLock lock(g_processes_lock); // FIXME: Use a ProcessHandle
auto process = Process::from_pid(pid); auto process = Process::from_pid(pid);
if (!process) if (!process)
return ESRCH; return ESRCH;
@ -68,7 +66,6 @@ KResultOr<FlatPtr> Process::sys$getpgrp()
SessionID Process::get_sid_from_pgid(ProcessGroupID pgid) SessionID Process::get_sid_from_pgid(ProcessGroupID pgid)
{ {
// FIXME: This xor sys$setsid() uses the wrong locking mechanism. // FIXME: This xor sys$setsid() uses the wrong locking mechanism.
ScopedSpinLock lock(g_processes_lock);
SessionID sid { -1 }; SessionID sid { -1 };
Process::for_each_in_pgrp(pgid, [&](auto& process) { Process::for_each_in_pgrp(pgid, [&](auto& process) {
@ -83,7 +80,7 @@ KResultOr<FlatPtr> Process::sys$setpgid(pid_t specified_pid, pid_t specified_pgi
{ {
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this) VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this)
REQUIRE_PROMISE(proc); REQUIRE_PROMISE(proc);
ScopedSpinLock lock(g_processes_lock); // FIXME: Use a ProcessHandle // FIXME: Use a ProcessHandle
ProcessID pid = specified_pid ? ProcessID(specified_pid) : this->pid(); ProcessID pid = specified_pid ? ProcessID(specified_pid) : this->pid();
if (specified_pgid < 0) { if (specified_pgid < 0) {
// The value of the pgid argument is less than 0, or is not a value supported by the implementation. // The value of the pgid argument is less than 0, or is not a value supported by the implementation.