[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 15/22] migration: use bitmap_mutex in migration_bitma
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[Qemu-devel] [PULL 15/22] migration: use bitmap_mutex in migration_bitmap_clear_dirty |
Date: |
Wed, 6 Mar 2019 11:42:20 +0000 |
From: Wei Wang <address@hidden>
The bitmap mutex is used to synchronize threads to update the dirty
bitmap and the migration_dirty_pages counter. For example, the free
page optimization clears bits of free pages from the bitmap in an
iothread context. This patch makes migration_bitmap_clear_dirty update
the bitmap and counter under the mutex.
Signed-off-by: Wei Wang <address@hidden>
CC: Dr. David Alan Gilbert <address@hidden>
CC: Juan Quintela <address@hidden>
CC: Michael S. Tsirkin <address@hidden>
CC: Peter Xu <address@hidden>
Reviewed-by: Peter Xu <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
---
migration/ram.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/migration/ram.c b/migration/ram.c
index 01315edd66..0747873ca9 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -342,7 +342,7 @@ struct RAMState {
uint64_t target_page_count;
/* number of dirty bits in the bitmap */
uint64_t migration_dirty_pages;
- /* protects modification of the bitmap */
+ /* Protects modification of the bitmap and migration dirty pages */
QemuMutex bitmap_mutex;
/* The RAMBlock used in the last src_page_requests */
RAMBlock *last_req_rb;
@@ -1590,11 +1590,14 @@ static inline bool
migration_bitmap_clear_dirty(RAMState *rs,
{
bool ret;
+ qemu_mutex_lock(&rs->bitmap_mutex);
ret = test_and_clear_bit(page, rb->bmap);
if (ret) {
rs->migration_dirty_pages--;
}
+ qemu_mutex_unlock(&rs->bitmap_mutex);
+
return ret;
}
--
2.20.1
- [Qemu-devel] [PULL 06/22] migration: Introduce ignore-shared capability, (continued)
- [Qemu-devel] [PULL 06/22] migration: Introduce ignore-shared capability, Dr. David Alan Gilbert (git), 2019/03/06
- [Qemu-devel] [PULL 07/22] migration: Add an ability to ignore shared RAM blocks, Dr. David Alan Gilbert (git), 2019/03/06
- [Qemu-devel] [PULL 08/22] tests/migration-test: Add a test for ignore-shared capability, Dr. David Alan Gilbert (git), 2019/03/06
- [Qemu-devel] [PULL 09/22] migration: Add capabilities validation, Dr. David Alan Gilbert (git), 2019/03/06
- [Qemu-devel] [PULL 10/22] tests: Add migration xbzrle test, Dr. David Alan Gilbert (git), 2019/03/06
- [Qemu-devel] [PULL 11/22] migration: Create socket-address parameter, Dr. David Alan Gilbert (git), 2019/03/06
- [Qemu-devel] [PULL 12/22] tests: Add basic migration precopy tcp test, Dr. David Alan Gilbert (git), 2019/03/06
- [Qemu-devel] [PULL 13/22] bitmap: fix bitmap_count_one, Dr. David Alan Gilbert (git), 2019/03/06
- [Qemu-devel] [PULL 15/22] migration: use bitmap_mutex in migration_bitmap_clear_dirty,
Dr. David Alan Gilbert (git) <=
- [Qemu-devel] [PULL 16/22] migration: API to clear bits of guest free pages from the dirty bitmap, Dr. David Alan Gilbert (git), 2019/03/06
- [Qemu-devel] [PULL 14/22] bitmap: bitmap_count_one_with_offset, Dr. David Alan Gilbert (git), 2019/03/06
- [Qemu-devel] [PULL 17/22] migration/ram.c: add a notifier chain for precopy, Dr. David Alan Gilbert (git), 2019/03/06
- [Qemu-devel] [PULL 18/22] migration/ram.c: add the free page optimization enable flag, Dr. David Alan Gilbert (git), 2019/03/06
- [Qemu-devel] [PULL 19/22] virtio-balloon: VIRTIO_BALLOON_F_FREE_PAGE_HINT, Dr. David Alan Gilbert (git), 2019/03/06
- [Qemu-devel] [PULL 20/22] Migration/colo.c: Fix double close bug when occur COLO failover, Dr. David Alan Gilbert (git), 2019/03/06
- [Qemu-devel] [PULL 21/22] Migration/colo.c: Make COLO node running after failover, Dr. David Alan Gilbert (git), 2019/03/06