[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 12/15] nbd: add support for NBD_CMD_TRIM
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH v2 12/15] nbd: add support for NBD_CMD_TRIM |
Date: |
Fri, 16 Sep 2011 16:25:49 +0200 |
Map it to bdrv_discard. The server can also expose NBD_FLAG_SEND_TRIM.
Signed-off-by: Paolo Bonzini <address@hidden>
---
block/nbd.c | 31 +++++++++++++++++++++++++++++++
nbd.c | 13 ++++++++++++-
2 files changed, 43 insertions(+), 1 deletions(-)
diff --git a/block/nbd.c b/block/nbd.c
index 23f83d4..35c15c8 100644
--- a/block/nbd.c
+++ b/block/nbd.c
@@ -276,6 +276,36 @@ static int nbd_flush(BlockDriverState *bs)
return 0;
}
+static int nbd_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.handle = (uint64_t)(intptr_t)bs;
+ request.from = sector_num * 512;;
+ request.len = nb_sectors * 512;
+
+ if (nbd_send_request(s->sock, &request) == -1)
+ return -errno;
+
+ if (nbd_receive_reply(s->sock, &reply) == -1)
+ return -errno;
+
+ if (reply.error !=0)
+ return -reply.error;
+
+ if (reply.handle != request.handle)
+ return -EIO;
+
+ return 0;
+}
+
static void nbd_close(BlockDriverState *bs)
{
BDRVNBDState *s = bs->opaque;
@@ -300,6 +330,7 @@ static BlockDriver bdrv_nbd = {
.bdrv_write = nbd_write,
.bdrv_close = nbd_close,
.bdrv_flush = nbd_flush,
+ .bdrv_discard = nbd_discard,
.bdrv_getlength = nbd_getlength,
.protocol_name = "nbd",
};
diff --git a/nbd.c b/nbd.c
index 7faa08b..5a618c5 100644
--- a/nbd.c
+++ b/nbd.c
@@ -195,7 +195,7 @@ 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 |
+ flags | NBD_FLAG_HAS_FLAGS | NBD_FLAG_SEND_TRIM |
NBD_FLAG_SEND_FLUSH | NBD_FLAG_SEND_FUA);
memset(buf + 28, 0, 124);
@@ -708,6 +708,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;
--
1.7.6
- [Qemu-devel] [PATCH v2 03/15] sheepdog: move coroutine send/recv function to generic code, (continued)
[Qemu-devel] [PATCH v2 04/15] coroutine-io: handle zero returns from recv, Paolo Bonzini, 2011/09/16
[Qemu-devel] [PATCH v2 05/15] block: emulate .bdrv_flush() using .bdrv_aio_flush(), Paolo Bonzini, 2011/09/16
[Qemu-devel] [PATCH v2 06/15] block: group together the plugging of synchronous IO emulation, Paolo Bonzini, 2011/09/16
[Qemu-devel] [PATCH v2 12/15] nbd: add support for NBD_CMD_TRIM,
Paolo Bonzini <=
[Qemu-devel] [PATCH v2 09/15] nbd: fix error handling in the server, Paolo Bonzini, 2011/09/16
[Qemu-devel] [PATCH v2 10/15] nbd: add support for NBD_CMD_FLUSH, Paolo Bonzini, 2011/09/16
[Qemu-devel] [PATCH v2 08/15] block: add bdrv_co_discard and bdrv_aio_discard support, Paolo Bonzini, 2011/09/16
[Qemu-devel] [PATCH v2 07/15] block: add bdrv_co_flush support, Paolo Bonzini, 2011/09/16
[Qemu-devel] [PATCH v2 14/15] nbd: split requests, Paolo Bonzini, 2011/09/16
[Qemu-devel] [PATCH v2 11/15] nbd: add support for NBD_CMD_FLAG_FUA, Paolo Bonzini, 2011/09/16
[Qemu-devel] [PATCH v2 13/15] nbd: switch to asynchronous operation, Paolo Bonzini, 2011/09/16
[Qemu-devel] [PATCH v2 15/15] nbd: allow multiple in-flight requests, Paolo Bonzini, 2011/09/16