mirrors/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere.git synced 2024-12-23 02:42:09 +00:00
Code Issues Releases Activity

kern: update pinned thread priority rules

Browse source
This commit is contained in:
Michael Scire 2021-04-07 01:18:26 -07:00 committed by SciresM
parent 1b2cf173b3
commit e64fef109c
2 changed files with 43 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libraries/libmesosphere/include/mesosphere/kern_k_thread.hpp
View file

@ -209,6 +209,7 @@ namespace ams::kern {
Result m_wait_result; Result m_wait_result;
Result m_debug_exception_result; Result m_debug_exception_result;
s32 m_base_priority{}; s32 m_base_priority{};
s32 m_base_priority_on_unpin{};
s32 m_physical_ideal_core_id{}; s32 m_physical_ideal_core_id{};
s32 m_virtual_ideal_core_id{}; s32 m_virtual_ideal_core_id{};
s32 m_num_kernel_waiters{}; s32 m_num_kernel_waiters{};
@ -346,6 +347,8 @@ namespace ams::kern {
void StartTermination(); void StartTermination();
void FinishTermination(); void FinishTermination();
void IncreaseBasePriority(s32 priority);
public: public:
constexpr u64 GetThreadId() const { return m_thread_id; } constexpr u64 GetThreadId() const { return m_thread_id; }

42
libraries/libmesosphere/source/kern_k_thread.cpp
View file

@ -19,6 +19,8 @@ namespace ams::kern {
namespace { namespace {
constexpr inline s32 TerminatingThreadPriority = ams::svc::SystemThreadPriorityHighest - 1;
constexpr bool IsKernelAddressKey(KProcessAddress key) { constexpr bool IsKernelAddressKey(KProcessAddress key) {
const uintptr_t key_uptr = GetInteger(key); const uintptr_t key_uptr = GetInteger(key);
return KernelVirtualAddressSpaceBase <= key_uptr && key_uptr <= KernelVirtualAddressSpaceLast; return KernelVirtualAddressSpaceBase <= key_uptr && key_uptr <= KernelVirtualAddressSpaceLast;
@ -426,6 +428,14 @@ namespace ams::kern {
if (active_core != current_core || m_physical_affinity_mask.GetAffinityMask() != m_original_physical_affinity_mask.GetAffinityMask()) { if (active_core != current_core || m_physical_affinity_mask.GetAffinityMask() != m_original_physical_affinity_mask.GetAffinityMask()) {
KScheduler::OnThreadAffinityMaskChanged(this, m_original_physical_affinity_mask, active_core); KScheduler::OnThreadAffinityMaskChanged(this, m_original_physical_affinity_mask, active_core);
} }
/* Set base priority-on-unpin. */
const s32 old_base_priority = m_base_priority;
m_base_priority_on_unpin = old_base_priority;
/* Set base priority to higher than any possible process priority. */
m_base_priority = std::min<s32>(old_base_priority, __builtin_ctzll(this->GetOwnerProcess()->GetPriorityMask()));
RestorePriority(this);
} }
/* Disallow performing thread suspension. */ /* Disallow performing thread suspension. */
@ -476,6 +486,9 @@ namespace ams::kern {
} }
KScheduler::OnThreadAffinityMaskChanged(this, old_mask, active_core); KScheduler::OnThreadAffinityMaskChanged(this, old_mask, active_core);
} }
m_base_priority = m_base_priority_on_unpin;
RestorePriority(this);
} }
/* Allow performing thread suspension (if termination hasn't been requested). */ /* Allow performing thread suspension (if termination hasn't been requested). */
@ -710,13 +723,38 @@ namespace ams::kern {
KScopedSchedulerLock sl; KScopedSchedulerLock sl;
/* Determine the priority value to use. */
const s32 target_priority = m_termination_requested.load() && priority >= TerminatingThreadPriority ? TerminatingThreadPriority : priority;
/* Change our base priority. */ /* Change our base priority. */
m_base_priority = priority; if (this->GetStackParameters().is_pinned) {
m_base_priority_on_unpin = target_priority;
} else {
m_base_priority = target_priority;
}
/* Perform a priority restoration. */ /* Perform a priority restoration. */
RestorePriority(this); RestorePriority(this);
} }
void KThread::IncreaseBasePriority(s32 priority) {
MESOSPHERE_ASSERT_THIS();
MESOSPHERE_ASSERT(ams::svc::HighestThreadPriority <= priority && priority <= ams::svc::LowestThreadPriority);
/* Set our unpin base priority, if we're pinned. */
if (this->GetStackParameters().is_pinned && m_base_priority_on_unpin > priority) {
m_base_priority_on_unpin = priority;
}
/* Set our base priority. */
if (m_base_priority > priority) {
m_base_priority = priority;
/* Perform a priority restoration. */
RestorePriority(this);
}
}
Result KThread::SetPriorityToIdle() { Result KThread::SetPriorityToIdle() {
MESOSPHERE_ASSERT_THIS(); MESOSPHERE_ASSERT_THIS();
@ -1187,7 +1225,7 @@ namespace ams::kern {
/* Change the thread's priority to be higher than any system thread's. */ /* Change the thread's priority to be higher than any system thread's. */
if (this->GetBasePriority() >= ams::svc::SystemThreadPriorityHighest) { if (this->GetBasePriority() >= ams::svc::SystemThreadPriorityHighest) {
this->SetBasePriority(ams::svc::SystemThreadPriorityHighest - 1); this->SetBasePriority(TerminatingThreadPriority);
} }
/* If the thread is runnable, send a termination interrupt to other cores. */ /* If the thread is runnable, send a termination interrupt to other cores. */