[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 09/25] nbd: add support for NBD_CMD_TRIM
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 09/25] nbd: add support for NBD_CMD_TRIM |
Date: |
Tue, 6 Dec 2011 16:27:36 +0100 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
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;
--
1.7.7.1
- [Qemu-devel] [PATCH 00/25] nbd asynchronous operation, Paolo Bonzini, 2011/12/06
- [Qemu-devel] [PATCH 01/25] add qemu_send_full and qemu_recv_full, Paolo Bonzini, 2011/12/06
- [Qemu-devel] [PATCH 03/25] nbd: switch to asynchronous operation, Paolo Bonzini, 2011/12/06
- [Qemu-devel] [PATCH 05/25] nbd: allow multiple in-flight requests, Paolo Bonzini, 2011/12/06
- [Qemu-devel] [PATCH 04/25] nbd: split requests, Paolo Bonzini, 2011/12/06
- [Qemu-devel] [PATCH 02/25] sheepdog: move coroutine send/recv function to generic code, Paolo Bonzini, 2011/12/06
- [Qemu-devel] [PATCH 06/25] nbd: fix error handling in the server, Paolo Bonzini, 2011/12/06
- [Qemu-devel] [PATCH 08/25] nbd: add support for NBD_CMD_FLUSH, Paolo Bonzini, 2011/12/06
- [Qemu-devel] [PATCH 07/25] nbd: add support for NBD_CMD_FLAG_FUA, Paolo Bonzini, 2011/12/06
- [Qemu-devel] [PATCH 09/25] nbd: add support for NBD_CMD_TRIM,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 11/25] qemu-nbd: remove offset argument to nbd_trip, Paolo Bonzini, 2011/12/06
- [Qemu-devel] [PATCH 10/25] Update ioctl order in nbd_init() to detect EBUSY, Paolo Bonzini, 2011/12/06
- [Qemu-devel] [PATCH 16/25] qemu-nbd: more robust handling of invalid requests, Paolo Bonzini, 2011/12/06
- [Qemu-devel] [PATCH 14/25] qemu-nbd: simplify nbd_trip, Paolo Bonzini, 2011/12/06
- [Qemu-devel] [PATCH 12/25] qemu-nbd: remove data_size argument to nbd_trip, Paolo Bonzini, 2011/12/06
- [Qemu-devel] [PATCH 15/25] qemu-nbd: introduce nbd_do_send_reply, Paolo Bonzini, 2011/12/06
- [Qemu-devel] [PATCH 25/25] qemu-nbd: throttle requests, Paolo Bonzini, 2011/12/06
- [Qemu-devel] [PATCH 23/25] qemu-nbd: add client pointer to NBDRequest, Paolo Bonzini, 2011/12/06
- [Qemu-devel] [PATCH 24/25] qemu-nbd: asynchronous operation, Paolo Bonzini, 2011/12/06
- [Qemu-devel] [PATCH 20/25] link the main loop and its dependencies into the tools, Paolo Bonzini, 2011/12/06