mirror of https://github.com/xqemu/xqemu.git
ide: issue discard asynchronously but serialize the pieces
Now that discard can take a long time, make it asynchronous. Each LBA range entry is processed separately because discard can be an expensive operation. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
parent
80bc2e8d80
commit
501378c3af
|
@ -325,14 +325,26 @@ typedef struct TrimAIOCB {
|
||||||
BlockDriverAIOCB common;
|
BlockDriverAIOCB common;
|
||||||
QEMUBH *bh;
|
QEMUBH *bh;
|
||||||
int ret;
|
int ret;
|
||||||
|
QEMUIOVector *qiov;
|
||||||
|
BlockDriverAIOCB *aiocb;
|
||||||
|
int i, j;
|
||||||
} TrimAIOCB;
|
} TrimAIOCB;
|
||||||
|
|
||||||
static void trim_aio_cancel(BlockDriverAIOCB *acb)
|
static void trim_aio_cancel(BlockDriverAIOCB *acb)
|
||||||
{
|
{
|
||||||
TrimAIOCB *iocb = container_of(acb, TrimAIOCB, common);
|
TrimAIOCB *iocb = container_of(acb, TrimAIOCB, common);
|
||||||
|
|
||||||
|
/* Exit the loop in case bdrv_aio_cancel calls ide_issue_trim_cb again. */
|
||||||
|
iocb->j = iocb->qiov->niov - 1;
|
||||||
|
iocb->i = (iocb->qiov->iov[iocb->j].iov_len / 8) - 1;
|
||||||
|
|
||||||
|
/* Tell ide_issue_trim_cb not to trigger the completion, too. */
|
||||||
qemu_bh_delete(iocb->bh);
|
qemu_bh_delete(iocb->bh);
|
||||||
iocb->bh = NULL;
|
iocb->bh = NULL;
|
||||||
|
|
||||||
|
if (iocb->aiocb) {
|
||||||
|
bdrv_aio_cancel(iocb->aiocb);
|
||||||
|
}
|
||||||
qemu_aio_release(iocb);
|
qemu_aio_release(iocb);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -349,43 +361,60 @@ static void ide_trim_bh_cb(void *opaque)
|
||||||
|
|
||||||
qemu_bh_delete(iocb->bh);
|
qemu_bh_delete(iocb->bh);
|
||||||
iocb->bh = NULL;
|
iocb->bh = NULL;
|
||||||
|
|
||||||
qemu_aio_release(iocb);
|
qemu_aio_release(iocb);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void ide_issue_trim_cb(void *opaque, int ret)
|
||||||
|
{
|
||||||
|
TrimAIOCB *iocb = opaque;
|
||||||
|
if (ret >= 0) {
|
||||||
|
while (iocb->j < iocb->qiov->niov) {
|
||||||
|
int j = iocb->j;
|
||||||
|
while (++iocb->i < iocb->qiov->iov[j].iov_len / 8) {
|
||||||
|
int i = iocb->i;
|
||||||
|
uint64_t *buffer = iocb->qiov->iov[j].iov_base;
|
||||||
|
|
||||||
|
/* 6-byte LBA + 2-byte range per entry */
|
||||||
|
uint64_t entry = le64_to_cpu(buffer[i]);
|
||||||
|
uint64_t sector = entry & 0x0000ffffffffffffULL;
|
||||||
|
uint16_t count = entry >> 48;
|
||||||
|
|
||||||
|
if (count == 0) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Got an entry! Submit and exit. */
|
||||||
|
iocb->aiocb = bdrv_aio_discard(iocb->common.bs, sector, count,
|
||||||
|
ide_issue_trim_cb, opaque);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
iocb->j++;
|
||||||
|
iocb->i = -1;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
iocb->ret = ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
iocb->aiocb = NULL;
|
||||||
|
if (iocb->bh) {
|
||||||
|
qemu_bh_schedule(iocb->bh);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
BlockDriverAIOCB *ide_issue_trim(BlockDriverState *bs,
|
BlockDriverAIOCB *ide_issue_trim(BlockDriverState *bs,
|
||||||
int64_t sector_num, QEMUIOVector *qiov, int nb_sectors,
|
int64_t sector_num, QEMUIOVector *qiov, int nb_sectors,
|
||||||
BlockDriverCompletionFunc *cb, void *opaque)
|
BlockDriverCompletionFunc *cb, void *opaque)
|
||||||
{
|
{
|
||||||
TrimAIOCB *iocb;
|
TrimAIOCB *iocb;
|
||||||
int i, j, ret;
|
|
||||||
|
|
||||||
iocb = qemu_aio_get(&trim_aiocb_info, bs, cb, opaque);
|
iocb = qemu_aio_get(&trim_aiocb_info, bs, cb, opaque);
|
||||||
iocb->bh = qemu_bh_new(ide_trim_bh_cb, iocb);
|
iocb->bh = qemu_bh_new(ide_trim_bh_cb, iocb);
|
||||||
iocb->ret = 0;
|
iocb->ret = 0;
|
||||||
|
iocb->qiov = qiov;
|
||||||
for (j = 0; j < qiov->niov; j++) {
|
iocb->i = -1;
|
||||||
uint64_t *buffer = qiov->iov[j].iov_base;
|
iocb->j = 0;
|
||||||
|
ide_issue_trim_cb(iocb, 0);
|
||||||
for (i = 0; i < qiov->iov[j].iov_len / 8; i++) {
|
|
||||||
/* 6-byte LBA + 2-byte range per entry */
|
|
||||||
uint64_t entry = le64_to_cpu(buffer[i]);
|
|
||||||
uint64_t sector = entry & 0x0000ffffffffffffULL;
|
|
||||||
uint16_t count = entry >> 48;
|
|
||||||
|
|
||||||
if (count == 0) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
ret = bdrv_discard(bs, sector, count);
|
|
||||||
if (!iocb->ret) {
|
|
||||||
iocb->ret = ret;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
qemu_bh_schedule(iocb->bh);
|
|
||||||
|
|
||||||
return &iocb->common;
|
return &iocb->common;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue