ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

file-posix: account discard operations 

This will help to identify how many of the user-issued discard operations
(accounted on a device level) have actually suceeded down on the host file
(even though the numbers will not be exactly the same if non-raw format
driver is used (e.g. qcow2 sending metadata discards)).

Note that these numbers will not include discards triggered by
write-zeroes + MAY_UNMAP calls.

Signed-off-by: Anton Nefedov <anton.nefedov@virtuozzo.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-id: 20190923121737.83281-9-anton.nefedov@virtuozzo.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
This commit is contained in:
Anton Nefedov 2019-09-23 15:17:36 +03:00 committed by Max Reitz
parent 4989ef5781
commit 1c45036636
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
block/file-posix.c
View File

@ -161,6 +161,11 @@ typedef struct BDRVRawState {
bool needs_alignment; bool needs_alignment;
bool drop_cache; bool drop_cache;
bool check_cache_dropped; bool check_cache_dropped;
struct {
uint64_t discard_nb_ok;
uint64_t discard_nb_failed;
uint64_t discard_bytes_ok;
} stats;
PRManager *pr_mgr; PRManager *pr_mgr;
} BDRVRawState; } BDRVRawState;
@ -2660,11 +2665,22 @@ static void coroutine_fn raw_co_invalidate_cache(BlockDriverState *bs,
#endif /* !__linux__ */ #endif /* !__linux__ */
} }
static void raw_account_discard(BDRVRawState *s, uint64_t nbytes, int ret)
{
if (ret) {
s->stats.discard_nb_failed++;
} else {
s->stats.discard_nb_ok++;
s->stats.discard_bytes_ok += nbytes;
}
}
static coroutine_fn int static coroutine_fn int
raw_do_pdiscard(BlockDriverState *bs, int64_t offset, int bytes, bool blkdev) raw_do_pdiscard(BlockDriverState *bs, int64_t offset, int bytes, bool blkdev)
{ {
BDRVRawState *s = bs->opaque; BDRVRawState *s = bs->opaque;
RawPosixAIOData acb; RawPosixAIOData acb;
int ret;
acb = (RawPosixAIOData) { acb = (RawPosixAIOData) {
.bs = bs, .bs = bs,
@ -2678,7 +2694,9 @@ raw_do_pdiscard(BlockDriverState *bs, int64_t offset, int bytes, bool blkdev)
acb.aio_type |= QEMU_AIO_BLKDEV; acb.aio_type |= QEMU_AIO_BLKDEV;
} }
return raw_thread_pool_submit(bs, handle_aiocb_discard, &acb); ret = raw_thread_pool_submit(bs, handle_aiocb_discard, &acb);
raw_account_discard(s, bytes, ret);
return ret;
} }
static coroutine_fn int static coroutine_fn int
@ -3301,10 +3319,12 @@ static int fd_open(BlockDriverState *bs)
static coroutine_fn int static coroutine_fn int
hdev_co_pdiscard(BlockDriverState *bs, int64_t offset, int bytes) hdev_co_pdiscard(BlockDriverState *bs, int64_t offset, int bytes)
{ {
BDRVRawState *s = bs->opaque;
int ret; int ret;
ret = fd_open(bs); ret = fd_open(bs);
if (ret < 0) { if (ret < 0) {
raw_account_discard(s, bytes, ret);
return ret; return ret;
} }
return raw_do_pdiscard(bs, offset, bytes, true); return raw_do_pdiscard(bs, offset, bytes, true);