[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 5/8] xen: Avoid VLA
From: |
Anthony PERARD |
Subject: |
[Qemu-devel] [PULL 5/8] xen: Avoid VLA |
Date: |
Mon, 24 Jun 2019 16:32:54 +0100 |
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 <address@hidden>
Reviewed-by: Paul Durrant <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
---
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
- [Qemu-devel] [PULL 0/8] xen queue 2019-06-24, Anthony PERARD, 2019/06/24
- [Qemu-devel] [PULL 3/8] xen-bus: allow AioContext to be specified for each event channel, Anthony PERARD, 2019/06/24
- [Qemu-devel] [PULL 2/8] xen-bus: use a separate fd for each event channel, Anthony PERARD, 2019/06/24
- [Qemu-devel] [PULL 1/8] xen-block: support feature-large-sector-size, Anthony PERARD, 2019/06/24
- [Qemu-devel] [PULL 4/8] xen-bus / xen-block: add support for event channel polling, Anthony PERARD, 2019/06/24
- [Qemu-devel] [PULL 6/8] xen: Drop includes of xen/hvm/params.h, Anthony PERARD, 2019/06/24
- [Qemu-devel] [PULL 5/8] xen: Avoid VLA,
Anthony PERARD <=
- [Qemu-devel] [PULL 7/8] Revert xen/io/ring.h of "Clean up a few header guard symbols", Anthony PERARD, 2019/06/24
- [Qemu-devel] [PULL 8/8] xen: Import other xen/io/*.h, Anthony PERARD, 2019/06/24
- Re: [Qemu-devel] [Xen-devel] [PULL 0/8] xen queue 2019-06-24, no-reply, 2019/06/24
- Re: [Qemu-devel] [Xen-devel] [PULL 0/8] xen queue 2019-06-24, no-reply, 2019/06/24
- Re: [Qemu-devel] [Xen-devel] [PULL 0/8] xen queue 2019-06-24, no-reply, 2019/06/24
- Re: [Qemu-devel] [Xen-devel] [PULL 0/8] xen queue 2019-06-24, no-reply, 2019/06/24
- Re: [Qemu-devel] [Xen-devel] [PULL 0/8] xen queue 2019-06-24, no-reply, 2019/06/24