From patchwork Thu Aug 2 10:16:39 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benoit Canet X-Patchwork-Id: 174725 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 18B152C008B for ; Thu, 2 Aug 2012 20:56:22 +1000 (EST) Received: from localhost ([::1]:37289 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SwsU7-0000tz-BP for incoming@patchwork.ozlabs.org; Thu, 02 Aug 2012 06:18:27 -0400 Received: from eggs.gnu.org ([208.118.235.92]:36529) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SwsSt-0006TK-1Z for qemu-devel@nongnu.org; Thu, 02 Aug 2012 06:17:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SwsSr-0003zq-Gk for qemu-devel@nongnu.org; Thu, 02 Aug 2012 06:17:10 -0400 Received: from mail-wg0-f53.google.com ([74.125.82.53]:35133) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SwsSr-0003zP-9t for qemu-devel@nongnu.org; Thu, 02 Aug 2012 06:17:09 -0400 Received: by wgbfm10 with SMTP id fm10so6227510wgb.10 for ; Thu, 02 Aug 2012 03:17:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=e1gcAB/iyFRo0jAhUaNTxhiGuyZOk2p29jgLYARbEO8=; b=VMQP8gGUsJlmwWAXEJUVPH/vqoJwf/Ic4xWBzKniWpi07v2CNEjI+L1FzKLjhUJBpG kP0y6mzpljah+mj4Y6D0X6YXRKPL32xF8TfYDaQJSTBfLxLyVh0zIhhEvs5bMdQyBEk9 RU32mQKUKzRKoJi0cdX/ZgWuAF1k38+HVu7h/q0zqu4SnAu8VhETFsua6v3GhChE3hFo mQMrQq86/p2AayHxnCM1RrAxb5IHYpXAvTJLBnZHSFHZmWMOOV3AFlzYwZNbbx31PHpH ubOmTP4AkxSjR+WguVEA8lX5UpQDp8H6UHuxcks5QvWcFD1a1dST6O1gi8FGIubheqPa wnwQ== Received: by 10.180.82.164 with SMTP id j4mr3452267wiy.18.1343902628543; Thu, 02 Aug 2012 03:17:08 -0700 (PDT) Received: from Laure.box.in.irqsave.net (paradis.irqsave.net. [109.190.18.76]) by mx.google.com with ESMTPS id bc2sm16181243wib.0.2012.08.02.03.17.07 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 02 Aug 2012 03:17:07 -0700 (PDT) From: "=?UTF-8?q?Beno=C3=AEt=20Canet?=" To: qemu-devel@nongnu.org Date: Thu, 2 Aug 2012 12:16:39 +0200 Message-Id: <1343902604-13981-8-git-send-email-benoit@irqsave.net> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1343902604-13981-1-git-send-email-benoit@irqsave.net> References: <1343902604-13981-1-git-send-email-benoit@irqsave.net> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 74.125.82.53 Cc: kwolf@redhat.com, pbonzini@redhat.com, stefanha@linux.vnet.ibm.com, =?UTF-8?q?Beno=C3=AEt=20Canet?= Subject: [Qemu-devel] [RFC 07/12] qorum: Add qorum_aio_writev and its dependencies. 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: Benoit Canet --- block/qorum.c | 112 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 112 insertions(+) diff --git a/block/qorum.c b/block/qorum.c index 37f6514..3dae8e4 100644 --- a/block/qorum.c +++ b/block/qorum.c @@ -134,6 +134,116 @@ static int64_t qorum_getlength(BlockDriverState *bs) return ret; } +static void qorum_aio_cancel(BlockDriverAIOCB *blockacb) +{ + QorumAIOCB *acb = container_of(blockacb, QorumAIOCB, common); + bool finished = false; + + /* Wait for the request to finish */ + acb->finished = &finished; + while (!finished) { + qemu_aio_wait(); + } +} + +static AIOPool qorum_aio_pool = { + .aiocb_size = sizeof(QorumAIOCB), + .cancel = qorum_aio_cancel, +}; + +static int qorum_check_ret(QorumAIOCB *acb) +{ + int i, j; + + for (i = 0, j = 0; i <= 2; i++) { + if (acb->aios[0].ret) { + j++; + } + } + + if (j > 1) { + return -EIO; + } + + return 0; +} + +static void qorum_aio_bh(void *opaque) +{ + QorumAIOCB *acb = opaque; + + qemu_bh_delete(acb->bh); + acb->common.cb(acb->common.opaque, qorum_check_ret(acb)); + if (acb->finished) { + *acb->finished = true; + } + qemu_aio_release(acb); +} + +static QorumAIOCB *qorum_aio_get(BlockDriverState *bs, + QEMUIOVector *qiov, + bool is_write, + int64_t sector_num, + int nb_sectors, + BlockDriverCompletionFunc *cb, + void *opaque) +{ + QorumAIOCB *acb = qemu_aio_get(&qorum_aio_pool, bs, cb, opaque); + int i; + + acb->qiov = qiov; + acb->bh = NULL; + acb->count = 0; + acb->is_write = is_write; + acb->sector_num = sector_num; + acb->nb_sectors = nb_sectors; + acb->vote = NULL; + acb->vote_ret = 0; + + for (i = 0; i <= 2; i++) { + acb->aios[i].buf = NULL; + acb->aios[i].ret = 0; + acb->aios[i].parent = acb; + } + + return acb; +} + +static void qorum_aio_cb(void *opaque, int ret) +{ + QorumSingleAIOCB *sacb = opaque; + QorumAIOCB *acb = sacb->parent; + + sacb->ret = ret; + acb->count++; + assert(acb->count <= 3); + if (acb->count == 3) { + acb->bh = qemu_bh_new(qorum_aio_bh, acb); + qemu_bh_schedule(acb->bh); + } +} + +static BlockDriverAIOCB *qorum_aio_writev(BlockDriverState *bs, + int64_t sector_num, + QEMUIOVector *qiov, + int nb_sectors, + BlockDriverCompletionFunc *cb, + void *opaque) +{ + BDRVQorumState *s = bs->opaque; + QorumAIOCB *acb = qorum_aio_get(bs, qiov, true, sector_num, nb_sectors, + cb, opaque); + int i; + + for (i = 0; i <= 2; i++) { + acb->aios[i].aiocb = bdrv_aio_writev(s->bs[i], sector_num, qiov, + nb_sectors, &qorum_aio_cb, + &acb->aios[i]); + } + + return &acb->common; +} + static BlockDriver bdrv_qorum = { .format_name = "qorum", .protocol_name = "qorum", @@ -144,6 +254,8 @@ static BlockDriver bdrv_qorum = { .bdrv_file_open = qorum_open, .bdrv_close = qorum_close, + + .bdrv_aio_writev = qorum_aio_writev, }; static void bdrv_qorum_init(void)