OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

nbd: Implement server use of NBD FAST_ZERO 

The server side is fairly straightforward: we can always advertise
support for detection of fast zero, and implement it by mapping the
request to the block layer BDRV_REQ_NO_FALLBACK.

Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <20190823143726.27062-5-eblake@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
[eblake: update iotests 223, 233]
This commit is contained in:
Eric Blake 2019-08-23 09:37:25 -05:00
parent f061656cc3
commit b491dbb7f8
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nbd/server.c
View File

@ -1513,7 +1513,8 @@ NBDExport *nbd_export_new(BlockDriverState *bs, uint64_t dev_offset,
exp->nbdflags |= NBD_FLAG_CAN_MULTI_CONN; exp->nbdflags |= NBD_FLAG_CAN_MULTI_CONN;
} }
} else { } else {
exp->nbdflags |= NBD_FLAG_SEND_TRIM | NBD_FLAG_SEND_WRITE_ZEROES; exp->nbdflags |= (NBD_FLAG_SEND_TRIM | NBD_FLAG_SEND_WRITE_ZEROES |
NBD_FLAG_SEND_FAST_ZERO);
} }
assert(size <= INT64_MAX - dev_offset); assert(size <= INT64_MAX - dev_offset);
exp->size = QEMU_ALIGN_DOWN(size, BDRV_SECTOR_SIZE); exp->size = QEMU_ALIGN_DOWN(size, BDRV_SECTOR_SIZE);
@ -2166,7 +2167,7 @@ static int nbd_co_receive_request(NBDRequestData *req, NBDRequest *request,
if (request->type == NBD_CMD_READ && client->structured_reply) { if (request->type == NBD_CMD_READ && client->structured_reply) {
valid_flags |= NBD_CMD_FLAG_DF; valid_flags |= NBD_CMD_FLAG_DF;
} else if (request->type == NBD_CMD_WRITE_ZEROES) { } else if (request->type == NBD_CMD_WRITE_ZEROES) {
valid_flags |= NBD_CMD_FLAG_NO_HOLE; valid_flags |= NBD_CMD_FLAG_NO_HOLE | NBD_CMD_FLAG_FAST_ZERO;
} else if (request->type == NBD_CMD_BLOCK_STATUS) { } else if (request->type == NBD_CMD_BLOCK_STATUS) {
valid_flags |= NBD_CMD_FLAG_REQ_ONE; valid_flags |= NBD_CMD_FLAG_REQ_ONE;
} }
@ -2305,6 +2306,9 @@ static coroutine_fn int nbd_handle_request(NBDClient *client,
if (!(request->flags & NBD_CMD_FLAG_NO_HOLE)) { if (!(request->flags & NBD_CMD_FLAG_NO_HOLE)) {
flags |= BDRV_REQ_MAY_UNMAP; flags |= BDRV_REQ_MAY_UNMAP;
} }
if (request->flags & NBD_CMD_FLAG_FAST_ZERO) {
flags |= BDRV_REQ_NO_FALLBACK;
}
ret = blk_pwrite_zeroes(exp->blk, request->from + exp->dev_offset, ret = blk_pwrite_zeroes(exp->blk, request->from + exp->dev_offset,
request->len, flags); request->len, flags);
return nbd_send_generic_reply(client, request->handle, ret, return nbd_send_generic_reply(client, request->handle, ret,

2
tests/qemu-iotests/223.out
View File

@ -49,7 +49,7 @@ exports available: 2
qemu:dirty-bitmap:b qemu:dirty-bitmap:b
export: 'n2' export: 'n2'
size: 4194304 size: 4194304
flags: 0x4ed ( flush fua trim zeroes df cache ) flags: 0xced ( flush fua trim zeroes df cache fast-zero )
min block: 1 min block: 1
opt block: 4096 opt block: 4096
max block: 33554432 max block: 33554432

2
tests/qemu-iotests/233.out
View File

@ -37,7 +37,7 @@ disk size: unavailable
exports available: 1 exports available: 1
export: '' export: ''
size: 67108864 size: 67108864
flags: 0x4ed ( flush fua trim zeroes df cache ) flags: 0xced ( flush fua trim zeroes df cache fast-zero )
min block: 1 min block: 1
opt block: 4096 opt block: 4096
max block: 33554432 max block: 33554432