From: Kevin Wolf <kwolf@redhat.com>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, benoit.canet@irqsave.net, armbru@redhat.com,
stefanha@redhat.com, mreitz@redhat.com
Subject: [Qemu-devel] [PATCH v3 20/21] mirror: Handle failure for potentially large allocations
Date: Tue, 3 Jun 2014 15:11:01 +0200 [thread overview]
Message-ID: <1401801062-9154-21-git-send-email-kwolf@redhat.com> (raw)
In-Reply-To: <1401801062-9154-1-git-send-email-kwolf@redhat.com>
Some code in the block layer makes potentially huge allocations. Failure
is not completely unexpected there, so avoid aborting qemu and handle
out-of-memory situations gracefully.
This patch addresses the allocations in the mirror block job.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
---
block/mirror.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/block/mirror.c b/block/mirror.c
index 94c8661..07417d7 100644
--- a/block/mirror.c
+++ b/block/mirror.c
@@ -350,7 +350,12 @@ static void coroutine_fn mirror_run(void *opaque)
}
end = s->common.len >> BDRV_SECTOR_BITS;
- s->buf = qemu_blockalign(bs, s->buf_size);
+ s->buf = qemu_try_blockalign(bs, s->buf_size);
+ if (s->buf == NULL) {
+ ret = -ENOMEM;
+ goto immediate_exit;
+ }
+
sectors_per_chunk = s->granularity >> BDRV_SECTOR_BITS;
mirror_free_init(s);
--
1.8.3.1
next prev parent reply other threads:[~2014-06-03 13:11 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-03 13:10 [Qemu-devel] [PATCH v3 00/21] block: Handle failure for potentially large allocations Kevin Wolf
2014-06-03 13:10 ` [Qemu-devel] [PATCH v3 01/21] block: Introduce qemu_try_blockalign() Kevin Wolf
2014-06-03 13:18 ` Eric Blake
2014-06-03 15:07 ` Benoît Canet
2014-06-03 13:10 ` [Qemu-devel] [PATCH v3 02/21] block: Handle failure for potentially large allocations Kevin Wolf
2014-06-03 13:10 ` [Qemu-devel] [PATCH v3 03/21] bochs: " Kevin Wolf
2014-06-03 13:10 ` [Qemu-devel] [PATCH v3 04/21] cloop: " Kevin Wolf
2014-06-03 13:10 ` [Qemu-devel] [PATCH v3 05/21] curl: " Kevin Wolf
2014-06-03 13:10 ` [Qemu-devel] [PATCH v3 06/21] dmg: " Kevin Wolf
2014-06-03 13:10 ` [Qemu-devel] [PATCH v3 07/21] iscsi: " Kevin Wolf
2014-06-03 13:10 ` [Qemu-devel] [PATCH v3 08/21] nfs: " Kevin Wolf
2014-06-03 15:10 ` Benoît Canet
2014-06-03 13:10 ` [Qemu-devel] [PATCH v3 09/21] parallels: " Kevin Wolf
2014-06-03 13:10 ` [Qemu-devel] [PATCH v3 10/21] qcow1: " Kevin Wolf
2014-06-03 13:10 ` [Qemu-devel] [PATCH v3 11/21] qcow2: " Kevin Wolf
2014-06-03 15:14 ` Benoît Canet
2014-06-03 13:10 ` [Qemu-devel] [PATCH v3 12/21] qed: " Kevin Wolf
2014-06-03 15:47 ` Benoît Canet
2014-06-03 13:10 ` [Qemu-devel] [PATCH v3 13/21] raw-posix: " Kevin Wolf
2014-06-03 13:10 ` [Qemu-devel] [PATCH v3 14/21] raw-win32: " Kevin Wolf
2014-06-03 15:46 ` Benoît Canet
2014-06-05 13:33 ` Kevin Wolf
2014-06-03 13:10 ` [Qemu-devel] [PATCH v3 15/21] rbd: " Kevin Wolf
2014-06-03 15:43 ` Benoît Canet
2014-06-05 13:29 ` Kevin Wolf
2014-06-03 13:10 ` [Qemu-devel] [PATCH v3 16/21] vdi: " Kevin Wolf
2014-06-03 15:37 ` Benoît Canet
2014-06-03 13:10 ` [Qemu-devel] [PATCH v3 17/21] vhdx: " Kevin Wolf
2014-06-03 15:34 ` Benoît Canet
2014-06-03 13:10 ` [Qemu-devel] [PATCH v3 18/21] vmdk: " Kevin Wolf
2014-06-03 15:31 ` Benoît Canet
2014-06-03 13:11 ` [Qemu-devel] [PATCH v3 19/21] vpc: " Kevin Wolf
2014-06-03 15:26 ` Benoît Canet
2014-06-03 13:11 ` Kevin Wolf [this message]
2014-06-03 15:24 ` [Qemu-devel] [PATCH v3 20/21] mirror: " Benoît Canet
2014-06-03 13:11 ` [Qemu-devel] [PATCH v3 21/21] qcow2: Return useful error code in refcount_init() Kevin Wolf
2014-06-03 15:20 ` Benoît Canet
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=1401801062-9154-21-git-send-email-kwolf@redhat.com \
--to=kwolf@redhat.com \
--cc=armbru@redhat.com \
--cc=benoit.canet@irqsave.net \
--cc=mreitz@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/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).