RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 00:08:11 +00:00
Code Issues Activity Actions

Kernel: Protect the Custody cache with a spinlock

Browse source 
Protecting it with a mutex meant that anyone unref()'ing a Custody
might need to block on said mutex.
This commit is contained in:
Andreas Kling 2022-08-17 20:30:21 +02:00
parent 17de393253
commit cb04caa18e
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Kernel/FileSystem/Custody.cpp
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org> * Copyright (c) 2018-2022, Andreas Kling <kling@serenityos.org>
* *
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
@ -13,16 +13,16 @@
namespace Kernel { namespace Kernel {
static Singleton<MutexProtected<Custody::AllCustodiesList>> s_all_instances; static Singleton<SpinlockProtected<Custody::AllCustodiesList>> s_all_instances;
MutexProtected<Custody::AllCustodiesList>& Custody::all_instances() SpinlockProtected<Custody::AllCustodiesList>& Custody::all_instances()
{ {
return s_all_instances; return s_all_instances;
} }
ErrorOr<NonnullRefPtr<Custody>> Custody::try_create(Custody* parent, StringView name, Inode& inode, int mount_flags) ErrorOr<NonnullRefPtr<Custody>> Custody::try_create(Custody* parent, StringView name, Inode& inode, int mount_flags)
{ {
return all_instances().with_exclusive([&](auto& all_custodies) -> ErrorOr<NonnullRefPtr<Custody>> { return all_instances().with([&](auto& all_custodies) -> ErrorOr<NonnullRefPtr<Custody>> {
for (Custody& custody : all_custodies) { for (Custody& custody : all_custodies) {
if (custody.parent() == parent if (custody.parent() == parent
&& custody.name() == name && custody.name() == name

8
Kernel/FileSystem/Custody.h
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org> * Copyright (c) 2018-2022, Andreas Kling <kling@serenityos.org>
* *
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
@ -12,11 +12,11 @@
#include <Kernel/Forward.h> #include <Kernel/Forward.h>
#include <Kernel/KString.h> #include <Kernel/KString.h>
#include <Kernel/Library/ListedRefCounted.h> #include <Kernel/Library/ListedRefCounted.h>
#include <Kernel/Locking/MutexProtected.h> #include <Kernel/Locking/SpinlockProtected.h>
namespace Kernel { namespace Kernel {
class Custody : public ListedRefCounted<Custody, LockType::Mutex> { class Custody : public ListedRefCounted<Custody, LockType::Spinlock> {
public: public:
static ErrorOr<NonnullRefPtr<Custody>> try_create(Custody* parent, StringView name, Inode&, int mount_flags); static ErrorOr<NonnullRefPtr<Custody>> try_create(Custody* parent, StringView name, Inode&, int mount_flags);
@ -44,7 +44,7 @@ private:
public: public:
using AllCustodiesList = IntrusiveList<&Custody::m_all_custodies_list_node>; using AllCustodiesList = IntrusiveList<&Custody::m_all_custodies_list_node>;
static MutexProtected<Custody::AllCustodiesList>& all_instances(); static SpinlockProtected<Custody::AllCustodiesList>& all_instances();
}; };
} }