From ecb385f0885bf6a7a96e7ea8791b22832d6a5cac Mon Sep 17 00:00:00 2001 From: Yiwei Zhang Date: Fri, 24 Oct 2025 00:31:18 -0700 Subject: [PATCH] venus: rename async_wait_mtx to counter_mtx The lock scope will be extended to support semaphore feedback suspend and resume later. So give it a general name. Part-of: --- src/virtio/vulkan/vn_queue.c | 12 ++++++------ src/virtio/vulkan/vn_queue.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/virtio/vulkan/vn_queue.c b/src/virtio/vulkan/vn_queue.c index d3cc0ad0cde..40e2fef7d22 100644 --- a/src/virtio/vulkan/vn_queue.c +++ b/src/virtio/vulkan/vn_queue.c @@ -2044,7 +2044,7 @@ vn_semaphore_feedback_init(struct vn_device *dev, vn_feedback_set_counter(slot, initial_value); simple_mtx_init(&sem->feedback.cmd_mtx, mtx_plain); - simple_mtx_init(&sem->feedback.async_wait_mtx, mtx_plain); + simple_mtx_init(&sem->feedback.counter_mtx, mtx_plain); sem->feedback.signaled_counter = initial_value; sem->feedback.slot = slot; @@ -2067,7 +2067,7 @@ vn_semaphore_feedback_fini(struct vn_device *dev, struct vn_semaphore *sem) vn_semaphore_feedback_cmd_free(dev, sfb_cmd); simple_mtx_destroy(&sem->feedback.cmd_mtx); - simple_mtx_destroy(&sem->feedback.async_wait_mtx); + simple_mtx_destroy(&sem->feedback.counter_mtx); vn_feedback_pool_free(&dev->feedback_pool, sem->feedback.slot); } @@ -2170,7 +2170,7 @@ vn_GetSemaphoreCounterValue(VkDevice device, assert(payload->type == VN_SYNC_TYPE_DEVICE_ONLY); if (sem->feedback.slot) { - simple_mtx_lock(&sem->feedback.async_wait_mtx); + simple_mtx_lock(&sem->feedback.counter_mtx); const uint64_t counter = vn_feedback_get_counter(sem->feedback.slot); if (sem->feedback.signaled_counter < counter) { /* When the timeline semaphore feedback slot gets signaled, the real @@ -2219,7 +2219,7 @@ vn_GetSemaphoreCounterValue(VkDevice device, sem->feedback.signaled_counter = counter; } - simple_mtx_unlock(&sem->feedback.async_wait_mtx); + simple_mtx_unlock(&sem->feedback.counter_mtx); *pValue = counter; return VK_SUCCESS; @@ -2240,7 +2240,7 @@ vn_SignalSemaphore(VkDevice device, const VkSemaphoreSignalInfo *pSignalInfo) vn_async_vkSignalSemaphore(dev->primary_ring, device, pSignalInfo); if (sem->feedback.slot) { - simple_mtx_lock(&sem->feedback.async_wait_mtx); + simple_mtx_lock(&sem->feedback.counter_mtx); vn_feedback_set_counter(sem->feedback.slot, pSignalInfo->value); /* Update async counters. Since we're signaling, we're aligned with @@ -2248,7 +2248,7 @@ vn_SignalSemaphore(VkDevice device, const VkSemaphoreSignalInfo *pSignalInfo) */ sem->feedback.signaled_counter = pSignalInfo->value; - simple_mtx_unlock(&sem->feedback.async_wait_mtx); + simple_mtx_unlock(&sem->feedback.counter_mtx); } return VK_SUCCESS; diff --git a/src/virtio/vulkan/vn_queue.h b/src/virtio/vulkan/vn_queue.h index 7191306b441..ee1a3fbfc1a 100644 --- a/src/virtio/vulkan/vn_queue.h +++ b/src/virtio/vulkan/vn_queue.h @@ -138,7 +138,7 @@ struct vn_semaphore { * the current counter value and signaled_counter to ensure async * wait order across threads. */ - simple_mtx_t async_wait_mtx; + simple_mtx_t counter_mtx; } feedback; bool is_external;