LadybirdBrowser/ladybird
1
1
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-12-29 14:14:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

Kernel: Make sure we only log profiling events when m_profiling is true

Browse Source 
Previously the process' m_profiling flag was ignored for all event
types other than CPU samples.

The kfree tracing code relies on temporarily disabling tracing during
exec. This didn't work for per-process profiles and would instead
panic.

This updates the profiling code so that the m_profiling flag isn't
ignored.
This commit is contained in:
Gunnar Beutner 2021-05-23 22:16:30 +02:00 committed by Linus Groh
parent a8ca4751b9
commit 0688e02339
Notes: sideshowbarker 2024-07-18 22:57:59 +09:00 
Author: https://github.com/gunnarbeutner
Commit: https://github.com/SerenityOS/serenity/commit/0688e023394
Pull-request: https://github.com/SerenityOS/serenity/pull/7428
4 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Kernel/PerformanceManager.h
View File

@ -54,18 +54,8 @@ public:
inline static void add_cpu_sample_event(Thread& current_thread, const RegisterState& regs, u32 lost_time) inline static void add_cpu_sample_event(Thread& current_thread, const RegisterState& regs, u32 lost_time)
{ {
PerformanceEventBuffer* perf_events = nullptr; if (auto* event_buffer = current_thread.process().current_perf_events_buffer()) {
[[maybe_unused]] auto rc = event_buffer->append_with_eip_and_ebp(
if (g_profiling_all_threads) {
VERIFY(g_global_perf_events);
perf_events = g_global_perf_events;
} else if (current_thread.process().is_profiling()) {
VERIFY(current_thread.process().perf_events());
perf_events = current_thread.process().perf_events();
}
if (perf_events) {
[[maybe_unused]] auto rc = perf_events->append_with_eip_and_ebp(
current_thread.pid(), current_thread.tid(), current_thread.pid(), current_thread.tid(),
regs.eip, regs.ebp, PERF_EVENT_SAMPLE, lost_time, 0, 0, nullptr); regs.eip, regs.ebp, PERF_EVENT_SAMPLE, lost_time, 0, 0, nullptr);
} }

7
Kernel/Process.h
View File

@ -559,7 +559,12 @@ private:
inline PerformanceEventBuffer* current_perf_events_buffer() inline PerformanceEventBuffer* current_perf_events_buffer()
{ {
return g_profiling_all_threads ? g_global_perf_events : m_perf_event_buffer.ptr(); if (g_profiling_all_threads)
return g_global_perf_events;
else if (m_profiling)
return m_perf_event_buffer.ptr();
else
return nullptr;
} }
Process* m_prev { nullptr }; Process* m_prev { nullptr };

6
Kernel/Syscalls/execve.cpp
View File

@ -506,6 +506,7 @@ KResult Process::do_exec(NonnullRefPtr<FileDescription> main_program_description
Locker ptrace_locker(ptrace_lock()); Locker ptrace_locker(ptrace_lock());
// Disable profiling temporarily in case it's running on this process. // Disable profiling temporarily in case it's running on this process.
auto was_profiling = m_profiling;
TemporaryChange profiling_disabler(m_profiling, false); TemporaryChange profiling_disabler(m_profiling, false);
kill_threads_except_self(); kill_threads_except_self();
@ -645,7 +646,10 @@ KResult Process::do_exec(NonnullRefPtr<FileDescription> main_program_description
tss.cr3 = space().page_directory().cr3(); tss.cr3 = space().page_directory().cr3();
tss.ss2 = pid().value(); tss.ss2 = pid().value();
PerformanceManager::add_process_exec_event(*this); {
TemporaryChange profiling_disabler(m_profiling, was_profiling);
PerformanceManager::add_process_exec_event(*this);
}
{ {
ScopedSpinLock lock(g_scheduler_lock); ScopedSpinLock lock(g_scheduler_lock);

4
Kernel/Syscalls/profiling.cpp
View File

@ -51,12 +51,12 @@ KResultOr<int> 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;
g_profiling_event_mask = event_mask;
process->set_profiling(true);
if (!process->create_perf_events_buffer_if_needed()) if (!process->create_perf_events_buffer_if_needed())
return ENOMEM; return ENOMEM;
if (!TimeManagement::the().enable_profile_timer()) if (!TimeManagement::the().enable_profile_timer())
return ENOTSUP; return ENOTSUP;
g_profiling_event_mask = event_mask;
process->set_profiling(true);
return 0; return 0;
} }