From: Jaya Tiwari <tiwari.jaya18@gmail.com>
To: qemu-devel@nongnu.org, mst@redhat.com
Subject: [Qemu-devel] [PATCH V2 1/1] virtio:Allocate temporary VirtQueueElementOld on heap
Date: Mon, 14 Mar 2016 21:10:15 +0530 [thread overview]
Message-ID: <1457970015-3181-1-git-send-email-tiwari.jaya18@gmail.com> (raw)
In-Reply-To: <56E6C89F.5030503@redhat.com>
As per the list of functions in :
http://wiki.qemu.org/BiteSizedTasks#Large_frames,
qemu_get_virtqueue_element and qemu_put_virtqueue_element
have large arrays on stack. Hence, moving them to heap
This reduced their stack size from something 49248
to fit into less than 200.
Signed-off-by: Jaya Tiwari <tiwari.jaya18@gmail.com>
---
hw/virtio/virtio.c | 37 +++++++++++++++++++------------------
1 file changed, 19 insertions(+), 18 deletions(-)
diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
index 08275a9..027e7e2 100644
--- a/hw/virtio/virtio.c
+++ b/hw/virtio/virtio.c
@@ -636,67 +636,68 @@ typedef struct VirtQueueElementOld {
void *qemu_get_virtqueue_element(QEMUFile *f, size_t sz)
{
VirtQueueElement *elem;
- VirtQueueElementOld data;
+ VirtQueueElementOld *data = g_new(VirtQueueElementOld, 1);
int i;
- qemu_get_buffer(f, (uint8_t *)&data, sizeof(VirtQueueElementOld));
+ qemu_get_buffer(f, (uint8_t *)data, sizeof(VirtQueueElementOld));
- elem = virtqueue_alloc_element(sz, data.out_num, data.in_num);
- elem->index = data.index;
+ elem = virtqueue_alloc_element(sz, data->out_num, data->in_num);
+ elem->index = data->index;
for (i = 0; i < elem->in_num; i++) {
- elem->in_addr[i] = data.in_addr[i];
+ elem->in_addr[i] = data->in_addr[i];
}
for (i = 0; i < elem->out_num; i++) {
- elem->out_addr[i] = data.out_addr[i];
+ elem->out_addr[i] = data->out_addr[i];
}
for (i = 0; i < elem->in_num; i++) {
/* Base is overwritten by virtqueue_map. */
elem->in_sg[i].iov_base = 0;
- elem->in_sg[i].iov_len = data.in_sg[i].iov_len;
+ elem->in_sg[i].iov_len = data->in_sg[i].iov_len;
}
for (i = 0; i < elem->out_num; i++) {
/* Base is overwritten by virtqueue_map. */
elem->out_sg[i].iov_base = 0;
- elem->out_sg[i].iov_len = data.out_sg[i].iov_len;
+ elem->out_sg[i].iov_len = data->out_sg[i].iov_len;
}
+ g_free(data);
virtqueue_map(elem);
return elem;
}
void qemu_put_virtqueue_element(QEMUFile *f, VirtQueueElement *elem)
{
- VirtQueueElementOld data;
+ VirtQueueElementOld *data = g_new0(VirtQueueElementOld, 1);
int i;
- memset(&data, 0, sizeof(data));
- data.index = elem->index;
- data.in_num = elem->in_num;
- data.out_num = elem->out_num;
+ data->index = elem->index;
+ data->in_num = elem->in_num;
+ data->out_num = elem->out_num;
for (i = 0; i < elem->in_num; i++) {
- data.in_addr[i] = elem->in_addr[i];
+ data->in_addr[i] = elem->in_addr[i];
}
for (i = 0; i < elem->out_num; i++) {
- data.out_addr[i] = elem->out_addr[i];
+ data->out_addr[i] = elem->out_addr[i];
}
for (i = 0; i < elem->in_num; i++) {
/* Base is overwritten by virtqueue_map when loading. Do not
* save it, as it would leak the QEMU address space layout. */
- data.in_sg[i].iov_len = elem->in_sg[i].iov_len;
+ data->in_sg[i].iov_len = elem->in_sg[i].iov_len;
}
for (i = 0; i < elem->out_num; i++) {
/* Do not save iov_base as above. */
- data.out_sg[i].iov_len = elem->out_sg[i].iov_len;
+ data->out_sg[i].iov_len = elem->out_sg[i].iov_len;
}
- qemu_put_buffer(f, (uint8_t *)&data, sizeof(VirtQueueElementOld));
+ qemu_put_buffer(f, (uint8_t *)data, sizeof(VirtQueueElementOld));
+ g_free(data);
}
/* virtio device */
--
1.8.1.2
next prev parent reply other threads:[~2016-03-14 15:40 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-11 16:12 [Qemu-devel] [PATCH 1/1] Allocating Large sized arrays to heap Jaya Tiwari
2016-03-14 14:20 ` Paolo Bonzini
2016-03-14 15:40 ` Jaya Tiwari [this message]
2016-03-15 7:02 ` [Qemu-devel] [PATCH V2 1/1] virtio:Allocate temporary VirtQueueElementOld on heap Michael S. Tsirkin
2016-03-15 7:36 ` Jaya Tiwari
2016-03-15 9:16 ` Paolo Bonzini
2016-03-15 9:40 ` Michael S. Tsirkin
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=1457970015-3181-1-git-send-email-tiwari.jaya18@gmail.com \
--to=tiwari.jaya18@gmail.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).