From patchwork Mon Apr 2 17:35:50 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Yuan X-Patchwork-Id: 150224 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 8D4CCB6EF3 for ; Tue, 3 Apr 2012 04:47:25 +1000 (EST) Received: from localhost ([::1]:58377 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SElrc-0002Yx-Ow for incoming@patchwork.ozlabs.org; Mon, 02 Apr 2012 14:20:24 -0400 Received: from eggs.gnu.org ([208.118.235.92]:51923) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SElAp-0007S1-74 for qemu-devel@nongnu.org; Mon, 02 Apr 2012 13:36:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SElAj-0000PB-PW for qemu-devel@nongnu.org; Mon, 02 Apr 2012 13:36:10 -0400 Received: from mail-gx0-f173.google.com ([209.85.161.173]:35818) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SElAj-0000Ol-It for qemu-devel@nongnu.org; Mon, 02 Apr 2012 13:36:05 -0400 Received: by ggnp2 with SMTP id p2so1903420ggn.4 for ; Mon, 02 Apr 2012 10:36:02 -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; bh=rKKx7OtHvpKOcRRpBG+lXzn3Qq0DQlDFEFM7zGntvRg=; b=R1hVx0mL8MWZC2eAQP/6VUhO2Alg428Y4sNdIIgqIx88xalPjggyAukca6zfRLxsDS VhrQDS47fFZuHTKpXmJ2Y8rYCcQG12cSFq6nOu8kkxnZHMizV97VolRmcasDreg+MGVF T13ZMuXajPwPfj9U7oJbS+kbaxYbwTGtrnnC5PjfaeH3c+rD1165ZUjxhoHwo971CmSh rQb1lf5ko92NY68CnibpP6N+DW2Q2dl/N8FYWA/vUyXRMDrnPYCEA+SQYDqXdqChRx8o MrutbyB9d52VpOc1sK+ZoKRGK9zk5wBUop528s/46BYQkDaehGmX4e5E1Q4TuZftkPp8 cIFg== Received: by 10.50.180.135 with SMTP id do7mr6356504igc.56.1333388162008; Mon, 02 Apr 2012 10:36:02 -0700 (PDT) Received: from localhost.localdomain ([123.119.187.149]) by mx.google.com with ESMTPS id vr4sm25712523igb.1.2012.04.02.10.35.56 (version=SSLv3 cipher=OTHER); Mon, 02 Apr 2012 10:36:00 -0700 (PDT) From: Liu Yuan To: qemu-devel@nongnu.org, morita.kazutaka@lab.ntt.co.jp Date: Tue, 3 Apr 2012 01:35:50 +0800 Message-Id: <1333388150-12491-1-git-send-email-namei.unix@gmail.com> X-Mailer: git-send-email 1.7.8.2 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.161.173 X-Mailman-Approved-At: Mon, 02 Apr 2012 14:19:54 -0400 Cc: Kevin Wolf Subject: [Qemu-devel] [PATCH] sheepdog: implement SD_OP_FLUSH_VDI operation 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 From: Liu Yuan Flush operation is supposed to flush the write-back cache of sheepdog cluster. By issuing flush operation, we can assure the Guest of data reaching the sheepdog cluster storage. Cc: Kevin Wolf Reviewd-by: MORITA Kazutaka Signed-off-by: Liu Yuan --- block/sheepdog.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 50 insertions(+), 0 deletions(-) diff --git a/block/sheepdog.c b/block/sheepdog.c index 00276f6f..c08c69b 100644 --- a/block/sheepdog.c +++ b/block/sheepdog.c @@ -32,9 +32,11 @@ #define SD_OP_RELEASE_VDI 0x13 #define SD_OP_GET_VDI_INFO 0x14 #define SD_OP_READ_VDIS 0x15 +#define SD_OP_FLUSH_VDI 0x16 #define SD_FLAG_CMD_WRITE 0x01 #define SD_FLAG_CMD_COW 0x02 +#define SD_FLAG_CMD_CACHE 0x04 #define SD_RES_SUCCESS 0x00 /* Success */ #define SD_RES_UNKNOWN 0x01 /* Unknown error */ @@ -179,6 +181,8 @@ typedef struct SheepdogInode { uint32_t data_vdi_id[MAX_DATA_OBJS]; } SheepdogInode; +static int cache_enabled; + /* * 64 bit FNV-1a non-zero initial basis */ @@ -900,6 +904,10 @@ static int coroutine_fn add_aio_request(BDRVSheepdogState *s, AIOReq *aio_req, hdr.flags = SD_FLAG_CMD_WRITE | flags; } + if (cache_enabled) { + hdr.flags |= SD_FLAG_CMD_CACHE; + } + hdr.oid = oid; hdr.cow_oid = old_oid; hdr.copies = s->inode.nr_copies; @@ -965,6 +973,11 @@ static int read_write_object(int fd, char *buf, uint64_t oid, int copies, rlen = datalen; hdr.opcode = SD_OP_READ_OBJ; } + + if (cache_enabled) { + hdr.flags |= SD_FLAG_CMD_CACHE; + } + hdr.oid = oid; hdr.data_length = datalen; hdr.offset = offset; @@ -1011,6 +1024,10 @@ static int sd_open(BlockDriverState *bs, const char *filename, int flags) QLIST_INIT(&s->outstanding_aio_head); s->fd = -1; + if (flags & BDRV_O_CACHE_WB) { + cache_enabled = 1; + } + memset(vdi, 0, sizeof(vdi)); memset(tag, 0, sizeof(tag)); if (parse_vdiname(s, filename, vdi, &snapid, tag) < 0) { @@ -1575,6 +1592,38 @@ static coroutine_fn int sd_co_readv(BlockDriverState *bs, int64_t sector_num, return acb->ret; } +static int coroutine_fn sd_co_flush_to_disk(BlockDriverState *bs) +{ + BDRVSheepdogState *s = bs->opaque; + SheepdogObjReq hdr = { 0 }; + SheepdogObjRsp *rsp = (SheepdogObjRsp *)&hdr; + SheepdogInode *inode = &s->inode; + int fd, ret; + unsigned int wlen = 0, rlen = 0; + + fd = connect_to_sdog(s->addr, s->port); + if (fd < 0) { + return -1; + } + + hdr.opcode = SD_OP_FLUSH_VDI; + hdr.oid = vid_to_vdi_oid(inode->vdi_id); + + ret = do_req(fd, (SheepdogReq *)&hdr, NULL, &wlen, &rlen); + closesocket(fd); + if (ret) { + error_report("failed to send a request to the sheep"); + return -1; + } + + if (rsp->result != SD_RES_SUCCESS) { + error_report("%s", sd_strerror(rsp->result)); + return -1; + } + + return 0; +} + static int sd_snapshot_create(BlockDriverState *bs, QEMUSnapshotInfo *sn_info) { BDRVSheepdogState *s = bs->opaque; @@ -1904,6 +1953,7 @@ BlockDriver bdrv_sheepdog = { .bdrv_co_readv = sd_co_readv, .bdrv_co_writev = sd_co_writev, + .bdrv_co_flush_to_disk = sd_co_flush_to_disk, .bdrv_snapshot_create = sd_snapshot_create, .bdrv_snapshot_goto = sd_snapshot_goto,