From patchwork Tue Dec 6 15:27:36 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 129741 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 C80631007D6 for ; Wed, 7 Dec 2011 03:52:39 +1100 (EST) Received: from localhost ([::1]:55599 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RXwxZ-0003Ex-9H for incoming@patchwork.ozlabs.org; Tue, 06 Dec 2011 10:29:33 -0500 Received: from eggs.gnu.org ([140.186.70.92]:54856) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RXwwt-0001yv-Se for qemu-devel@nongnu.org; Tue, 06 Dec 2011 10:28:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RXwwo-0000Hm-Qk for qemu-devel@nongnu.org; Tue, 06 Dec 2011 10:28:51 -0500 Received: from mail-ey0-f173.google.com ([209.85.215.173]:55812) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RXwwo-0000FN-Kr for qemu-devel@nongnu.org; Tue, 06 Dec 2011 10:28:46 -0500 Received: by mail-ey0-f173.google.com with SMTP id i10so5955043eaa.4 for ; Tue, 06 Dec 2011 07:28:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; bh=e4nu6h+uYF2x1uqTXvZMRMZVLKbIWy5EXX9/mVJzXFE=; b=FVvBPhUJfgjHAmkkqKS0BzzRLuXQQhNux1ZjTIV8Y07IgfKQ02kUt9zA7Dve3yKT9T cE2n/vq5vsgT8f5LVvmf2TiP5QUCl3qqmZQmavRIwZ5FRuMBsW/fElOHxZOl5sAyn15C F2ILyqE7Ch3u1xgshW/VH/jHd9PsL+s6ogHGk= Received: by 10.231.45.205 with SMTP id g13mr3509491ibf.8.1323185325584; Tue, 06 Dec 2011 07:28:45 -0800 (PST) Received: from localhost.localdomain (93-34-178-147.ip50.fastwebnet.it. [93.34.178.147]) by mx.google.com with ESMTPS id ee6sm36334978igc.6.2011.12.06.07.28.43 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 06 Dec 2011 07:28:44 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 6 Dec 2011 16:27:36 +0100 Message-Id: <1323185272-2610-10-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.7.1 In-Reply-To: <1323185272-2610-1-git-send-email-pbonzini@redhat.com> References: <1323185272-2610-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.215.173 Subject: [Qemu-devel] [PATCH 09/25] nbd: add support for NBD_CMD_TRIM 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: Paolo Bonzini --- block/nbd.c | 25 +++++++++++++++++++++++++ nbd.c | 15 +++++++++++++-- 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/block/nbd.c b/block/nbd.c index ece8e7b..bfcda65 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -435,6 +435,30 @@ static int nbd_co_flush(BlockDriverState *bs) return -reply.error; } +static int nbd_co_discard(BlockDriverState *bs, int64_t sector_num, + int nb_sectors) +{ + BDRVNBDState *s = bs->opaque; + struct nbd_request request; + struct nbd_reply reply; + + if (!(s->nbdflags & NBD_FLAG_SEND_TRIM)) { + return 0; + } + request.type = NBD_CMD_TRIM; + request.from = sector_num * 512;; + request.len = nb_sectors * 512; + + nbd_coroutine_start(s, &request); + if (nbd_co_send_request(s, &request, NULL, 0) == -1) { + reply.error = errno; + } else { + nbd_co_receive_reply(s, &request, &reply, NULL, 0); + } + nbd_coroutine_end(s, &request); + return -reply.error; +} + static void nbd_close(BlockDriverState *bs) { BDRVNBDState *s = bs->opaque; @@ -459,6 +483,7 @@ static BlockDriver bdrv_nbd = { .bdrv_co_writev = nbd_co_writev, .bdrv_close = nbd_close, .bdrv_co_flush_to_os = nbd_co_flush, + .bdrv_co_discard = nbd_co_discard, .bdrv_getlength = nbd_getlength, .protocol_name = "nbd", }; diff --git a/nbd.c b/nbd.c index 2aa68e6..d3bf2d1 100644 --- a/nbd.c +++ b/nbd.c @@ -203,8 +203,8 @@ int nbd_negotiate(int csock, off_t size, uint32_t flags) cpu_to_be64w((uint64_t*)(buf + 8), 0x00420281861253LL); cpu_to_be64w((uint64_t*)(buf + 16), size); cpu_to_be32w((uint32_t*)(buf + 24), - flags | NBD_FLAG_HAS_FLAGS | NBD_FLAG_SEND_FLUSH | - NBD_FLAG_SEND_FUA); + flags | NBD_FLAG_HAS_FLAGS | NBD_FLAG_SEND_TRIM | + NBD_FLAG_SEND_FLUSH | NBD_FLAG_SEND_FUA); memset(buf + 28, 0, 124); if (write_sync(csock, buf, sizeof(buf)) != sizeof(buf)) { @@ -723,6 +723,17 @@ int nbd_trip(BlockDriverState *bs, int csock, off_t size, uint64_t dev_offset, if (nbd_send_reply(csock, &reply) == -1) return -1; break; + case NBD_CMD_TRIM: + TRACE("Request type is TRIM"); + ret = bdrv_discard(bs, (request.from + dev_offset) / 512, + request.len / 512); + if (ret < 0) { + LOG("discard failed"); + reply.error = -ret; + } + if (nbd_send_reply(csock, &reply) == -1) + return -1; + break; default: LOG("invalid request type (%u) received", request.type); errno = EINVAL;