[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v3 12/21] qed: Handle failure for potentially la
From: |
Benoît Canet |
Subject: |
Re: [Qemu-devel] [PATCH v3 12/21] qed: Handle failure for potentially large allocations |
Date: |
Tue, 3 Jun 2014 17:47:59 +0200 |
User-agent: |
Mutt/1.5.21 (2010-09-15) |
The Tuesday 03 Jun 2014 à 15:10:53 (+0200), Kevin Wolf wrote :
> 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 qed block driver.
>
> Signed-off-by: Kevin Wolf <address@hidden>
> Reviewed-by: Stefan Hajnoczi <address@hidden>
> ---
> block/qed-check.c | 7 +++++--
> block/qed.c | 6 +++++-
> 2 files changed, 10 insertions(+), 3 deletions(-)
>
> diff --git a/block/qed-check.c b/block/qed-check.c
> index b473dcd..40a882c 100644
> --- a/block/qed-check.c
> +++ b/block/qed-check.c
> @@ -227,8 +227,11 @@ int qed_check(BDRVQEDState *s, BdrvCheckResult *result,
> bool fix)
> };
> int ret;
>
> - check.used_clusters = g_malloc0(((check.nclusters + 31) / 32) *
> - sizeof(check.used_clusters[0]));
> + check.used_clusters = g_try_malloc0(((check.nclusters + 31) / 32) *
> + sizeof(check.used_clusters[0]));
> + if (check.nclusters && check.used_clusters == NULL) {
> + return -ENOMEM;
> + }
>
> check.result->bfi.total_clusters =
> (s->header.image_size + s->header.cluster_size - 1) /
> diff --git a/block/qed.c b/block/qed.c
> index c130e42..f0943d6 100644
> --- a/block/qed.c
> +++ b/block/qed.c
> @@ -1208,7 +1208,11 @@ static void qed_aio_write_inplace(QEDAIOCB *acb,
> uint64_t offset, size_t len)
> struct iovec *iov = acb->qiov->iov;
>
> if (!iov->iov_base) {
> - iov->iov_base = qemu_blockalign(acb->common.bs, iov->iov_len);
> + iov->iov_base = qemu_try_blockalign(acb->common.bs,
> iov->iov_len);
> + if (iov->iov_base == NULL) {
> + qed_aio_complete(acb, -ENOMEM);
> + return;
> + }
> memset(iov->iov_base, 0, iov->iov_len);
> }
> }
> --
> 1.8.3.1
>
Reviewed-by: Benoit Canet <address@hidden>
- [Qemu-devel] [PATCH v3 05/21] curl: Handle failure for potentially large allocations, (continued)
- [Qemu-devel] [PATCH v3 05/21] curl: Handle failure for potentially large allocations, Kevin Wolf, 2014/06/03
- [Qemu-devel] [PATCH v3 06/21] dmg: Handle failure for potentially large allocations, Kevin Wolf, 2014/06/03
- [Qemu-devel] [PATCH v3 07/21] iscsi: Handle failure for potentially large allocations, Kevin Wolf, 2014/06/03
- [Qemu-devel] [PATCH v3 09/21] parallels: Handle failure for potentially large allocations, Kevin Wolf, 2014/06/03
- [Qemu-devel] [PATCH v3 08/21] nfs: Handle failure for potentially large allocations, Kevin Wolf, 2014/06/03
- [Qemu-devel] [PATCH v3 10/21] qcow1: Handle failure for potentially large allocations, Kevin Wolf, 2014/06/03
- [Qemu-devel] [PATCH v3 11/21] qcow2: Handle failure for potentially large allocations, Kevin Wolf, 2014/06/03
- [Qemu-devel] [PATCH v3 12/21] qed: Handle failure for potentially large allocations, Kevin Wolf, 2014/06/03
- Re: [Qemu-devel] [PATCH v3 12/21] qed: Handle failure for potentially large allocations,
Benoît Canet <=
- [Qemu-devel] [PATCH v3 13/21] raw-posix: Handle failure for potentially large allocations, Kevin Wolf, 2014/06/03
- [Qemu-devel] [PATCH v3 14/21] raw-win32: Handle failure for potentially large allocations, Kevin Wolf, 2014/06/03
- [Qemu-devel] [PATCH v3 16/21] vdi: Handle failure for potentially large allocations, Kevin Wolf, 2014/06/03
- [Qemu-devel] [PATCH v3 18/21] vmdk: Handle failure for potentially large allocations, Kevin Wolf, 2014/06/03
- [Qemu-devel] [PATCH v3 15/21] rbd: Handle failure for potentially large allocations, Kevin Wolf, 2014/06/03