0ct0pu5/ladybird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Kernel: Fix some crashes due to missing locks

Browse source 
We need to hold m_lock when accessing m_regions.
This commit is contained in:
Tom 2020-08-01 14:41:54 -06:00 • committed by Andreas Kling
parent 728de56481
commit 5bbf6ed46b
Notes: sideshowbarker 2024-07-19 04:23:38 +09:00
2 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Kernel/Process.cpp
View file

@ -664,7 +664,10 @@ void Process::finalize()
}
}
m_regions.clear();
{
ScopedSpinLock lock(m_lock);
m_regions.clear();
}
m_dead = true;
}
@ -686,6 +689,7 @@ size_t Process::amount_dirty_private() const
// The main issue I'm thinking of is when the VMObject has physical pages that none of the Regions are mapping.
// That's probably a situation that needs to be looked at in general.
size_t amount = 0;
ScopedSpinLock lock(m_lock);
for (auto& region : m_regions) {
if (!region.is_shared())
amount += region.amount_dirty();
@ -696,9 +700,12 @@ size_t Process::amount_dirty_private() const
size_t Process::amount_clean_inode() const
{
HashTable<const InodeVMObject*> vmobjects;
for (auto& region : m_regions) {
if (region.vmobject().is_inode())
vmobjects.set(&static_cast<const InodeVMObject&>(region.vmobject()));
{
ScopedSpinLock lock(m_lock);
for (auto& region : m_regions) {
if (region.vmobject().is_inode())
vmobjects.set(&static_cast<const InodeVMObject&>(region.vmobject()));
}
}
size_t amount = 0;
for (auto& vmobject : vmobjects)
@ -709,6 +716,7 @@ size_t Process::amount_clean_inode() const
size_t Process::amount_virtual() const
{
size_t amount = 0;
ScopedSpinLock lock(m_lock);
for (auto& region : m_regions) {
amount += region.size();
}
@ -719,6 +727,7 @@ size_t Process::amount_resident() const
{
// FIXME: This will double count if multiple regions use the same physical page.
size_t amount = 0;
ScopedSpinLock lock(m_lock);
for (auto& region : m_regions) {
amount += region.amount_resident();
}
@ -732,6 +741,7 @@ size_t Process::amount_shared() const
// and each PhysicalPage is only reffed by its VMObject. This needs to be refactored
// so that every Region contributes +1 ref to each of its PhysicalPages.
size_t amount = 0;
ScopedSpinLock lock(m_lock);
for (auto& region : m_regions) {
amount += region.amount_shared();
}
@ -741,6 +751,7 @@ size_t Process::amount_shared() const
size_t Process::amount_purgeable_volatile() const
{
size_t amount = 0;
ScopedSpinLock lock(m_lock);
for (auto& region : m_regions) {
if (region.vmobject().is_purgeable() && static_cast<const PurgeableVMObject&>(region.vmobject()).is_volatile())
amount += region.amount_resident();
@ -751,6 +762,7 @@ size_t Process::amount_purgeable_volatile() const
size_t Process::amount_purgeable_nonvolatile() const
{
size_t amount = 0;
ScopedSpinLock lock(m_lock);
for (auto& region : m_regions) {
if (region.vmobject().is_purgeable() && !static_cast<const PurgeableVMObject&>(region.vmobject()).is_volatile())
amount += region.amount_resident();

2
Kernel/Process.h
View file

@ -680,7 +680,7 @@ private:
size_t m_master_tls_alignment { 0 };
Lock m_big_lock { "Process" };
SpinLock<u32> m_lock;
mutable SpinLock<u32> m_lock;
u64 m_alarm_deadline { 0 };