From patchwork Mon Aug 20 11:47:58 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benoit Canet X-Patchwork-Id: 178764 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 1F7EB2C00A6 for ; Mon, 20 Aug 2012 22:20:53 +1000 (EST) Received: from localhost ([::1]:39240 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T3QTV-0005xU-6L for incoming@patchwork.ozlabs.org; Mon, 20 Aug 2012 07:48:53 -0400 Received: from eggs.gnu.org ([208.118.235.92]:34205) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T3QSx-0004RY-P5 for qemu-devel@nongnu.org; Mon, 20 Aug 2012 07:48:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T3QSw-0004Ca-Ge for qemu-devel@nongnu.org; Mon, 20 Aug 2012 07:48:19 -0400 Received: from mail-we0-f173.google.com ([74.125.82.173]:61973) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T3QSw-0004B0-AH for qemu-devel@nongnu.org; Mon, 20 Aug 2012 07:48:18 -0400 Received: by mail-we0-f173.google.com with SMTP id z53so3878406wey.4 for ; Mon, 20 Aug 2012 04:48:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=wJJHY7/YTETS8ca1Qh0wi5Ce5LFug+RTY4NXsQp5G3Q=; b=sAGIKGYQOZB7ySXrwRFaHNkiRK0Wtd0ejLEjt0aiGjpiKg14HaWOClUamHmT+SVMkP 7bwwxEhe/AP21wtYufzXyHyMcybyuiMJItRjHFSIjg2/JNvfjtsEz+zwwZI/SXgYfeqi gFgRy6D0MF0oWIO9W5Lxeb5250csPbXnE6tsnQM5Fl1CoE6odvw5mFpv6NZ5UU32Qovn Y0jrmIsVinKsv5hdXTyN+HQ3DzRYxbtZsrEUCuTf75+RZnHjPgSB/SwBxeEWgtlNyitb C2F5Lp6S8q31sX5LYOc3vjwVTtNfZahiBi5bA38dPPaz9fgvPsuZt7Et51/XRDN8q6AJ tX9A== Received: by 10.216.184.196 with SMTP id s46mr6883442wem.66.1345463297878; Mon, 20 Aug 2012 04:48:17 -0700 (PDT) Received: from Laure.box.in.irqsave.net (paradis.irqsave.net. [109.190.18.76]) by mx.google.com with ESMTPS id k20sm27703494wiv.11.2012.08.20.04.48.15 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 20 Aug 2012 04:48:17 -0700 (PDT) From: "=?UTF-8?q?Beno=C3=AEt=20Canet?=" To: qemu-devel@nongnu.org Date: Mon, 20 Aug 2012 13:47:58 +0200 Message-Id: <1345463283-9684-5-git-send-email-benoit@irqsave.net> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1345463283-9684-1-git-send-email-benoit@irqsave.net> References: <1345463283-9684-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.173 Cc: kwolf@redhat.com, stefanha@linux.vnet.ibm.com, blauwirbel@gmail.com, anthony@codemonkey.ws, pbonzini@redhat.com, eblake@redhat.com, afaerber@suse.de, =?UTF-8?q?Beno=C3=AEt=20Canet?= Subject: [Qemu-devel] [RFC V4 4/9] quorum: Add quorum_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/quorum.c | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 112 insertions(+) diff --git a/block/quorum.c b/block/quorum.c index 70e7216..5c87cec 100644 --- a/block/quorum.c +++ b/block/quorum.c @@ -159,6 +159,116 @@ static void quorum_close(BlockDriverState *bs) g_free(s->bs); } +static void quorum_aio_cancel(BlockDriverAIOCB *blockacb) +{ + QuorumAIOCB *acb = container_of(blockacb, QuorumAIOCB, common); + bool finished = false; + + /* Wait for the request to finish */ + acb->finished = &finished; + while (!finished) { + qemu_aio_wait(); + } +} + +static AIOPool quorum_aio_pool = { + .aiocb_size = sizeof(QuorumAIOCB), + .cancel = quorum_aio_cancel, +}; + +static void quorum_aio_bh(void *opaque) +{ + QuorumAIOCB *acb = opaque; + BDRVQuorumState *s = acb->bqs; + int ret; + + ret = s->threshold <= acb->success_count ? 0 : -EIO; + + qemu_bh_delete(acb->bh); + acb->common.cb(acb->common.opaque, ret); + if (acb->finished) { + *acb->finished = true; + } + g_free(acb->aios); + g_free(acb->qiovs); + qemu_aio_release(acb); +} + +static QuorumAIOCB *quorum_aio_get(BDRVQuorumState *s, + BlockDriverState *bs, + QEMUIOVector *qiov, + int64_t sector_num, + int nb_sectors, + BlockDriverCompletionFunc *cb, + void *opaque) +{ + QuorumAIOCB *acb = qemu_aio_get(&quorum_aio_pool, bs, cb, opaque); + int i; + + acb->aios = g_new0(QuorumSingleAIOCB, s->total); + acb->qiovs = g_new0(QEMUIOVector, s->total); + + acb->bqs = s; + acb->qiov = qiov; + acb->bh = NULL; + acb->count = 0; + acb->success_count = 0; + acb->sector_num = sector_num; + acb->nb_sectors = nb_sectors; + acb->vote = NULL; + acb->vote_ret = 0; + + for (i = 0; i < s->total; i++) { + acb->aios[i].buf = NULL; + acb->aios[i].ret = 0; + acb->aios[i].parent = acb; + } + + return acb; +} + +static void quorum_aio_cb(void *opaque, int ret) +{ + QuorumSingleAIOCB *sacb = opaque; + QuorumAIOCB *acb = sacb->parent; + BDRVQuorumState *s = acb->bqs; + + sacb->ret = ret; + acb->count++; + if (ret == 0) { + acb->success_count++; + } + assert(acb->count <= s->total); + assert(acb->success_count <= s->total); + if (acb->count < s->total) { + return; + } + + acb->bh = qemu_bh_new(quorum_aio_bh, acb); + qemu_bh_schedule(acb->bh); +} + +static BlockDriverAIOCB *quorum_aio_writev(BlockDriverState *bs, + int64_t sector_num, + QEMUIOVector *qiov, + int nb_sectors, + BlockDriverCompletionFunc *cb, + void *opaque) +{ + BDRVQuorumState *s = bs->opaque; + QuorumAIOCB *acb = quorum_aio_get(s, bs, qiov, sector_num, nb_sectors, + cb, opaque); + int i; + + for (i = 0; i < s->total; i++) { + acb->aios[i].aiocb = bdrv_aio_writev(s->bs[i], sector_num, qiov, + nb_sectors, &quorum_aio_cb, + &acb->aios[i]); + } + + return &acb->common; +} + static BlockDriver bdrv_quorum = { .format_name = "quorum", .protocol_name = "quorum", @@ -167,6 +277,8 @@ static BlockDriver bdrv_quorum = { .bdrv_file_open = quorum_open, .bdrv_close = quorum_close, + + .bdrv_aio_writev = quorum_aio_writev, }; static void bdrv_quorum_init(void)