From patchwork Thu Jul 28 07:40:40 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frediano Ziglio X-Patchwork-Id: 107200 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id F3050B6F68 for ; Thu, 28 Jul 2011 18:11:53 +1000 (EST) Received: from localhost ([::1]:53315 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QmLE3-0006s5-5L for incoming@patchwork.ozlabs.org; Thu, 28 Jul 2011 03:41:47 -0400 Received: from eggs.gnu.org ([140.186.70.92]:44544) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QmLDJ-0004Vv-OY for qemu-devel@nongnu.org; Thu, 28 Jul 2011 03:41:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QmLDH-0004cq-HV for qemu-devel@nongnu.org; Thu, 28 Jul 2011 03:41:01 -0400 Received: from mail-fx0-f45.google.com ([209.85.161.45]:32869) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QmLDH-0004Z7-6S for qemu-devel@nongnu.org; Thu, 28 Jul 2011 03:40:59 -0400 Received: by mail-fx0-f45.google.com with SMTP id b27so719180fxb.4 for ; Thu, 28 Jul 2011 00:40:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=QCNVqBov8jt/IVaaAqz/J5ofXDLUbHYbGBKVC5gySKo=; b=cWPOdNGwEOPAnQQl+ItS63gLS6NoNxg4KF5THNH+wognlZ7IeXfx1kpwiXryBnQqW0 zFHSN4+KOR3ZSi+5CVYqQdZk5DYjLq1mKS5IUBpXVUVib+iDD9WbV5cLHUGh3ZNYrG45 EdsOSGrFdDsE0N0RqrCZwK27n1asNXgGmDAdg= Received: by 10.223.144.136 with SMTP id z8mr952637fau.31.1311838858767; Thu, 28 Jul 2011 00:40:58 -0700 (PDT) Received: from obol602.omnitel.it ([87.236.194.191]) by mx.google.com with ESMTPS id y15sm287187fah.35.2011.07.28.00.40.55 (version=SSLv3 cipher=OTHER); Thu, 28 Jul 2011 00:40:58 -0700 (PDT) From: Frediano Ziglio To: Kevin Wolf Date: Thu, 28 Jul 2011 09:40:40 +0200 Message-Id: <1311838841-4853-8-git-send-email-freddy77@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1311838841-4853-1-git-send-email-freddy77@gmail.com> References: <1311838841-4853-1-git-send-email-freddy77@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.161.45 Cc: qemu-devel@nongnu.org, Frediano Ziglio Subject: [Qemu-devel] [PATCH 7/8] qcow2: removed QCowAIOCB entirely X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Frediano Ziglio --- block/qcow2.c | 207 ++++++++++++++++++++++----------------------------------- 1 files changed, 80 insertions(+), 127 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index dfb969e..6073568 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -372,83 +372,77 @@ int qcow2_backing_read1(BlockDriverState *bs, QEMUIOVector *qiov, return n1; } -typedef struct QCowAIOCB { - BlockDriverState *bs; - int64_t sector_num; - QEMUIOVector *qiov; - int remaining_sectors; - uint64_t bytes_done; - uint8_t *cluster_data; - QEMUIOVector hd_qiov; -} QCowAIOCB; - -/* - * Returns 0 when the request is completed successfully, 1 when there is still - * a part left to do and -errno in error cases. - */ -static int qcow2_aio_read_cb(QCowAIOCB *acb) +static int qcow2_co_readv(BlockDriverState *bs, int64_t sector_num, + int remaining_sectors, QEMUIOVector *qiov) { - BlockDriverState *bs = acb->bs; BDRVQcowState *s = bs->opaque; int index_in_cluster, n1; int ret; int cur_nr_sectors; /* number of sectors in current iteration */ uint64_t cluster_offset = 0; + uint64_t bytes_done = 0; + QEMUIOVector hd_qiov; + uint8_t *cluster_data = NULL; - while (acb->remaining_sectors != 0) { + qemu_iovec_init(&hd_qiov, qiov->niov); + + qemu_co_mutex_lock(&s->lock); + + while (remaining_sectors != 0) { /* prepare next request */ - cur_nr_sectors = acb->remaining_sectors; + cur_nr_sectors = remaining_sectors; if (s->crypt_method) { cur_nr_sectors = MIN(cur_nr_sectors, QCOW_MAX_CRYPT_CLUSTERS * s->cluster_sectors); } - ret = qcow2_get_cluster_offset(bs, acb->sector_num << 9, + ret = qcow2_get_cluster_offset(bs, sector_num << 9, &cur_nr_sectors, &cluster_offset); if (ret < 0) { - return ret; + goto fail; } - index_in_cluster = acb->sector_num & (s->cluster_sectors - 1); + index_in_cluster = sector_num & (s->cluster_sectors - 1); - qemu_iovec_reset(&acb->hd_qiov); - qemu_iovec_copy(&acb->hd_qiov, acb->qiov, acb->bytes_done, + qemu_iovec_reset(&hd_qiov); + qemu_iovec_copy(&hd_qiov, qiov, bytes_done, cur_nr_sectors * 512); if (!cluster_offset) { if (bs->backing_hd) { /* read from the base image */ - n1 = qcow2_backing_read1(bs->backing_hd, &acb->hd_qiov, - acb->sector_num, cur_nr_sectors); + n1 = qcow2_backing_read1(bs->backing_hd, &hd_qiov, + sector_num, cur_nr_sectors); if (n1 > 0) { BLKDBG_EVENT(bs->file, BLKDBG_READ_BACKING_AIO); qemu_co_mutex_unlock(&s->lock); - ret = bdrv_co_readv(bs->backing_hd, acb->sector_num, - n1, &acb->hd_qiov); + ret = bdrv_co_readv(bs->backing_hd, sector_num, + n1, &hd_qiov); qemu_co_mutex_lock(&s->lock); if (ret < 0) { - return ret; + goto fail; } } } else { /* Note: in this case, no need to wait */ - qemu_iovec_memset(&acb->hd_qiov, 0, 512 * cur_nr_sectors); + qemu_iovec_memset(&hd_qiov, 0, 512 * cur_nr_sectors); } } else if (cluster_offset & QCOW_OFLAG_COMPRESSED) { /* add AIO support for compressed blocks ? */ ret = qcow2_decompress_cluster(bs, cluster_offset); if (ret < 0) { - return ret; + goto fail; } - qemu_iovec_from_buffer(&acb->hd_qiov, + qemu_iovec_from_buffer(&hd_qiov, s->cluster_cache + index_in_cluster * 512, 512 * cur_nr_sectors); } else { if ((cluster_offset & 511) != 0) { - return -EIO; + ret = -EIO; + goto fail; } if (s->crypt_method) { @@ -456,15 +450,15 @@ static int qcow2_aio_read_cb(QCowAIOCB *acb) * For encrypted images, read everything into a temporary * contiguous buffer on which the AES functions can work. */ - if (!acb->cluster_data) { - acb->cluster_data = + if (!cluster_data) { + cluster_data = qemu_mallocz(QCOW_MAX_CRYPT_CLUSTERS * s->cluster_size); } assert(cur_nr_sectors <= QCOW_MAX_CRYPT_CLUSTERS * s->cluster_sectors); - qemu_iovec_reset(&acb->hd_qiov); - qemu_iovec_add(&acb->hd_qiov, acb->cluster_data, + qemu_iovec_reset(&hd_qiov); + qemu_iovec_add(&hd_qiov, cluster_data, 512 * cur_nr_sectors); } @@ -472,63 +466,32 @@ static int qcow2_aio_read_cb(QCowAIOCB *acb) qemu_co_mutex_unlock(&s->lock); ret = bdrv_co_readv(bs->file, (cluster_offset >> 9) + index_in_cluster, - cur_nr_sectors, &acb->hd_qiov); + cur_nr_sectors, &hd_qiov); qemu_co_mutex_lock(&s->lock); if (ret < 0) { - return ret; + goto fail; } if (s->crypt_method) { - qcow2_encrypt_sectors(s, acb->sector_num, acb->cluster_data, - acb->cluster_data, cur_nr_sectors, 0, &s->aes_decrypt_key); - qemu_iovec_reset(&acb->hd_qiov); - qemu_iovec_copy(&acb->hd_qiov, acb->qiov, acb->bytes_done, + qcow2_encrypt_sectors(s, sector_num, cluster_data, + cluster_data, cur_nr_sectors, 0, &s->aes_decrypt_key); + qemu_iovec_reset(&hd_qiov); + qemu_iovec_copy(&hd_qiov, qiov, bytes_done, cur_nr_sectors * 512); - qemu_iovec_from_buffer(&acb->hd_qiov, acb->cluster_data, + qemu_iovec_from_buffer(&hd_qiov, cluster_data, 512 * cur_nr_sectors); } } - acb->remaining_sectors -= cur_nr_sectors; - acb->sector_num += cur_nr_sectors; - acb->bytes_done += cur_nr_sectors * 512; + remaining_sectors -= cur_nr_sectors; + sector_num += cur_nr_sectors; + bytes_done += cur_nr_sectors * 512; } + ret = 0; - return 0; -} - -static QCowAIOCB *qcow2_aio_setup(BlockDriverState *bs, int64_t sector_num, - QEMUIOVector *qiov, int nb_sectors, - BlockDriverCompletionFunc *cb, - void *opaque, QCowAIOCB *acb) -{ - memset(acb, 0, sizeof(*acb)); - acb->bs = bs; - acb->sector_num = sector_num; - acb->qiov = qiov; - - qemu_iovec_init(&acb->hd_qiov, qiov->niov); - - acb->bytes_done = 0; - acb->remaining_sectors = nb_sectors; - return acb; -} - -static int qcow2_co_readv(BlockDriverState *bs, int64_t sector_num, - int nb_sectors, QEMUIOVector *qiov) -{ - BDRVQcowState *s = bs->opaque; - QCowAIOCB acb; - int ret; - - qcow2_aio_setup(bs, sector_num, qiov, nb_sectors, NULL, NULL, &acb); - - qemu_co_mutex_lock(&s->lock); - do { - ret = qcow2_aio_read_cb(&acb); - } while (ret > 0); +fail: qemu_co_mutex_unlock(&s->lock); - qemu_iovec_destroy(&acb.hd_qiov); + qemu_iovec_destroy(&hd_qiov); return ret; } @@ -548,13 +511,11 @@ static void run_dependent_requests(BDRVQcowState *s, QCowL2Meta *m) } } -/* - * Returns 0 when the request is completed successfully, 1 when there is still - * a part left to do and -errno in error cases. - */ -static int qcow2_aio_write_cb(QCowAIOCB *acb) +static int qcow2_co_writev(BlockDriverState *bs, + int64_t sector_num, + int remaining_sectors, + QEMUIOVector *qiov) { - BlockDriverState *bs = acb->bs; BDRVQcowState *s = bs->opaque; int index_in_cluster; int n_end; @@ -562,47 +523,56 @@ static int qcow2_aio_write_cb(QCowAIOCB *acb) int cur_nr_sectors; /* number of sectors in current iteration */ QCowL2Meta l2meta; uint64_t cluster_offset; + QEMUIOVector hd_qiov; + uint64_t bytes_done = 0; + uint8_t *cluster_data = NULL; l2meta.nb_clusters = 0; qemu_co_queue_init(&l2meta.dependent_requests); - while (acb->remaining_sectors != 0) { + qemu_iovec_init(&hd_qiov, qiov->niov); + + s->cluster_cache_offset = -1; /* disable compressed cache */ + + qemu_co_mutex_lock(&s->lock); - index_in_cluster = acb->sector_num & (s->cluster_sectors - 1); - n_end = index_in_cluster + acb->remaining_sectors; + while (remaining_sectors != 0) { + + index_in_cluster = sector_num & (s->cluster_sectors - 1); + n_end = index_in_cluster + remaining_sectors; if (s->crypt_method && n_end > QCOW_MAX_CRYPT_CLUSTERS * s->cluster_sectors) { n_end = QCOW_MAX_CRYPT_CLUSTERS * s->cluster_sectors; } - ret = qcow2_alloc_cluster_offset(bs, acb->sector_num << 9, + ret = qcow2_alloc_cluster_offset(bs, sector_num << 9, index_in_cluster, n_end, &cur_nr_sectors, &l2meta); if (ret < 0) { - return ret; + goto fail; } cluster_offset = l2meta.cluster_offset; assert((cluster_offset & 511) == 0); - qemu_iovec_reset(&acb->hd_qiov); - qemu_iovec_copy(&acb->hd_qiov, acb->qiov, acb->bytes_done, + qemu_iovec_reset(&hd_qiov); + qemu_iovec_copy(&hd_qiov, qiov, bytes_done, cur_nr_sectors * 512); if (s->crypt_method) { - if (!acb->cluster_data) { - acb->cluster_data = qemu_mallocz(QCOW_MAX_CRYPT_CLUSTERS * + if (!cluster_data) { + cluster_data = qemu_mallocz(QCOW_MAX_CRYPT_CLUSTERS * s->cluster_size); } - assert(acb->hd_qiov.size <= + assert(hd_qiov.size <= QCOW_MAX_CRYPT_CLUSTERS * s->cluster_size); - qemu_iovec_to_buffer(&acb->hd_qiov, acb->cluster_data); + qemu_iovec_to_buffer(&hd_qiov, cluster_data); - qcow2_encrypt_sectors(s, acb->sector_num, acb->cluster_data, - acb->cluster_data, cur_nr_sectors, 1, &s->aes_encrypt_key); + qcow2_encrypt_sectors(s, sector_num, cluster_data, + cluster_data, cur_nr_sectors, 1, &s->aes_encrypt_key); - qemu_iovec_reset(&acb->hd_qiov); - qemu_iovec_add(&acb->hd_qiov, acb->cluster_data, + qemu_iovec_reset(&hd_qiov); + qemu_iovec_add(&hd_qiov, cluster_data, cur_nr_sectors * 512); } @@ -610,10 +580,10 @@ static int qcow2_aio_write_cb(QCowAIOCB *acb) qemu_co_mutex_unlock(&s->lock); ret = bdrv_co_writev(bs->file, (cluster_offset >> 9) + index_in_cluster, - cur_nr_sectors, &acb->hd_qiov); + cur_nr_sectors, &hd_qiov); qemu_co_mutex_lock(&s->lock); if (ret < 0) { - return ret; + goto fail; } ret = qcow2_alloc_cluster_link_l2(bs, &l2meta); @@ -621,36 +591,19 @@ static int qcow2_aio_write_cb(QCowAIOCB *acb) run_dependent_requests(s, &l2meta); if (ret < 0) { - return ret; + goto fail; } - acb->remaining_sectors -= cur_nr_sectors; - acb->sector_num += cur_nr_sectors; - acb->bytes_done += cur_nr_sectors * 512; + remaining_sectors -= cur_nr_sectors; + sector_num += cur_nr_sectors; + bytes_done += cur_nr_sectors * 512; } + ret = 0; - return 0; -} - -static int qcow2_co_writev(BlockDriverState *bs, - int64_t sector_num, - int nb_sectors, - QEMUIOVector *qiov) -{ - BDRVQcowState *s = bs->opaque; - QCowAIOCB acb; - int ret; - - qcow2_aio_setup(bs, sector_num, qiov, nb_sectors, NULL, NULL, &acb); - s->cluster_cache_offset = -1; /* disable compressed cache */ - - qemu_co_mutex_lock(&s->lock); - do { - ret = qcow2_aio_write_cb(&acb); - } while (ret > 0); +fail: qemu_co_mutex_unlock(&s->lock); - qemu_iovec_destroy(&acb.hd_qiov); + qemu_iovec_destroy(&hd_qiov); return ret; }