From patchwork Tue Apr 23 06:03:33 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Yuan X-Patchwork-Id: 238760 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 5C71B2C00D5 for ; Tue, 23 Apr 2013 16:04:29 +1000 (EST) Received: from localhost ([::1]:51538 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UUWL5-0003YI-GI for incoming@patchwork.ozlabs.org; Tue, 23 Apr 2013 02:04:27 -0400 Received: from eggs.gnu.org ([208.118.235.92]:52174) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UUWKV-0003U6-Dd for qemu-devel@nongnu.org; Tue, 23 Apr 2013 02:03:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UUWKT-0004Ce-W0 for qemu-devel@nongnu.org; Tue, 23 Apr 2013 02:03:51 -0400 Received: from mail-pb0-x22b.google.com ([2607:f8b0:400e:c01::22b]:55845) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UUWKT-0004CS-Mw for qemu-devel@nongnu.org; Tue, 23 Apr 2013 02:03:49 -0400 Received: by mail-pb0-f43.google.com with SMTP id md4so74380pbc.30 for ; Mon, 22 Apr 2013 23:03:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=R+vtKXvKi53L6p86kn+csh3UIyI9/txiu0gA5xOX2fo=; b=Ptgu+U0fCEVOZ6yI6k26izdJOSDFp2L2v0CALAtw+pPD3rR9ZA6Ua6gC2vAm42HBIs 1eSSrYUEg1D7Un+gUuJEe/LI0PSiQ+X66A4lv4CBCvy6scLzWrMdftqxnribue+Cj0MX XY1zldpNT4w//RoNd3cG2J4RDs6jcl+mAT2akpv08ZygfAGkRjNgy2bsRJdktO0TwPjI it5oF77KYqo4PtB2DZmup1hsBHmW2w7ilNErrXtdR1YvMXVGMkwixke3hlYTOvyKrnH2 glgI8w3jMQpWoA8lJtsYcnuhz8rt3YcJW8ezvwydSyuUKjH8GFK5/aDqCt20fWYUwSVk WBgw== X-Received: by 10.68.171.33 with SMTP id ar1mr36748864pbc.195.1366697028964; Mon, 22 Apr 2013 23:03:48 -0700 (PDT) Received: from K55VM-ubuntu.taobao.ali.com ([182.92.247.2]) by mx.google.com with ESMTPS id dr4sm28147086pbb.19.2013.04.22.23.03.44 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 22 Apr 2013 23:03:46 -0700 (PDT) From: Liu Yuan To: qemu-devel@nongnu.org Date: Tue, 23 Apr 2013 14:03:33 +0800 Message-Id: <1366697015-25121-2-git-send-email-namei.unix@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1366697015-25121-1-git-send-email-namei.unix@gmail.com> References: <1366697015-25121-1-git-send-email-namei.unix@gmail.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400e:c01::22b Cc: Kevin Wolf , Paolo Bonzini , sheepdog@lists.wpkg.org, Stefan Hajnoczi , MORITA Kazutaka Subject: [Qemu-devel] [PATCH v4 1/3] sheepdog: add discard/trim support for sheepdog 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 The 'TRIM' command from VM that is to release underlying data storage for better thin-provision is already supported by the Sheepdog. This patch adds the TRIM support at QEMU part. For older Sheepdog that doesn't support it, we return 0(success) to upper layer. Cc: MORITA Kazutaka Cc: Kevin Wolf Cc: Stefan Hajnoczi Cc: Paolo Bonzini Signed-off-by: Liu Yuan --- block/sheepdog.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 63 insertions(+), 1 deletion(-) diff --git a/block/sheepdog.c b/block/sheepdog.c index 1c5b532..c3b7770 100644 --- a/block/sheepdog.c +++ b/block/sheepdog.c @@ -27,6 +27,8 @@ #define SD_OP_CREATE_AND_WRITE_OBJ 0x01 #define SD_OP_READ_OBJ 0x02 #define SD_OP_WRITE_OBJ 0x03 +/* 0x04 is used internally by Sheepdog */ +#define SD_OP_DISCARD_OBJ 0x05 #define SD_OP_NEW_VDI 0x11 #define SD_OP_LOCK_VDI 0x12 @@ -269,6 +271,7 @@ enum AIOCBState { AIOCB_WRITE_UDATA, AIOCB_READ_UDATA, AIOCB_FLUSH_CACHE, + AIOCB_DISCARD_OBJ, }; struct SheepdogAIOCB { @@ -298,6 +301,7 @@ typedef struct BDRVSheepdogState { char name[SD_MAX_VDI_LEN]; bool is_snapshot; uint32_t cache_flags; + bool discard_supported; char *host_spec; bool is_unix; @@ -656,7 +660,7 @@ static void coroutine_fn aio_read_response(void *opaque) int ret; AIOReq *aio_req = NULL; SheepdogAIOCB *acb; - unsigned long idx; + uint64_t idx; if (QLIST_EMPTY(&s->inflight_aio_head)) { goto out; @@ -727,6 +731,21 @@ static void coroutine_fn aio_read_response(void *opaque) rsp.result = SD_RES_SUCCESS; } break; + case AIOCB_DISCARD_OBJ: + switch (rsp.result) { + case SD_RES_INVALID_PARMS: + error_report("sheep(%s) doesn't support discard command", + s->host_spec); + rsp.result = SD_RES_SUCCESS; + s->discard_supported = false; + break; + case SD_RES_SUCCESS: + idx = data_oid_to_idx(aio_req->oid); + s->inode.data_vdi_id[idx] = 0; + break; + default: + break; + } } if (rsp.result != SD_RES_SUCCESS) { @@ -1016,6 +1035,9 @@ static int coroutine_fn add_aio_request(BDRVSheepdogState *s, AIOReq *aio_req, wlen = datalen; hdr.flags = SD_FLAG_CMD_WRITE | flags; break; + case AIOCB_DISCARD_OBJ: + hdr.opcode = SD_OP_DISCARD_OBJ; + break; } if (s->cache_flags) { @@ -1170,6 +1192,7 @@ static int sd_open(BlockDriverState *bs, const char *filename, if (flags & BDRV_O_NOCACHE) { s->cache_flags = SD_FLAG_CMD_DIRECT; } + s->discard_supported = true; if (snapid || tag[0] != '\0') { dprintf("%" PRIx32 " snapshot inode was open.\n", vid); @@ -1633,6 +1656,15 @@ static int coroutine_fn sd_co_rw_vector(void *p) flags = SD_FLAG_CMD_COW; } break; + case AIOCB_DISCARD_OBJ: + /* + * We discard the object only when the whole object is + * 1) allocated 2) trimmed. Otherwise, simply skip it. + */ + if (len != SD_DATA_OBJ_SIZE || inode->data_vdi_id[idx] == 0) { + goto done; + } + break; default: break; } @@ -2078,6 +2110,33 @@ static int sd_load_vmstate(BlockDriverState *bs, uint8_t *data, } +static coroutine_fn int sd_co_discard(BlockDriverState *bs, int64_t sector_num, + int nb_sectors) +{ + SheepdogAIOCB *acb; + QEMUIOVector dummy; + BDRVSheepdogState *s = bs->opaque; + int ret; + + if (!s->discard_supported) { + return 0; + } + + acb = sd_aio_setup(bs, &dummy, sector_num, nb_sectors); + acb->aiocb_type = AIOCB_DISCARD_OBJ; + acb->aio_done_func = sd_finish_aiocb; + + ret = sd_co_rw_vector(acb); + if (ret <= 0) { + qemu_aio_release(acb); + return ret; + } + + qemu_coroutine_yield(); + + return acb->ret; +} + static QEMUOptionParameter sd_create_options[] = { { .name = BLOCK_OPT_SIZE, @@ -2110,6 +2169,7 @@ static 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_co_discard = sd_co_discard, .bdrv_snapshot_create = sd_snapshot_create, .bdrv_snapshot_goto = sd_snapshot_goto, @@ -2135,6 +2195,7 @@ static BlockDriver bdrv_sheepdog_tcp = { .bdrv_co_readv = sd_co_readv, .bdrv_co_writev = sd_co_writev, .bdrv_co_flush_to_disk = sd_co_flush_to_disk, + .bdrv_co_discard = sd_co_discard, .bdrv_snapshot_create = sd_snapshot_create, .bdrv_snapshot_goto = sd_snapshot_goto, @@ -2160,6 +2221,7 @@ static BlockDriver bdrv_sheepdog_unix = { .bdrv_co_readv = sd_co_readv, .bdrv_co_writev = sd_co_writev, .bdrv_co_flush_to_disk = sd_co_flush_to_disk, + .bdrv_co_discard = sd_co_discard, .bdrv_snapshot_create = sd_snapshot_create, .bdrv_snapshot_goto = sd_snapshot_goto,