summaryrefslogtreecommitdiff
path: root/Kernel/Net
diff options
context:
space:
mode:
authorLiav A <liavalb@gmail.com>2022-02-04 19:48:13 +0200
committerAndreas Kling <kling@serenityos.org>2022-03-14 22:39:09 +0100
commit3fb289e27d3e0ca171438f178ea6750e25ce6f32 (patch)
tree627a284bebe455e85029a6f99ae03f21b1e36a01 /Kernel/Net
parentc0ed656c94ffa11e1949ed2e4cc68469aa0d0cd0 (diff)
downloadserenity-3fb289e27d3e0ca171438f178ea6750e25ce6f32.zip
Kernel/PCI: Don't hold spinlocks when doing fast device enumeration
Instead, hold the lock while we copy the contents to a stack-based Vector then iterate on it without any locking. Because we rely on heap allocations, we need to propagate errors back in case of OOM condition, therefore, both PCI::enumerate API function and PCI::Access::add_host_controller_and_enumerate_attached_devices use now a ErrorOr<void> return value to propagate errors. OOM Error can only occur when enumerating the m_device_identifiers vector under a spinlock and trying to expand the temporary Vector which will be used locklessly to actually iterate over the PCI::DeviceIdentifiers objects.
Diffstat (limited to 'Kernel/Net')
-rw-r--r--Kernel/Net/NetworkingManagement.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Kernel/Net/NetworkingManagement.cpp b/Kernel/Net/NetworkingManagement.cpp
index cf83c31dc3..510fa10492 100644
--- a/Kernel/Net/NetworkingManagement.cpp
+++ b/Kernel/Net/NetworkingManagement.cpp
@@ -112,13 +112,13 @@ UNMAP_AFTER_INIT RefPtr<NetworkAdapter> NetworkingManagement::determine_network_
bool NetworkingManagement::initialize()
{
if (!kernel_command_line().is_physical_networking_disabled() && !PCI::Access::is_disabled()) {
- PCI::enumerate([&](PCI::DeviceIdentifier const& device_identifier) {
+ MUST(PCI::enumerate([&](PCI::DeviceIdentifier const& device_identifier) {
// Note: PCI class 2 is the class of Network devices
if (device_identifier.class_code().value() != 0x02)
return;
if (auto adapter = determine_network_device(device_identifier); !adapter.is_null())
m_adapters.with([&](auto& adapters) { adapters.append(adapter.release_nonnull()); });
- });
+ }));
}
auto loopback = LoopbackAdapter::try_create();
VERIFY(loopback);