vasilito/RedBear-OS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix deadlock in xhcid detach_device

Browse Source
This commit is contained in:
Jeremy Soller
2024-11-11 12:10:01 -07:00
parent 6044ca0471
commit 191c7973a9
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xhcid/src/xhci/device_enumerator.rs
+2 -1
View File
@@ -103,13 +103,14 @@ impl DeviceEnumerator {
pub fn run(&mut self) {
loop {
trace!("Start Device Enumerator Loop");
info!("Start Device Enumerator Loop");
let request = match self.request_queue.recv() {
Ok(req) => req,
Err(err) => {
panic!("Failed to received an enumeration request! error: {}", err)
}
};
info!("Device Enumerator request for port {}", request.port_number);
let port_array_index = request.port_number - 1;
xhcid/src/xhci/mod.rs
+9 -9
View File
@@ -844,31 +844,31 @@ impl Xhci {
}
pub async fn detach_device(&self, port_number: usize) -> Result<()> {
let port_state = self.port_states.get(&port_number);
let mut driver_process = self.drivers.get(&port_number);
if let Some(state) = port_state {
if let Some(state) = self.port_states.remove(&port_number) {
info!("disabling port slot {} for port {}", state.slot, port_number);
let result = self.disable_port_slot(state.slot).await;
self.port_states.remove(&port_number);
info!("disabled port slot {} for port {} with result: {:?}", state.slot, port_number, result);
//TODO handle killing the child process properly. I'm not sure how
//to get a mutable reference that I can kill.
if let Some(mutex) = driver_process {
if let Some(mutex) = self.drivers.remove(&port_number) {
info!("locking driver process for port {}", port_number);
let mut child = mutex.lock().unwrap();
info!("Killing {:?}", child);
match child.kill() {
Ok(_) => {
info!("Killing {:?}", child)
info!("Killed {:?}", child)
}
Err(_) => {
warn!("Failed to kill the child process!");
}
}
} else {
info!("no driver process for port {}", port_number);
}
self.drivers.remove(&port_number);
result
} else {
warn!(