From: Wei Wang <wei.w.wang@intel.com> To: qemu-devel@nongnu.org, virtio-dev@lists.oasis-open.org, mst@redhat.com, quintela@redhat.com, dgilbert@redhat.com, peterx@redhat.com Cc: pbonzini@redhat.com, liliang.opensource@gmail.com, nilal@redhat.com, riel@redhat.com, wei.w.wang@intel.com Subject: [Qemu-devel] [PATCH v10 3/7] migration: use bitmap_mutex in migration_bitmap_clear_dirty Date: Mon, 3 Dec 2018 10:18:27 +0800 [thread overview] Message-ID: <1543803511-34793-4-git-send-email-wei.w.wang@intel.com> (raw) In-Reply-To: <1543803511-34793-1-git-send-email-wei.w.wang@intel.com> 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 <wei.w.wang@intel.com> CC: Dr. David Alan Gilbert <dgilbert@redhat.com> CC: Juan Quintela <quintela@redhat.com> CC: Michael S. Tsirkin <mst@redhat.com> CC: Peter Xu <peterx@redhat.com> --- migration/ram.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/migration/ram.c b/migration/ram.c index 7e7deec..01d267f 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -316,7 +316,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; @@ -1556,11 +1556,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; } -- 1.8.3.1
WARNING: multiple messages have this Message-ID (diff)
From: Wei Wang <wei.w.wang@intel.com> To: qemu-devel@nongnu.org, virtio-dev@lists.oasis-open.org, mst@redhat.com, quintela@redhat.com, dgilbert@redhat.com, peterx@redhat.com Cc: pbonzini@redhat.com, liliang.opensource@gmail.com, nilal@redhat.com, riel@redhat.com, wei.w.wang@intel.com Subject: [virtio-dev] [PATCH v10 3/7] migration: use bitmap_mutex in migration_bitmap_clear_dirty Date: Mon, 3 Dec 2018 10:18:27 +0800 [thread overview] Message-ID: <1543803511-34793-4-git-send-email-wei.w.wang@intel.com> (raw) In-Reply-To: <1543803511-34793-1-git-send-email-wei.w.wang@intel.com> 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 <wei.w.wang@intel.com> CC: Dr. David Alan Gilbert <dgilbert@redhat.com> CC: Juan Quintela <quintela@redhat.com> CC: Michael S. Tsirkin <mst@redhat.com> CC: Peter Xu <peterx@redhat.com> --- migration/ram.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/migration/ram.c b/migration/ram.c index 7e7deec..01d267f 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -316,7 +316,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; @@ -1556,11 +1556,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; } -- 1.8.3.1 --------------------------------------------------------------------- To unsubscribe, e-mail: virtio-dev-unsubscribe@lists.oasis-open.org For additional commands, e-mail: virtio-dev-help@lists.oasis-open.org
next prev parent reply other threads:[~2018-12-03 2:51 UTC|newest] Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-12-03 2:18 [Qemu-devel] [PATCH v10 0/7] virtio-balloon: free page hint support Wei Wang 2018-12-03 2:18 ` [virtio-dev] " Wei Wang 2018-12-03 2:18 ` [Qemu-devel] [PATCH v10 1/7] bitmap: fix bitmap_count_one Wei Wang 2018-12-03 2:18 ` [virtio-dev] " Wei Wang 2018-12-03 2:18 ` [Qemu-devel] [PATCH v10 2/7] bitmap: bitmap_count_one_with_offset Wei Wang 2018-12-03 2:18 ` [virtio-dev] " Wei Wang 2018-12-03 2:18 ` Wei Wang [this message] 2018-12-03 2:18 ` [virtio-dev] [PATCH v10 3/7] migration: use bitmap_mutex in migration_bitmap_clear_dirty Wei Wang 2018-12-03 5:08 ` [Qemu-devel] " Peter Xu 2018-12-03 2:18 ` [Qemu-devel] [PATCH v10 4/7] migration: API to clear bits of guest free pages from the dirty bitmap Wei Wang 2018-12-03 2:18 ` [virtio-dev] " Wei Wang 2018-12-03 5:10 ` [Qemu-devel] " Peter Xu 2018-12-03 8:07 ` Wei Wang 2018-12-03 8:07 ` [virtio-dev] " Wei Wang 2018-12-03 2:18 ` [Qemu-devel] [PATCH v10 5/7] migration/ram.c: add a notifier chain for precopy Wei Wang 2018-12-03 2:18 ` [virtio-dev] " Wei Wang 2018-12-03 5:20 ` [Qemu-devel] " Peter Xu 2018-12-03 8:10 ` Wei Wang 2018-12-03 8:10 ` [virtio-dev] " Wei Wang 2018-12-03 2:18 ` [Qemu-devel] [PATCH v10 6/7] migration/ram.c: add a function to disable the bulk stage Wei Wang 2018-12-03 2:18 ` [virtio-dev] " Wei Wang 2018-12-03 5:31 ` [Qemu-devel] " Peter Xu 2018-12-03 8:20 ` Wei Wang 2018-12-03 8:20 ` [virtio-dev] " Wei Wang 2018-12-03 8:24 ` [Qemu-devel] " Wei Wang 2018-12-03 8:24 ` Wei Wang 2018-12-03 2:18 ` [Qemu-devel] [PATCH v10 7/7] virtio-balloon: VIRTIO_BALLOON_F_FREE_PAGE_HINT Wei Wang 2018-12-03 2:18 ` [virtio-dev] " Wei Wang
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1543803511-34793-4-git-send-email-wei.w.wang@intel.com \ --to=wei.w.wang@intel.com \ --cc=dgilbert@redhat.com \ --cc=liliang.opensource@gmail.com \ --cc=mst@redhat.com \ --cc=nilal@redhat.com \ --cc=pbonzini@redhat.com \ --cc=peterx@redhat.com \ --cc=qemu-devel@nongnu.org \ --cc=quintela@redhat.com \ --cc=riel@redhat.com \ --cc=virtio-dev@lists.oasis-open.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.