From: David Hildenbrand <david@redhat.com>
To: qemu-devel@nongnu.org
Cc: David Hildenbrand <david@redhat.com>,
Mario Casquero <mcasquer@redhat.com>,
"Michael S . Tsirkin" <mst@redhat.com>,
"Maciej S . Szmigiero" <maciej.szmigiero@oracle.com>
Subject: [GIT PULL 1/1] virtio-mem: fix division by zero in virtio_mem_activate_memslots_to_plug()
Date: Mon, 13 Nov 2023 09:46:42 +0100 [thread overview]
Message-ID: <20231113084642.150354-2-david@redhat.com> (raw)
In-Reply-To: <20231113084642.150354-1-david@redhat.com>
When running with "dynamic-memslots=off", we enter
virtio_mem_activate_memslots_to_plug() to return immediately again
because "vmem->dynamic_memslots == false". However, the compiler might
not optimize out calculating start_idx+end_idx, where we divide by
vmem->memslot_size. In such a configuration, the memslot size is 0 and
we'll get a division by zero:
(qemu) qom-set vmem0 requested-size 3G
(qemu) q35.sh: line 38: 622940 Floating point exception(core dumped)
The same is true for virtio_mem_deactivate_unplugged_memslots(), however
we never really reach that code without a prior
virtio_mem_activate_memslots_to_plug() call.
Let's fix it by simply calling these functions only with
"dynamic-memslots=on".
This was found when using a debug build of QEMU.
Message-ID: <20231023111341.219317-1-david@redhat.com>
Reprted-by: Mario Casquero <mcasquer@redhat.com>
Fixes: 177f9b1ee464 ("virtio-mem: Expose device memory dynamically via multiple memslots if enabled")
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Maciej S. Szmigiero <maciej.szmigiero@oracle.com>
Tested-by: Mario Casquero <mcasquer@redhat.com>
Signed-off-by: David Hildenbrand <david@redhat.com>
---
hw/virtio/virtio-mem.c | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c
index a5ea3be414..75ee38aa46 100644
--- a/hw/virtio/virtio-mem.c
+++ b/hw/virtio/virtio-mem.c
@@ -525,9 +525,7 @@ static void virtio_mem_activate_memslots_to_plug(VirtIOMEM *vmem,
vmem->memslot_size;
unsigned int idx;
- if (!vmem->dynamic_memslots) {
- return;
- }
+ assert(vmem->dynamic_memslots);
/* Activate all involved memslots in a single transaction. */
memory_region_transaction_begin();
@@ -547,9 +545,7 @@ static void virtio_mem_deactivate_unplugged_memslots(VirtIOMEM *vmem,
vmem->memslot_size;
unsigned int idx;
- if (!vmem->dynamic_memslots) {
- return;
- }
+ assert(vmem->dynamic_memslots);
/* Deactivate all memslots with unplugged blocks in a single transaction. */
memory_region_transaction_begin();
@@ -598,7 +594,9 @@ static int virtio_mem_set_block_state(VirtIOMEM *vmem, uint64_t start_gpa,
virtio_mem_notify_unplug(vmem, offset, size);
virtio_mem_set_range_unplugged(vmem, start_gpa, size);
/* Deactivate completely unplugged memslots after updating the state. */
- virtio_mem_deactivate_unplugged_memslots(vmem, offset, size);
+ if (vmem->dynamic_memslots) {
+ virtio_mem_deactivate_unplugged_memslots(vmem, offset, size);
+ }
return 0;
}
@@ -635,9 +633,11 @@ static int virtio_mem_set_block_state(VirtIOMEM *vmem, uint64_t start_gpa,
* blocks we are plugging here. The following notification will inform
* registered listeners about the blocks we're plugging.
*/
- virtio_mem_activate_memslots_to_plug(vmem, offset, size);
+ if (vmem->dynamic_memslots) {
+ virtio_mem_activate_memslots_to_plug(vmem, offset, size);
+ }
ret = virtio_mem_notify_plug(vmem, offset, size);
- if (ret) {
+ if (ret && vmem->dynamic_memslots) {
virtio_mem_deactivate_unplugged_memslots(vmem, offset, size);
}
}
@@ -749,7 +749,9 @@ static int virtio_mem_unplug_all(VirtIOMEM *vmem)
notifier_list_notify(&vmem->size_change_notifiers, &vmem->size);
/* Deactivate all memslots after updating the state. */
- virtio_mem_deactivate_unplugged_memslots(vmem, 0, region_size);
+ if (vmem->dynamic_memslots) {
+ virtio_mem_deactivate_unplugged_memslots(vmem, 0, region_size);
+ }
}
trace_virtio_mem_unplugged_all();
--
2.41.0
next prev parent reply other threads:[~2023-11-13 8:47 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-13 8:46 [GIT PULL 0/1] Host Memory Backends and Memory devices queue 2023-11-13 David Hildenbrand
2023-11-13 8:46 ` David Hildenbrand [this message]
2023-11-13 19:26 ` Stefan Hajnoczi
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=20231113084642.150354-2-david@redhat.com \
--to=david@redhat.com \
--cc=maciej.szmigiero@oracle.com \
--cc=mcasquer@redhat.com \
--cc=mst@redhat.com \
--cc=qemu-devel@nongnu.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).