From: Anthony PERARD <anthony.perard@citrix.com>
To: <qemu-devel@nongnu.org>
Cc: Anthony PERARD <anthony.perard@citrix.com>,
xen-devel@lists.xenproject.org,
Peter Maydell <peter.maydell@linaro.org>
Subject: [Qemu-devel] [PULL 5/8] xen: Avoid VLA
Date: Mon, 24 Jun 2019 16:32:54 +0100 [thread overview]
Message-ID: <20190624153257.20163-6-anthony.perard@citrix.com> (raw)
In-Reply-To: <20190624153257.20163-1-anthony.perard@citrix.com>
Avoid using a variable length array.
We allocate the `dirty_bitmap' buffer only once when we start tracking
for dirty bits.
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Reviewed-by: Paul Durrant <paul.durrant@citrix.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20190618112341.513-5-anthony.perard@citrix.com>
---
hw/i386/xen/xen-hvm.c | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/hw/i386/xen/xen-hvm.c b/hw/i386/xen/xen-hvm.c
index 2939122e7c..ed9c37c72d 100644
--- a/hw/i386/xen/xen-hvm.c
+++ b/hw/i386/xen/xen-hvm.c
@@ -120,6 +120,8 @@ typedef struct XenIOState {
DeviceListener device_listener;
hwaddr free_phys_offset;
const XenPhysmap *log_for_dirtybit;
+ /* Buffer used by xen_sync_dirty_bitmap */
+ unsigned long *dirty_bitmap;
Notifier exit;
Notifier suspend;
@@ -465,6 +467,8 @@ static int xen_remove_from_physmap(XenIOState *state,
QLIST_REMOVE(physmap, list);
if (state->log_for_dirtybit == physmap) {
state->log_for_dirtybit = NULL;
+ g_free(state->dirty_bitmap);
+ state->dirty_bitmap = NULL;
}
g_free(physmap);
@@ -615,7 +619,7 @@ static void xen_sync_dirty_bitmap(XenIOState *state,
{
hwaddr npages = size >> TARGET_PAGE_BITS;
const int width = sizeof(unsigned long) * 8;
- unsigned long bitmap[DIV_ROUND_UP(npages, width)];
+ size_t bitmap_size = DIV_ROUND_UP(npages, width);
int rc, i, j;
const XenPhysmap *physmap = NULL;
@@ -627,13 +631,14 @@ static void xen_sync_dirty_bitmap(XenIOState *state,
if (state->log_for_dirtybit == NULL) {
state->log_for_dirtybit = physmap;
+ state->dirty_bitmap = g_new(unsigned long, bitmap_size);
} else if (state->log_for_dirtybit != physmap) {
/* Only one range for dirty bitmap can be tracked. */
return;
}
rc = xen_track_dirty_vram(xen_domid, start_addr >> TARGET_PAGE_BITS,
- npages, bitmap);
+ npages, state->dirty_bitmap);
if (rc < 0) {
#ifndef ENODATA
#define ENODATA ENOENT
@@ -647,8 +652,8 @@ static void xen_sync_dirty_bitmap(XenIOState *state,
return;
}
- for (i = 0; i < ARRAY_SIZE(bitmap); i++) {
- unsigned long map = bitmap[i];
+ for (i = 0; i < bitmap_size; i++) {
+ unsigned long map = state->dirty_bitmap[i];
while (map != 0) {
j = ctzl(map);
map &= ~(1ul << j);
@@ -678,6 +683,8 @@ static void xen_log_stop(MemoryListener *listener, MemoryRegionSection *section,
if (old & ~new & (1 << DIRTY_MEMORY_VGA)) {
state->log_for_dirtybit = NULL;
+ g_free(state->dirty_bitmap);
+ state->dirty_bitmap = NULL;
/* Disable dirty bit tracking */
xen_track_dirty_vram(xen_domid, 0, 0, NULL);
}
--
Anthony PERARD
next prev parent reply other threads:[~2019-06-24 15:44 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-24 15:32 [Qemu-devel] [PULL 0/8] xen queue 2019-06-24 Anthony PERARD
2019-06-24 15:32 ` [Qemu-devel] [PULL 1/8] xen-block: support feature-large-sector-size Anthony PERARD
2019-06-24 15:32 ` [Qemu-devel] [PULL 2/8] xen-bus: use a separate fd for each event channel Anthony PERARD
2019-06-24 15:32 ` [Qemu-devel] [PULL 3/8] xen-bus: allow AioContext to be specified " Anthony PERARD
2019-06-24 15:32 ` [Qemu-devel] [PULL 4/8] xen-bus / xen-block: add support for event channel polling Anthony PERARD
2019-06-24 15:32 ` Anthony PERARD [this message]
2019-06-24 15:32 ` [Qemu-devel] [PULL 6/8] xen: Drop includes of xen/hvm/params.h Anthony PERARD
2019-06-24 15:32 ` [Qemu-devel] [PULL 7/8] Revert xen/io/ring.h of "Clean up a few header guard symbols" Anthony PERARD
2019-06-24 15:32 ` [Qemu-devel] [PULL 8/8] xen: Import other xen/io/*.h Anthony PERARD
2019-06-24 16:10 ` [Qemu-devel] [Xen-devel] [PULL 0/8] xen queue 2019-06-24 no-reply
2019-06-24 16:28 ` no-reply
2019-06-24 16:34 ` no-reply
2019-06-24 16:48 ` no-reply
2019-06-24 17:19 ` no-reply
2019-07-01 12:45 ` [Qemu-devel] " Peter Maydell
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=20190624153257.20163-6-anthony.perard@citrix.com \
--to=anthony.perard@citrix.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=xen-devel@lists.xenproject.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).