From 9bb65cdad40df795c66802ae98569a7e44911ec6 Mon Sep 17 00:00:00 2001 From: metamuffin <42977997+metamuffin@users.noreply.github.com> Date: Mon, 27 Jan 2025 18:01:57 +0100 Subject: [PATCH] Fix deadlock between snatchable_lock and trackers in Queue::write_texture (#7004) * Fix deadlock between snatchable_lock and trackers in Queue::write_texture * Fix another deadlock in write_texture between pending_writes and snatchable_lock. # Conflicts: # CHANGELOG.md --- CHANGELOG.md | 5 +++++ wgpu-core/src/device/queue.rs | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 390c8b72a..9e22dbdc7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -40,6 +40,11 @@ Bottom level categories: ## Unreleased +### v24.0.2 (2025-02-??) + +#### Bug Fixes +- Fix a possible deadlock within `Queue::write_texture`. By @metamuffin in [#7004](https://github.com/gfx-rs/wgpu/pull/7004) + ### v24.0.1 (2025-01-22) #### Bug Fixes diff --git a/wgpu-core/src/device/queue.rs b/wgpu-core/src/device/queue.rs index 763edf212..e23647982 100644 --- a/wgpu-core/src/device/queue.rs +++ b/wgpu-core/src/device/queue.rs @@ -697,6 +697,8 @@ impl Queue { .map_err(TransferError::from)?; } + let snatch_guard = self.device.snatchable_lock.read(); + let mut pending_writes = self.pending_writes.lock(); let encoder = pending_writes.activate(); @@ -732,7 +734,7 @@ impl Queue { &mut trackers.textures, &self.device.alignments, self.device.zero_buffer.as_ref(), - &self.device.snatchable_lock.read(), + &snatch_guard, ) .map_err(QueueWriteError::from)?; } @@ -742,8 +744,6 @@ impl Queue { } } - let snatch_guard = self.device.snatchable_lock.read(); - let dst_raw = dst.try_raw(&snatch_guard)?; let (block_width, block_height) = dst.desc.format.block_dimensions();