mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-05-04 18:23:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Kernel: Protect network adapter list with spinlock instead of mutex

Browse source
This commit is contained in:
Andreas Kling 2022-02-03 01:33:19 +01:00
parent 0899153170
commit 3becff9eae
Notes: sideshowbarker 2024-07-18 03:20:18 +09:00
2 changed files with 23 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

41
Kernel/Net/NetworkingManagement.cpp
View file

@ -45,33 +45,35 @@ NonnullRefPtr<NetworkAdapter> NetworkingManagement::loopback_adapter() const
void NetworkingManagement::for_each(Function<void(NetworkAdapter&)> callback) void NetworkingManagement::for_each(Function<void(NetworkAdapter&)> callback)
{ {
MutexLocker locker(m_lock); m_adapters.for_each([&](auto& adapter) {
for (auto& it : m_adapters) callback(adapter);
callback(it); });
} }
RefPtr<NetworkAdapter> NetworkingManagement::from_ipv4_address(const IPv4Address& address) const RefPtr<NetworkAdapter> NetworkingManagement::from_ipv4_address(IPv4Address const& address) const
{ {
MutexLocker locker(m_lock);
for (auto& adapter : m_adapters) {
if (adapter.ipv4_address() == address || adapter.ipv4_broadcast() == address)
return adapter;
}
if (address[0] == 0 && address[1] == 0 && address[2] == 0 && address[3] == 0) if (address[0] == 0 && address[1] == 0 && address[2] == 0 && address[3] == 0)
return m_loopback_adapter; return m_loopback_adapter;
if (address[0] == 127) if (address[0] == 127)
return m_loopback_adapter; return m_loopback_adapter;
return {}; return m_adapters.with([&](auto& adapters) -> RefPtr<NetworkAdapter> {
for (auto& adapter : adapters) {
if (adapter.ipv4_address() == address || adapter.ipv4_broadcast() == address)
return adapter;
}
return nullptr;
});
} }
RefPtr<NetworkAdapter> NetworkingManagement::lookup_by_name(StringView name) const RefPtr<NetworkAdapter> NetworkingManagement::lookup_by_name(StringView name) const
{ {
MutexLocker locker(m_lock); return m_adapters.with([&](auto& adapters) -> RefPtr<NetworkAdapter> {
RefPtr<NetworkAdapter> found_adapter; for (auto& adapter : adapters) {
for (auto& it : m_adapters) { if (adapter.name() == name)
if (it.name() == name) return adapter;
found_adapter = it; }
} return nullptr;
return found_adapter; });
} }
ErrorOr<NonnullOwnPtr<KString>> NetworkingManagement::generate_interface_name_from_pci_address(PCI::DeviceIdentifier const& device_identifier) ErrorOr<NonnullOwnPtr<KString>> NetworkingManagement::generate_interface_name_from_pci_address(PCI::DeviceIdentifier const& device_identifier)
@ -106,14 +108,13 @@ bool NetworkingManagement::initialize()
if (device_identifier.class_code().value() != 0x02) if (device_identifier.class_code().value() != 0x02)
return; return;
if (auto adapter = determine_network_device(device_identifier); !adapter.is_null()) if (auto adapter = determine_network_device(device_identifier); !adapter.is_null())
m_adapters.append(adapter.release_nonnull()); m_adapters.with([&](auto& adapters) { adapters.append(adapter.release_nonnull()); });
}); });
} }
auto loopback = LoopbackAdapter::try_create(); auto loopback = LoopbackAdapter::try_create();
VERIFY(loopback); VERIFY(loopback);
m_adapters.append(*loopback); m_adapters.with([&](auto& adapters) { adapters.append(*loopback); });
m_loopback_adapter = loopback; m_loopback_adapter = loopback;
return true; return true;
} }
} }

5
Kernel/Net/NetworkingManagement.h
View file

@ -12,7 +12,7 @@
#include <AK/NonnullRefPtrVector.h> #include <AK/NonnullRefPtrVector.h>
#include <AK/Types.h> #include <AK/Types.h>
#include <Kernel/Bus/PCI/Definitions.h> #include <Kernel/Bus/PCI/Definitions.h>
#include <Kernel/Locking/Mutex.h> #include <Kernel/Locking/SpinlockProtected.h>
#include <Kernel/Memory/Region.h> #include <Kernel/Memory/Region.h>
namespace Kernel { namespace Kernel {
@ -40,9 +40,8 @@ public:
private: private:
RefPtr<NetworkAdapter> determine_network_device(PCI::DeviceIdentifier const&) const; RefPtr<NetworkAdapter> determine_network_device(PCI::DeviceIdentifier const&) const;
NonnullRefPtrVector<NetworkAdapter> m_adapters; SpinlockProtected<NonnullRefPtrVector<NetworkAdapter>> m_adapters;
RefPtr<NetworkAdapter> m_loopback_adapter; RefPtr<NetworkAdapter> m_loopback_adapter;
mutable Mutex m_lock { "Networking" };
}; };
} }