From 5dd4373623238c70a90876276c693aeee169a4f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Kr=C3=B6ning?=
 <martin.kroening@eonerc.rwth-aachen.de>
Date: Sun, 20 Oct 2024 18:47:25 +0200
Subject: [PATCH] fix(drivers): put `PCI_DEVICES` into mutex
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Martin Kröning <martin.kroening@eonerc.rwth-aachen.de>
---
 src/arch/aarch64/kernel/pci.rs |  4 +---
 src/arch/x86_64/kernel/pci.rs  |  4 +---
 src/drivers/pci.rs             | 27 ++++++++++++---------------
 3 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/src/arch/aarch64/kernel/pci.rs b/src/arch/aarch64/kernel/pci.rs
index e8f2f981e1..4645babe35 100644
--- a/src/arch/aarch64/kernel/pci.rs
+++ b/src/arch/aarch64/kernel/pci.rs
@@ -339,9 +339,7 @@ pub fn init() {
 								dev.set_irq(pin, line);
 							}
 
-							unsafe {
-								PCI_DEVICES.push(dev);
-							}
+							PCI_DEVICES.lock().push(dev);
 						}
 					}
 				}
diff --git a/src/arch/x86_64/kernel/pci.rs b/src/arch/x86_64/kernel/pci.rs
index 2f44968791..e32fc2c651 100644
--- a/src/arch/x86_64/kernel/pci.rs
+++ b/src/arch/x86_64/kernel/pci.rs
@@ -62,9 +62,7 @@ pub(crate) fn init() {
 
 			let (device_id, vendor_id) = header.id(pci_config);
 			if device_id != u16::MAX && vendor_id != u16::MAX {
-				unsafe {
-					PCI_DEVICES.push(PciDevice::new(pci_address, pci_config));
-				}
+				PCI_DEVICES.lock().push(PciDevice::new(pci_address, pci_config));
 			}
 		}
 	}
diff --git a/src/drivers/pci.rs b/src/drivers/pci.rs
index ed9ff8477d..9b896c1dca 100644
--- a/src/drivers/pci.rs
+++ b/src/drivers/pci.rs
@@ -6,9 +6,9 @@ use core::fmt;
 
 use ahash::RandomState;
 use hashbrown::HashMap;
-use hermit_sync::without_interrupts;
 #[cfg(any(feature = "tcp", feature = "udp", feature = "fuse", feature = "vsock"))]
 use hermit_sync::InterruptTicketMutex;
+use hermit_sync::{without_interrupts, SpinMutex};
 use pci_types::capability::CapabilityIterator;
 use pci_types::{
 	Bar, CommandRegister, ConfigRegionAccess, DeviceId, EndpointHeader, InterruptLine,
@@ -42,7 +42,8 @@ use crate::drivers::vsock::VirtioVsockDriver;
 #[allow(unused_imports)]
 use crate::drivers::{Driver, InterruptHandlerQueue};
 
-pub(crate) static mut PCI_DEVICES: Vec<PciDevice<PciConfigRegion>> = Vec::new();
+pub(crate) static PCI_DEVICES: SpinMutex<Vec<PciDevice<PciConfigRegion>>> =
+	SpinMutex::new(Vec::new());
 static mut PCI_DRIVERS: Vec<PciDriver> = Vec::new();
 
 #[derive(Copy, Clone, Debug)]
@@ -301,7 +302,7 @@ impl<T: ConfigRegionAccess> fmt::Display for PciDevice<T> {
 pub(crate) fn print_information() {
 	infoheader!(" PCI BUS INFORMATION ");
 
-	for adapter in unsafe { PCI_DEVICES.iter() } {
+	for adapter in PCI_DEVICES.lock().iter() {
 		info!("{}", adapter);
 	}
 
@@ -463,12 +464,10 @@ pub(crate) fn get_filesystem_driver() -> Option<&'static InterruptTicketMutex<Vi
 pub(crate) fn init() {
 	// virtio: 4.1.2 PCI Device Discovery
 	without_interrupts(|| {
-		for adapter in unsafe {
-			PCI_DEVICES.iter().filter(|x| {
-				let (vendor_id, device_id) = x.id();
-				vendor_id == 0x1AF4 && (0x1000..=0x107F).contains(&device_id)
-			})
-		} {
+		for adapter in PCI_DEVICES.lock().iter().filter(|x| {
+			let (vendor_id, device_id) = x.id();
+			vendor_id == 0x1AF4 && (0x1000..=0x107F).contains(&device_id)
+		}) {
 			info!(
 				"Found virtio device with device id {:#x}",
 				adapter.device_id()
@@ -498,12 +497,10 @@ pub(crate) fn init() {
 
 		// Searching for Realtek RTL8139, which is supported by Qemu
 		#[cfg(feature = "rtl8139")]
-		for adapter in unsafe {
-			PCI_DEVICES.iter().filter(|x| {
-				let (vendor_id, device_id) = x.id();
-				vendor_id == 0x10ec && (0x8138..=0x8139).contains(&device_id)
-			})
-		} {
+		for adapter in PCI_DEVICES.lock().iter().filter(|x| {
+			let (vendor_id, device_id) = x.id();
+			vendor_id == 0x10ec && (0x8138..=0x8139).contains(&device_id)
+		}) {
 			info!(
 				"Found Realtek network device with device id {:#x}",
 				adapter.device_id()