RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 02:17:34 +00:00
Code Issues Activity Actions

Kernel: Protect global device map with spinlock instead of mutx

Browse source
This commit is contained in:
Andreas Kling 2022-02-03 01:41:01 +01:00
parent e0d9472ced
commit ddde9e7ee5
3 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Kernel/Devices/Device.h
View file

@ -23,7 +23,6 @@
#include <Kernel/FileSystem/DeviceFileTypes.h> #include <Kernel/FileSystem/DeviceFileTypes.h>
#include <Kernel/FileSystem/File.h> #include <Kernel/FileSystem/File.h>
#include <Kernel/FileSystem/SysFS.h> #include <Kernel/FileSystem/SysFS.h>
#include <Kernel/Locking/Mutex.h>
#include <Kernel/UnixTypes.h> #include <Kernel/UnixTypes.h>
namespace Kernel { namespace Kernel {

8
Kernel/Devices/DeviceManagement.cpp
View file

@ -49,7 +49,7 @@ DeviceManagement& DeviceManagement::the()
Device* DeviceManagement::get_device(MajorNumber major, MinorNumber minor) Device* DeviceManagement::get_device(MajorNumber major, MinorNumber minor)
{ {
return m_devices.with_exclusive([&](auto& map) -> Device* { return m_devices.with([&](auto& map) -> Device* {
auto it = map.find(encoded_device(major.value(), minor.value())); auto it = map.find(encoded_device(major.value(), minor.value()));
if (it == map.end()) if (it == map.end())
return nullptr; return nullptr;
@ -68,7 +68,7 @@ Optional<DeviceEvent> DeviceManagement::dequeue_top_device_event(Badge<DeviceCon
void DeviceManagement::before_device_removal(Badge<Device>, Device& device) void DeviceManagement::before_device_removal(Badge<Device>, Device& device)
{ {
u64 device_id = encoded_device(device.major(), device.minor()); u64 device_id = encoded_device(device.major(), device.minor());
m_devices.with_exclusive([&](auto& map) -> void { m_devices.with([&](auto& map) -> void {
VERIFY(map.contains(device_id)); VERIFY(map.contains(device_id));
map.remove(encoded_device(device.major(), device.minor())); map.remove(encoded_device(device.major(), device.minor()));
}); });
@ -85,7 +85,7 @@ void DeviceManagement::before_device_removal(Badge<Device>, Device& device)
void DeviceManagement::after_inserting_device(Badge<Device>, Device& device) void DeviceManagement::after_inserting_device(Badge<Device>, Device& device)
{ {
u64 device_id = encoded_device(device.major(), device.minor()); u64 device_id = encoded_device(device.major(), device.minor());
m_devices.with_exclusive([&](auto& map) -> void { m_devices.with([&](auto& map) -> void {
if (map.contains(device_id)) { if (map.contains(device_id)) {
dbgln("Already registered {},{}: {}", device.major(), device.minor(), device.class_name()); dbgln("Already registered {},{}: {}", device.major(), device.minor(), device.class_name());
VERIFY_NOT_REACHED(); VERIFY_NOT_REACHED();
@ -108,7 +108,7 @@ void DeviceManagement::after_inserting_device(Badge<Device>, Device& device)
void DeviceManagement::for_each(Function<void(Device&)> callback) void DeviceManagement::for_each(Function<void(Device&)> callback)
{ {
m_devices.with_exclusive([&](auto& map) -> void { m_devices.with([&](auto& map) -> void {
for (auto& entry : map) for (auto& entry : map)
callback(*entry.value); callback(*entry.value);
}); });

2
Kernel/Devices/DeviceManagement.h
View file

@ -77,7 +77,7 @@ private:
RefPtr<DeviceControlDevice> m_device_control_device; RefPtr<DeviceControlDevice> m_device_control_device;
// FIXME: Once we have a singleton for managing many sound cards, remove this from here // FIXME: Once we have a singleton for managing many sound cards, remove this from here
NonnullRefPtrVector<CharacterDevice, 1> m_audio_devices; NonnullRefPtrVector<CharacterDevice, 1> m_audio_devices;
MutexProtected<HashMap<u64, Device*>> m_devices; SpinlockProtected<HashMap<u64, Device*>> m_devices;
mutable Spinlock m_event_queue_lock; mutable Spinlock m_event_queue_lock;
CircularQueue<DeviceEvent, 100> m_event_queue; CircularQueue<DeviceEvent, 100> m_event_queue;