aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Duyck <alexander.h.duyck@linux.intel.com>2020-07-20 10:51:22 -0700
committerMichael S. Tsirkin <mst@redhat.com>2020-07-22 07:57:07 -0400
commit1a83e0b9c492a0eaeacd6fbb858fc81d04ab9c3e (patch)
tree035ccb26bbc8385007c1cdb347b48270cde5171a
parent20a4da0f23078deeff5ea6d1e12f47d968d7c3c9 (diff)
downloadqemu-1a83e0b9c492a0eaeacd6fbb858fc81d04ab9c3e.zip
qemu-1a83e0b9c492a0eaeacd6fbb858fc81d04ab9c3e.tar.gz
qemu-1a83e0b9c492a0eaeacd6fbb858fc81d04ab9c3e.tar.bz2
virtio-balloon: Add locking to prevent possible race when starting hinting
There is already locking in place when we are stopping free page hinting but there is not similar protections in place when we start. I can only assume this was overlooked as in most cases the page hinting should not be occurring when we are starting the hinting, however there is still a chance we could be processing hints by the time we get back around to restarting the hinting so we are better off making sure to protect the state with the mutex lock rather than just updating the value with no protections. Based on feedback from Peter Maydell this issue had also been spotted by Coverity: CID 1430269 Acked-by: David Hildenbrand <david@redhat.com> Signed-off-by: Alexander Duyck <alexander.h.duyck@linux.intel.com> Message-Id: <20200720175122.21935.78013.stgit@localhost.localdomain> Cc: qemu-stable@nongnu.org Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
-rw-r--r--hw/virtio/virtio-balloon.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c
index ce70adc..6e2d129 100644
--- a/hw/virtio/virtio-balloon.c
+++ b/hw/virtio/virtio-balloon.c
@@ -592,6 +592,8 @@ static void virtio_balloon_free_page_start(VirtIOBalloon *s)
return;
}
+ qemu_mutex_lock(&s->free_page_lock);
+
if (s->free_page_report_cmd_id == UINT_MAX) {
s->free_page_report_cmd_id =
VIRTIO_BALLOON_FREE_PAGE_REPORT_CMD_ID_MIN;
@@ -600,6 +602,8 @@ static void virtio_balloon_free_page_start(VirtIOBalloon *s)
}
s->free_page_report_status = FREE_PAGE_REPORT_S_REQUESTED;
+ qemu_mutex_unlock(&s->free_page_lock);
+
virtio_notify_config(vdev);
}