|
 |
9ae3a8 |
From d6a03733e6755d4b59f8009239af8f0a3e12c171 Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: Kevin Wolf <kwolf@redhat.com>
|
|
|
9ae3a8 |
Date: Tue, 3 Dec 2013 14:02:23 +0100
|
|
|
9ae3a8 |
Subject: [PATCH 13/37] block: Introduce bdrv_aligned_pwritev()
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Message-id: <1392117622-28812-14-git-send-email-kwolf@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 57178
|
|
|
9ae3a8 |
O-Subject: [RHEL-7.0 qemu-kvm PATCH v2 13/37] block: Introduce bdrv_aligned_pwritev()
|
|
|
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 |
This separates the part of bdrv_co_do_writev() that needs to happen
|
|
|
9ae3a8 |
before the request is modified to match the backend alignment, and a
|
|
|
9ae3a8 |
part that needs to be executed afterwards and passes the request to the
|
|
|
9ae3a8 |
BlockDriver.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
9ae3a8 |
Reviewed-by: Max Reitz <mreitz@redhat.com>
|
|
|
9ae3a8 |
Reviewed-by: Benoit Canet <benoit@irqsave.net>
|
|
|
9ae3a8 |
(cherry picked from commit b404f72036716ab8ace04b83a8f0a93be4739a6a)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Conflicts:
|
|
|
9ae3a8 |
block.c
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Conflict because RHEL 7 still has the old I/O throttling code.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
block.c | 62 +++++++++++++++++++++++++++++++++++++++++---------------------
|
|
|
9ae3a8 |
1 file changed, 41 insertions(+), 21 deletions(-)
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
block.c | 62 +++++++++++++++++++++++++++++++++++++++++---------------------
|
|
|
9ae3a8 |
1 files changed, 41 insertions(+), 21 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/block.c b/block.c
|
|
|
9ae3a8 |
index ce3edb0..e6b6ed4 100644
|
|
|
9ae3a8 |
--- a/block.c
|
|
|
9ae3a8 |
+++ b/block.c
|
|
|
9ae3a8 |
@@ -2982,34 +2982,20 @@ static int coroutine_fn bdrv_co_do_write_zeroes(BlockDriverState *bs,
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
/*
|
|
|
9ae3a8 |
- * Handle a write request in coroutine context
|
|
|
9ae3a8 |
+ * Forwards an already correctly aligned write request to the BlockDriver.
|
|
|
9ae3a8 |
*/
|
|
|
9ae3a8 |
-static int coroutine_fn bdrv_co_do_writev(BlockDriverState *bs,
|
|
|
9ae3a8 |
- int64_t sector_num, int nb_sectors, QEMUIOVector *qiov,
|
|
|
9ae3a8 |
- BdrvRequestFlags flags)
|
|
|
9ae3a8 |
+static int coroutine_fn bdrv_aligned_pwritev(BlockDriverState *bs,
|
|
|
9ae3a8 |
+ int64_t offset, unsigned int bytes, QEMUIOVector *qiov, int flags)
|
|
|
9ae3a8 |
{
|
|
|
9ae3a8 |
BlockDriver *drv = bs->drv;
|
|
|
9ae3a8 |
BdrvTrackedRequest req;
|
|
|
9ae3a8 |
int ret;
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
- if (!bs->drv) {
|
|
|
9ae3a8 |
- return -ENOMEDIUM;
|
|
|
9ae3a8 |
- }
|
|
|
9ae3a8 |
- if (bs->read_only) {
|
|
|
9ae3a8 |
- return -EACCES;
|
|
|
9ae3a8 |
- }
|
|
|
9ae3a8 |
- if (bdrv_check_request(bs, sector_num, nb_sectors)) {
|
|
|
9ae3a8 |
- return -EIO;
|
|
|
9ae3a8 |
- }
|
|
|
9ae3a8 |
-
|
|
|
9ae3a8 |
- /* throttling disk write I/O */
|
|
|
9ae3a8 |
- if (bs->io_limits_enabled) {
|
|
|
9ae3a8 |
- bdrv_io_limits_intercept(bs, true, nb_sectors);
|
|
|
9ae3a8 |
- }
|
|
|
9ae3a8 |
+ int64_t sector_num = offset >> BDRV_SECTOR_BITS;
|
|
|
9ae3a8 |
+ unsigned int nb_sectors = bytes >> BDRV_SECTOR_BITS;
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
- if (bs->copy_on_read_in_flight) {
|
|
|
9ae3a8 |
- wait_for_overlapping_requests(bs, sector_num, nb_sectors);
|
|
|
9ae3a8 |
- }
|
|
|
9ae3a8 |
+ assert((offset & (BDRV_SECTOR_SIZE - 1)) == 0);
|
|
|
9ae3a8 |
+ assert((bytes & (BDRV_SECTOR_SIZE - 1)) == 0);
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
tracked_request_begin(&req, bs, sector_num, nb_sectors, true);
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
@@ -3039,6 +3025,40 @@ static int coroutine_fn bdrv_co_do_writev(BlockDriverState *bs,
|
|
|
9ae3a8 |
return ret;
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
+/*
|
|
|
9ae3a8 |
+ * Handle a write request in coroutine context
|
|
|
9ae3a8 |
+ */
|
|
|
9ae3a8 |
+static int coroutine_fn bdrv_co_do_writev(BlockDriverState *bs,
|
|
|
9ae3a8 |
+ int64_t sector_num, int nb_sectors, QEMUIOVector *qiov,
|
|
|
9ae3a8 |
+ BdrvRequestFlags flags)
|
|
|
9ae3a8 |
+{
|
|
|
9ae3a8 |
+ int ret;
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
+ if (!bs->drv) {
|
|
|
9ae3a8 |
+ return -ENOMEDIUM;
|
|
|
9ae3a8 |
+ }
|
|
|
9ae3a8 |
+ if (bs->read_only) {
|
|
|
9ae3a8 |
+ return -EACCES;
|
|
|
9ae3a8 |
+ }
|
|
|
9ae3a8 |
+ if (bdrv_check_request(bs, sector_num, nb_sectors)) {
|
|
|
9ae3a8 |
+ return -EIO;
|
|
|
9ae3a8 |
+ }
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
+ if (bs->copy_on_read_in_flight) {
|
|
|
9ae3a8 |
+ wait_for_overlapping_requests(bs, sector_num, nb_sectors);
|
|
|
9ae3a8 |
+ }
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
+ /* throttling disk I/O */
|
|
|
9ae3a8 |
+ if (bs->io_limits_enabled) {
|
|
|
9ae3a8 |
+ bdrv_io_limits_intercept(bs, true, nb_sectors);
|
|
|
9ae3a8 |
+ }
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
+ ret = bdrv_aligned_pwritev(bs, sector_num << BDRV_SECTOR_BITS,
|
|
|
9ae3a8 |
+ nb_sectors << BDRV_SECTOR_BITS, qiov, flags);
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
+ return ret;
|
|
|
9ae3a8 |
+}
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
int coroutine_fn bdrv_co_writev(BlockDriverState *bs, int64_t sector_num,
|
|
|
9ae3a8 |
int nb_sectors, QEMUIOVector *qiov)
|
|
|
9ae3a8 |
{
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.7.1
|
|
|
9ae3a8 |
|