fix(core): Order BUFFER_MAP_STATE lock after QUEUE_PENDING_WRITES

This commit is contained in:
Andy Leiserson committed 2026-04-22 14:36:17 -04:00
1 parent 90dd7435e9
commit 0d32f7e756
2 files changed
+13 -6

No files matched your search

+11 -5
View File
@@ -136,11 +136,6 @@ define_lock_ranks! {
// Uncomment this to see an interesting cycle.
// COMMAND_BUFFER_DATA,
}
rank BUFFER_MAP_STATE "Buffer::map_state" followed by {
QUEUE_PENDING_WRITES,
DEVICE_TRACE,
SHARED_TRACKER_INDEX_ALLOCATOR_INNER,
}
rank DEVICE_FENCE "Device::fence" followed by {
DEVICE_COMMAND_INDICES,
QUEUE_LIFE_TRACKER,
@@ -154,6 +149,10 @@ define_lock_ranks! {
SHARED_TRACKER_INDEX_ALLOCATOR_INNER,
}
rank QUEUE_PENDING_WRITES "Queue::pending_writes" followed by {
BUFFER_MAP_STATE,
DEVICE_TRACKERS,
COMMAND_ALLOCATOR_FREE_ENCODERS,
BUFFER_INITIALIZATION_STATUS,
TEXTURE_INITIALIZATION_STATUS,
SHARED_TRACKER_INDEX_ALLOCATOR_INNER,
}
@@ -164,11 +163,18 @@ define_lock_ranks! {
TEXTURE_CLEAR_MODE,
}
rank QUEUE_LIFE_TRACKER "Queue::life_tracker" followed by {
BUFFER_MAP_STATE,
BUFFER_INITIALIZATION_STATUS,
BUFFER_POOL,
COMMAND_ALLOCATOR_FREE_ENCODERS,
DEVICE_DEFERRED_DESTROY,
DEVICE_TRACE,
SHARED_TRACKER_INDEX_ALLOCATOR_INNER,
}
rank BUFFER_MAP_STATE "Buffer::map_state" followed by {
DEVICE_TRACE,
SHARED_TRACKER_INDEX_ALLOCATOR_INNER,
}
rank COMMAND_ALLOCATOR_FREE_ENCODERS "CommandAllocator::free_encoders" followed by {
SHARED_TRACKER_INDEX_ALLOCATOR_INNER,
}
+2 -1
View File
@@ -887,7 +887,8 @@ impl Buffer {
let device = &self.device;
let snatch_guard = device.snatchable_lock.read();
let raw_buf = self.try_raw(&snatch_guard)?;
match mem::replace(&mut *self.map_state.lock(), BufferMapState::Idle) {
let map_state = mem::replace(&mut *self.map_state.lock(), BufferMapState::Idle);
match map_state {
BufferMapState::Init { staging_buffer } => {
#[cfg(feature = "trace")]
if let Some(ref mut trace) = *device.trace.lock() {