qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Jason Wang <jasowang@redhat.com>
To: qemu-devel@nongnu.org, peter.maydell@linaro.org
Cc: Jason Wang <jasowang@redhat.com>,
	Pooja Dhannawat <dhannawatpooja1@gmail.com>
Subject: [Qemu-devel] [PULL 2/5] net: Allocating Large sized arrays to heap
Date: Wed,  6 Apr 2016 10:37:57 +0800	[thread overview]
Message-ID: <1459910280-5101-3-git-send-email-jasowang@redhat.com> (raw)
In-Reply-To: <1459910280-5101-1-git-send-email-jasowang@redhat.com>

From: Pooja Dhannawat <dhannawatpooja1@gmail.com>

nc_sendv_compat has a huge stack usage of 69680 bytes approx.
Moving large arrays to heap to reduce stack usage.

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Pooja Dhannawat <dhannawatpooja1@gmail.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 net/net.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/net/net.c b/net/net.c
index 0bc42a1..f8b1e00 100644
--- a/net/net.c
+++ b/net/net.c
@@ -683,23 +683,28 @@ ssize_t qemu_send_packet_raw(NetClientState *nc, const uint8_t *buf, int size)
 static ssize_t nc_sendv_compat(NetClientState *nc, const struct iovec *iov,
                                int iovcnt, unsigned flags)
 {
-    uint8_t buf[NET_BUFSIZE];
+    uint8_t *buf = NULL;
     uint8_t *buffer;
     size_t offset;
+    ssize_t ret;
 
     if (iovcnt == 1) {
         buffer = iov[0].iov_base;
         offset = iov[0].iov_len;
     } else {
+        buf = g_new(uint8_t, NET_BUFSIZE);
         buffer = buf;
-        offset = iov_to_buf(iov, iovcnt, 0, buf, sizeof(buf));
+        offset = iov_to_buf(iov, iovcnt, 0, buf, NET_BUFSIZE);
     }
 
     if (flags & QEMU_NET_PACKET_FLAG_RAW && nc->info->receive_raw) {
-        return nc->info->receive_raw(nc, buffer, offset);
+        ret = nc->info->receive_raw(nc, buffer, offset);
     } else {
-        return nc->info->receive(nc, buffer, offset);
+        ret = nc->info->receive(nc, buffer, offset);
     }
+
+    g_free(buf);
+    return ret;
 }
 
 ssize_t qemu_deliver_packet_iov(NetClientState *sender,
-- 
2.5.0

  parent reply	other threads:[~2016-04-06  2:38 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-06  2:37 [Qemu-devel] [PULL 0/5] Net patches Jason Wang
2016-04-06  2:37 ` [Qemu-devel] [PULL 1/5] util: Improved qemu_hexmap() to include an ascii dump of the buffer Jason Wang
2016-04-06  2:37 ` Jason Wang [this message]
2016-04-06  2:37 ` [Qemu-devel] [PULL 3/5] net: fix OptsVisitor memory leak Jason Wang
2016-04-06  2:37 ` [Qemu-devel] [PULL 4/5] rtl8139: using CP_TX_OWN for ownership transferring during tx Jason Wang
2016-04-06  2:38 ` [Qemu-devel] [PULL 5/5] filter-buffer: fix segfault when starting qemu with status=off property Jason Wang
2016-04-07  9:37 ` [Qemu-devel] [PULL 0/5] Net patches 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=1459910280-5101-3-git-send-email-jasowang@redhat.com \
    --to=jasowang@redhat.com \
    --cc=dhannawatpooja1@gmail.com \
    --cc=peter.maydell@linaro.org \
    --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).