108 lines
3.4 KiB
Diff
108 lines
3.4 KiB
Diff
From 2c9b536fac44c15c44af385ac1b440a9f5c05d01 Mon Sep 17 00:00:00 2001
|
|
From: Keith Busch <kbusch@kernel.org>
|
|
Date: Thu, 29 Sep 2022 13:05:22 -0700
|
|
Subject: [PATCH 1/2] block: move bdrv_qiov_is_aligned to file-posix
|
|
|
|
RH-Author: Kevin Wolf <kwolf@redhat.com>
|
|
RH-MergeRequest: 123: block: Fix memory alignment of requests
|
|
RH-Bugzilla: 2143170
|
|
RH-Acked-by: Alberto Faria <None>
|
|
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
RH-Acked-by: Stefano Garzarella <sgarzare@redhat.com>
|
|
RH-Commit: [1/2] 77b6ed2aaedfbd3dba7769b9a999ab3743f642cd (kmwolf/centos-qemu-kvm)
|
|
|
|
There is only user of bdrv_qiov_is_aligned(), so move the alignment
|
|
function to there and make it static.
|
|
|
|
Signed-off-by: Keith Busch <kbusch@kernel.org>
|
|
Message-Id: <20220929200523.3218710-2-kbusch@meta.com>
|
|
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
|
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
(cherry picked from commit a7c5f67a78569f8c275ea4ea9962e9c79b9d03cb)
|
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
---
|
|
block/file-posix.c | 21 +++++++++++++++++++++
|
|
block/io.c | 21 ---------------------
|
|
include/block/block-io.h | 1 -
|
|
3 files changed, 21 insertions(+), 22 deletions(-)
|
|
|
|
diff --git a/block/file-posix.c b/block/file-posix.c
|
|
index 48cd096624..e3f3de2780 100644
|
|
--- a/block/file-posix.c
|
|
+++ b/block/file-posix.c
|
|
@@ -2061,6 +2061,27 @@ static int coroutine_fn raw_thread_pool_submit(BlockDriverState *bs,
|
|
return thread_pool_submit_co(pool, func, arg);
|
|
}
|
|
|
|
+/*
|
|
+ * Check if all memory in this vector is sector aligned.
|
|
+ */
|
|
+static bool bdrv_qiov_is_aligned(BlockDriverState *bs, QEMUIOVector *qiov)
|
|
+{
|
|
+ int i;
|
|
+ size_t alignment = bdrv_min_mem_align(bs);
|
|
+ IO_CODE();
|
|
+
|
|
+ for (i = 0; i < qiov->niov; i++) {
|
|
+ if ((uintptr_t) qiov->iov[i].iov_base % alignment) {
|
|
+ return false;
|
|
+ }
|
|
+ if (qiov->iov[i].iov_len % alignment) {
|
|
+ return false;
|
|
+ }
|
|
+ }
|
|
+
|
|
+ return true;
|
|
+}
|
|
+
|
|
static int coroutine_fn raw_co_prw(BlockDriverState *bs, uint64_t offset,
|
|
uint64_t bytes, QEMUIOVector *qiov, int type)
|
|
{
|
|
diff --git a/block/io.c b/block/io.c
|
|
index 0a8cbefe86..96edc7f7cb 100644
|
|
--- a/block/io.c
|
|
+++ b/block/io.c
|
|
@@ -3236,27 +3236,6 @@ void *qemu_try_blockalign0(BlockDriverState *bs, size_t size)
|
|
return mem;
|
|
}
|
|
|
|
-/*
|
|
- * Check if all memory in this vector is sector aligned.
|
|
- */
|
|
-bool bdrv_qiov_is_aligned(BlockDriverState *bs, QEMUIOVector *qiov)
|
|
-{
|
|
- int i;
|
|
- size_t alignment = bdrv_min_mem_align(bs);
|
|
- IO_CODE();
|
|
-
|
|
- for (i = 0; i < qiov->niov; i++) {
|
|
- if ((uintptr_t) qiov->iov[i].iov_base % alignment) {
|
|
- return false;
|
|
- }
|
|
- if (qiov->iov[i].iov_len % alignment) {
|
|
- return false;
|
|
- }
|
|
- }
|
|
-
|
|
- return true;
|
|
-}
|
|
-
|
|
void bdrv_io_plug(BlockDriverState *bs)
|
|
{
|
|
BdrvChild *child;
|
|
diff --git a/include/block/block-io.h b/include/block/block-io.h
|
|
index fd25ffa9be..492f95fc05 100644
|
|
--- a/include/block/block-io.h
|
|
+++ b/include/block/block-io.h
|
|
@@ -150,7 +150,6 @@ void *qemu_blockalign(BlockDriverState *bs, size_t size);
|
|
void *qemu_blockalign0(BlockDriverState *bs, size_t size);
|
|
void *qemu_try_blockalign(BlockDriverState *bs, size_t size);
|
|
void *qemu_try_blockalign0(BlockDriverState *bs, size_t size);
|
|
-bool bdrv_qiov_is_aligned(BlockDriverState *bs, QEMUIOVector *qiov);
|
|
|
|
void bdrv_enable_copy_on_read(BlockDriverState *bs);
|
|
void bdrv_disable_copy_on_read(BlockDriverState *bs);
|
|
--
|
|
2.31.1
|
|
|