|
 |
9ae3a8 |
From 72bba55d794ac3e3ecaadb8e0bc382947b6f17ea Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: Kevin Wolf <kwolf@redhat.com>
|
|
|
9ae3a8 |
Date: Thu, 5 Dec 2013 12:09:38 +0100
|
|
|
9ae3a8 |
Subject: [PATCH 27/37] block: Change coroutine wrapper to byte granularity
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Message-id: <1392117622-28812-28-git-send-email-kwolf@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 57192
|
|
|
9ae3a8 |
O-Subject: [RHEL-7.0 qemu-kvm PATCH v2 27/37] block: Change coroutine wrapper to byte granularity
|
|
|
9ae3a8 |
Bugzilla: 748906
|
|
|
9ae3a8 |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
9ae3a8 |
Reviewed-by: Max Reitz <mreitz@redhat.com>
|
|
|
9ae3a8 |
(cherry picked from commit 775aa8b6e0ea25f8cca74d0fcb1e30a764cf624f)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
block.c | 48 ++++++++++++++++++++++++++----------------------
|
|
|
9ae3a8 |
1 file changed, 26 insertions(+), 22 deletions(-)
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
block.c | 48 ++++++++++++++++++++++++++----------------------
|
|
|
9ae3a8 |
1 files changed, 26 insertions(+), 22 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/block.c b/block.c
|
|
|
9ae3a8 |
index 76de7d2..3b5b706 100644
|
|
|
9ae3a8 |
--- a/block.c
|
|
|
9ae3a8 |
+++ b/block.c
|
|
|
9ae3a8 |
@@ -64,11 +64,11 @@ static int coroutine_fn bdrv_co_readv_em(BlockDriverState *bs,
|
|
|
9ae3a8 |
static int coroutine_fn bdrv_co_writev_em(BlockDriverState *bs,
|
|
|
9ae3a8 |
int64_t sector_num, int nb_sectors,
|
|
|
9ae3a8 |
QEMUIOVector *iov);
|
|
|
9ae3a8 |
-static int coroutine_fn bdrv_co_do_readv(BlockDriverState *bs,
|
|
|
9ae3a8 |
- int64_t sector_num, int nb_sectors, QEMUIOVector *qiov,
|
|
|
9ae3a8 |
+static int coroutine_fn bdrv_co_do_preadv(BlockDriverState *bs,
|
|
|
9ae3a8 |
+ int64_t offset, unsigned int bytes, QEMUIOVector *qiov,
|
|
|
9ae3a8 |
BdrvRequestFlags flags);
|
|
|
9ae3a8 |
-static int coroutine_fn bdrv_co_do_writev(BlockDriverState *bs,
|
|
|
9ae3a8 |
- int64_t sector_num, int nb_sectors, QEMUIOVector *qiov,
|
|
|
9ae3a8 |
+static int coroutine_fn bdrv_co_do_pwritev(BlockDriverState *bs,
|
|
|
9ae3a8 |
+ int64_t offset, unsigned int bytes, QEMUIOVector *qiov,
|
|
|
9ae3a8 |
BdrvRequestFlags flags);
|
|
|
9ae3a8 |
static BlockDriverAIOCB *bdrv_co_aio_rw_vector(BlockDriverState *bs,
|
|
|
9ae3a8 |
int64_t sector_num,
|
|
|
9ae3a8 |
@@ -2404,8 +2404,7 @@ static int bdrv_check_request(BlockDriverState *bs, int64_t sector_num,
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
typedef struct RwCo {
|
|
|
9ae3a8 |
BlockDriverState *bs;
|
|
|
9ae3a8 |
- int64_t sector_num;
|
|
|
9ae3a8 |
- int nb_sectors;
|
|
|
9ae3a8 |
+ int64_t offset;
|
|
|
9ae3a8 |
QEMUIOVector *qiov;
|
|
|
9ae3a8 |
bool is_write;
|
|
|
9ae3a8 |
int ret;
|
|
|
9ae3a8 |
@@ -2417,34 +2416,32 @@ static void coroutine_fn bdrv_rw_co_entry(void *opaque)
|
|
|
9ae3a8 |
RwCo *rwco = opaque;
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
if (!rwco->is_write) {
|
|
|
9ae3a8 |
- rwco->ret = bdrv_co_do_readv(rwco->bs, rwco->sector_num,
|
|
|
9ae3a8 |
- rwco->nb_sectors, rwco->qiov,
|
|
|
9ae3a8 |
- rwco->flags);
|
|
|
9ae3a8 |
- } else {
|
|
|
9ae3a8 |
- rwco->ret = bdrv_co_do_writev(rwco->bs, rwco->sector_num,
|
|
|
9ae3a8 |
- rwco->nb_sectors, rwco->qiov,
|
|
|
9ae3a8 |
+ rwco->ret = bdrv_co_do_preadv(rwco->bs, rwco->offset,
|
|
|
9ae3a8 |
+ rwco->qiov->size, rwco->qiov,
|
|
|
9ae3a8 |
rwco->flags);
|
|
|
9ae3a8 |
+ } else {
|
|
|
9ae3a8 |
+ rwco->ret = bdrv_co_do_pwritev(rwco->bs, rwco->offset,
|
|
|
9ae3a8 |
+ rwco->qiov->size, rwco->qiov,
|
|
|
9ae3a8 |
+ rwco->flags);
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
/*
|
|
|
9ae3a8 |
* Process a vectored synchronous request using coroutines
|
|
|
9ae3a8 |
*/
|
|
|
9ae3a8 |
-static int bdrv_rwv_co(BlockDriverState *bs, int64_t sector_num,
|
|
|
9ae3a8 |
- QEMUIOVector *qiov, bool is_write,
|
|
|
9ae3a8 |
- BdrvRequestFlags flags)
|
|
|
9ae3a8 |
+static int bdrv_prwv_co(BlockDriverState *bs, int64_t offset,
|
|
|
9ae3a8 |
+ QEMUIOVector *qiov, bool is_write,
|
|
|
9ae3a8 |
+ BdrvRequestFlags flags)
|
|
|
9ae3a8 |
{
|
|
|
9ae3a8 |
Coroutine *co;
|
|
|
9ae3a8 |
RwCo rwco = {
|
|
|
9ae3a8 |
.bs = bs,
|
|
|
9ae3a8 |
- .sector_num = sector_num,
|
|
|
9ae3a8 |
- .nb_sectors = qiov->size >> BDRV_SECTOR_BITS,
|
|
|
9ae3a8 |
+ .offset = offset,
|
|
|
9ae3a8 |
.qiov = qiov,
|
|
|
9ae3a8 |
.is_write = is_write,
|
|
|
9ae3a8 |
.ret = NOT_DONE,
|
|
|
9ae3a8 |
.flags = flags,
|
|
|
9ae3a8 |
};
|
|
|
9ae3a8 |
- assert((qiov->size & (BDRV_SECTOR_SIZE - 1)) == 0);
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
/**
|
|
|
9ae3a8 |
* In sync call context, when the vcpu is blocked, this throttling timer
|
|
|
9ae3a8 |
@@ -2483,7 +2480,8 @@ static int bdrv_rw_co(BlockDriverState *bs, int64_t sector_num, uint8_t *buf,
|
|
|
9ae3a8 |
};
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
qemu_iovec_init_external(&qiov, &iov, 1);
|
|
|
9ae3a8 |
- return bdrv_rwv_co(bs, sector_num, &qiov, is_write, flags);
|
|
|
9ae3a8 |
+ return bdrv_prwv_co(bs, sector_num << BDRV_SECTOR_BITS,
|
|
|
9ae3a8 |
+ &qiov, is_write, flags);
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
/* return < 0 if error. See bdrv_write() for the return codes */
|
|
|
9ae3a8 |
@@ -2521,7 +2519,7 @@ int bdrv_write(BlockDriverState *bs, int64_t sector_num,
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
int bdrv_writev(BlockDriverState *bs, int64_t sector_num, QEMUIOVector *qiov)
|
|
|
9ae3a8 |
{
|
|
|
9ae3a8 |
- return bdrv_rwv_co(bs, sector_num, qiov, true, 0);
|
|
|
9ae3a8 |
+ return bdrv_prwv_co(bs, sector_num << BDRV_SECTOR_BITS, qiov, true, 0);
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
int bdrv_write_zeroes(BlockDriverState *bs, int64_t sector_num,
|
|
|
9ae3a8 |
@@ -4793,9 +4791,15 @@ int bdrv_flush(BlockDriverState *bs)
|
|
|
9ae3a8 |
return rwco.ret;
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
+typedef struct DiscardCo {
|
|
|
9ae3a8 |
+ BlockDriverState *bs;
|
|
|
9ae3a8 |
+ int64_t sector_num;
|
|
|
9ae3a8 |
+ int nb_sectors;
|
|
|
9ae3a8 |
+ int ret;
|
|
|
9ae3a8 |
+} DiscardCo;
|
|
|
9ae3a8 |
static void coroutine_fn bdrv_discard_co_entry(void *opaque)
|
|
|
9ae3a8 |
{
|
|
|
9ae3a8 |
- RwCo *rwco = opaque;
|
|
|
9ae3a8 |
+ DiscardCo *rwco = opaque;
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
rwco->ret = bdrv_co_discard(rwco->bs, rwco->sector_num, rwco->nb_sectors);
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
@@ -4881,7 +4885,7 @@ int coroutine_fn bdrv_co_discard(BlockDriverState *bs, int64_t sector_num,
|
|
|
9ae3a8 |
int bdrv_discard(BlockDriverState *bs, int64_t sector_num, int nb_sectors)
|
|
|
9ae3a8 |
{
|
|
|
9ae3a8 |
Coroutine *co;
|
|
|
9ae3a8 |
- RwCo rwco = {
|
|
|
9ae3a8 |
+ DiscardCo rwco = {
|
|
|
9ae3a8 |
.bs = bs,
|
|
|
9ae3a8 |
.sector_num = sector_num,
|
|
|
9ae3a8 |
.nb_sectors = nb_sectors,
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.7.1
|
|
|
9ae3a8 |
|