cryptospore / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone

Blame SOURCES/kvm-block-Add-flags-to-BlockDriver.bdrv_co_truncate.patch

902636
From 13e2076f5c4adbc9a3f96c8978150aa5e423e14a Mon Sep 17 00:00:00 2001
902636
From: Kevin Wolf <kwolf@redhat.com>
902636
Date: Mon, 8 Jun 2020 15:01:30 +0100
902636
Subject: [PATCH 02/17] block: Add flags to BlockDriver.bdrv_co_truncate()
902636
902636
RH-Author: Kevin Wolf <kwolf@redhat.com>
902636
Message-id: <20200608150140.38218-2-kwolf@redhat.com>
902636
Patchwork-id: 97448
902636
O-Subject: [RHEL-AV-8.2.1 qemu-kvm PATCH 01/11] block: Add flags to BlockDriver.bdrv_co_truncate()
902636
Bugzilla: 1780574
902636
RH-Acked-by: Sergio Lopez Pascual <slp@redhat.com>
902636
RH-Acked-by: Eric Blake <eblake@redhat.com>
902636
RH-Acked-by: Max Reitz <mreitz@redhat.com>
902636
902636
This adds a new BdrvRequestFlags parameter to the .bdrv_co_truncate()
902636
driver callbacks, and a supported_truncate_flags field in
902636
BlockDriverState that allows drivers to advertise support for request
902636
flags in the context of truncate.
902636
902636
For now, we always pass 0 and no drivers declare support for any flag.
902636
902636
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
902636
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
902636
Reviewed-by: Alberto Garcia <berto@igalia.com>
902636
Reviewed-by: Max Reitz <mreitz@redhat.com>
902636
Message-Id: <20200424125448.63318-2-kwolf@redhat.com>
902636
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
902636
(cherry picked from commit 92b92799dc8662b6f71809100a4aabc1ae408ebb)
902636
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
902636
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
902636
---
902636
 block/crypto.c              |  3 ++-
902636
 block/file-posix.c          |  2 +-
902636
 block/file-win32.c          |  2 +-
902636
 block/gluster.c             |  1 +
902636
 block/io.c                  |  8 +++++++-
902636
 block/iscsi.c               |  2 +-
902636
 block/nfs.c                 |  3 ++-
902636
 block/qcow2.c               |  2 +-
902636
 block/qed.c                 |  1 +
902636
 block/raw-format.c          |  2 +-
902636
 block/rbd.c                 |  1 +
902636
 block/sheepdog.c            |  4 ++--
902636
 block/ssh.c                 |  2 +-
902636
 include/block/block_int.h   | 10 +++++++++-
902636
 tests/test-block-iothread.c |  3 ++-
902636
 15 files changed, 33 insertions(+), 13 deletions(-)
902636
902636
diff --git a/block/crypto.c b/block/crypto.c
902636
index 5e3b15c..6e4b726 100644
902636
--- a/block/crypto.c
902636
+++ b/block/crypto.c
902636
@@ -299,7 +299,8 @@ static int block_crypto_co_create_generic(BlockDriverState *bs,
902636
 
902636
 static int coroutine_fn
902636
 block_crypto_co_truncate(BlockDriverState *bs, int64_t offset, bool exact,
902636
-                         PreallocMode prealloc, Error **errp)
902636
+                         PreallocMode prealloc, BdrvRequestFlags flags,
902636
+                         Error **errp)
902636
 {
902636
     BlockCrypto *crypto = bs->opaque;
902636
     uint64_t payload_offset =
902636
diff --git a/block/file-posix.c b/block/file-posix.c
902636
index 1609598..7551e8d 100644
902636
--- a/block/file-posix.c
902636
+++ b/block/file-posix.c
902636
@@ -2021,7 +2021,7 @@ raw_regular_truncate(BlockDriverState *bs, int fd, int64_t offset,
902636
 
902636
 static int coroutine_fn raw_co_truncate(BlockDriverState *bs, int64_t offset,
902636
                                         bool exact, PreallocMode prealloc,
902636
-                                        Error **errp)
902636
+                                        BdrvRequestFlags flags, Error **errp)
902636
 {
902636
     BDRVRawState *s = bs->opaque;
902636
     struct stat st;
902636
diff --git a/block/file-win32.c b/block/file-win32.c
902636
index 1585983..a6b0dda 100644
902636
--- a/block/file-win32.c
902636
+++ b/block/file-win32.c
902636
@@ -469,7 +469,7 @@ static void raw_close(BlockDriverState *bs)
902636
 
902636
 static int coroutine_fn raw_co_truncate(BlockDriverState *bs, int64_t offset,
902636
                                         bool exact, PreallocMode prealloc,
902636
-                                        Error **errp)
902636
+                                        BdrvRequestFlags flags, Error **errp)
902636
 {
902636
     BDRVRawState *s = bs->opaque;
902636
     LONG low, high;
902636
diff --git a/block/gluster.c b/block/gluster.c
902636
index 0aa1f2c..d06df90 100644
902636
--- a/block/gluster.c
902636
+++ b/block/gluster.c
902636
@@ -1228,6 +1228,7 @@ static coroutine_fn int qemu_gluster_co_truncate(BlockDriverState *bs,
902636
                                                  int64_t offset,
902636
                                                  bool exact,
902636
                                                  PreallocMode prealloc,
902636
+                                                 BdrvRequestFlags flags,
902636
                                                  Error **errp)
902636
 {
902636
     BDRVGlusterState *s = bs->opaque;
902636
diff --git a/block/io.c b/block/io.c
902636
index f75777f..549e5a4 100644
902636
--- a/block/io.c
902636
+++ b/block/io.c
902636
@@ -3320,6 +3320,7 @@ int coroutine_fn bdrv_co_truncate(BdrvChild *child, int64_t offset, bool exact,
902636
     BlockDriverState *bs = child->bs;
902636
     BlockDriver *drv = bs->drv;
902636
     BdrvTrackedRequest req;
902636
+    BdrvRequestFlags flags = 0;
902636
     int64_t old_size, new_bytes;
902636
     int ret;
902636
 
902636
@@ -3370,7 +3371,12 @@ int coroutine_fn bdrv_co_truncate(BdrvChild *child, int64_t offset, bool exact,
902636
     }
902636
 
902636
     if (drv->bdrv_co_truncate) {
902636
-        ret = drv->bdrv_co_truncate(bs, offset, exact, prealloc, errp);
902636
+        if (flags & ~bs->supported_truncate_flags) {
902636
+            error_setg(errp, "Block driver does not support requested flags");
902636
+            ret = -ENOTSUP;
902636
+            goto out;
902636
+        }
902636
+        ret = drv->bdrv_co_truncate(bs, offset, exact, prealloc, flags, errp);
902636
     } else if (bs->file && drv->is_filter) {
902636
         ret = bdrv_co_truncate(bs->file, offset, exact, prealloc, errp);
902636
     } else {
902636
diff --git a/block/iscsi.c b/block/iscsi.c
902636
index 16b0716..0bea2d3 100644
902636
--- a/block/iscsi.c
902636
+++ b/block/iscsi.c
902636
@@ -2125,7 +2125,7 @@ static void iscsi_reopen_commit(BDRVReopenState *reopen_state)
902636
 
902636
 static int coroutine_fn iscsi_co_truncate(BlockDriverState *bs, int64_t offset,
902636
                                           bool exact, PreallocMode prealloc,
902636
-                                          Error **errp)
902636
+                                          BdrvRequestFlags flags, Error **errp)
902636
 {
902636
     IscsiLun *iscsilun = bs->opaque;
902636
     int64_t cur_length;
902636
diff --git a/block/nfs.c b/block/nfs.c
902636
index cc2413d..2393fbf 100644
902636
--- a/block/nfs.c
902636
+++ b/block/nfs.c
902636
@@ -755,7 +755,8 @@ static int64_t nfs_get_allocated_file_size(BlockDriverState *bs)
902636
 
902636
 static int coroutine_fn
902636
 nfs_file_co_truncate(BlockDriverState *bs, int64_t offset, bool exact,
902636
-                     PreallocMode prealloc, Error **errp)
902636
+                     PreallocMode prealloc, BdrvRequestFlags flags,
902636
+                     Error **errp)
902636
 {
902636
     NFSClient *client = bs->opaque;
902636
     int ret;
902636
diff --git a/block/qcow2.c b/block/qcow2.c
902636
index dbd870a..977445e 100644
902636
--- a/block/qcow2.c
902636
+++ b/block/qcow2.c
902636
@@ -3948,7 +3948,7 @@ fail:
902636
 
902636
 static int coroutine_fn qcow2_co_truncate(BlockDriverState *bs, int64_t offset,
902636
                                           bool exact, PreallocMode prealloc,
902636
-                                          Error **errp)
902636
+                                          BdrvRequestFlags flags, Error **errp)
902636
 {
902636
     BDRVQcow2State *s = bs->opaque;
902636
     uint64_t old_length;
902636
diff --git a/block/qed.c b/block/qed.c
902636
index 1af9b3c..fb6100b 100644
902636
--- a/block/qed.c
902636
+++ b/block/qed.c
902636
@@ -1467,6 +1467,7 @@ static int coroutine_fn bdrv_qed_co_truncate(BlockDriverState *bs,
902636
                                              int64_t offset,
902636
                                              bool exact,
902636
                                              PreallocMode prealloc,
902636
+                                             BdrvRequestFlags flags,
902636
                                              Error **errp)
902636
 {
902636
     BDRVQEDState *s = bs->opaque;
902636
diff --git a/block/raw-format.c b/block/raw-format.c
902636
index 4bb54f4..f994c4a 100644
902636
--- a/block/raw-format.c
902636
+++ b/block/raw-format.c
902636
@@ -371,7 +371,7 @@ static void raw_refresh_limits(BlockDriverState *bs, Error **errp)
902636
 
902636
 static int coroutine_fn raw_co_truncate(BlockDriverState *bs, int64_t offset,
902636
                                         bool exact, PreallocMode prealloc,
902636
-                                        Error **errp)
902636
+                                        BdrvRequestFlags flags, Error **errp)
902636
 {
902636
     BDRVRawState *s = bs->opaque;
902636
 
902636
diff --git a/block/rbd.c b/block/rbd.c
902636
index 8847259..fcdb60a 100644
902636
--- a/block/rbd.c
902636
+++ b/block/rbd.c
902636
@@ -1090,6 +1090,7 @@ static int coroutine_fn qemu_rbd_co_truncate(BlockDriverState *bs,
902636
                                              int64_t offset,
902636
                                              bool exact,
902636
                                              PreallocMode prealloc,
902636
+                                             BdrvRequestFlags flags,
902636
                                              Error **errp)
902636
 {
902636
     int r;
902636
diff --git a/block/sheepdog.c b/block/sheepdog.c
902636
index a8a7e32..077aed8 100644
902636
--- a/block/sheepdog.c
902636
+++ b/block/sheepdog.c
902636
@@ -2288,7 +2288,7 @@ static int64_t sd_getlength(BlockDriverState *bs)
902636
 
902636
 static int coroutine_fn sd_co_truncate(BlockDriverState *bs, int64_t offset,
902636
                                        bool exact, PreallocMode prealloc,
902636
-                                       Error **errp)
902636
+                                       BdrvRequestFlags flags, Error **errp)
902636
 {
902636
     BDRVSheepdogState *s = bs->opaque;
902636
     int ret, fd;
902636
@@ -2604,7 +2604,7 @@ static coroutine_fn int sd_co_writev(BlockDriverState *bs, int64_t sector_num,
902636
 
902636
     assert(!flags);
902636
     if (offset > s->inode.vdi_size) {
902636
-        ret = sd_co_truncate(bs, offset, false, PREALLOC_MODE_OFF, NULL);
902636
+        ret = sd_co_truncate(bs, offset, false, PREALLOC_MODE_OFF, 0, NULL);
902636
         if (ret < 0) {
902636
             return ret;
902636
         }
902636
diff --git a/block/ssh.c b/block/ssh.c
902636
index 84e9282..9eb33df 100644
902636
--- a/block/ssh.c
902636
+++ b/block/ssh.c
902636
@@ -1298,7 +1298,7 @@ static int64_t ssh_getlength(BlockDriverState *bs)
902636
 
902636
 static int coroutine_fn ssh_co_truncate(BlockDriverState *bs, int64_t offset,
902636
                                         bool exact, PreallocMode prealloc,
902636
-                                        Error **errp)
902636
+                                        BdrvRequestFlags flags, Error **errp)
902636
 {
902636
     BDRVSSHState *s = bs->opaque;
902636
 
902636
diff --git a/include/block/block_int.h b/include/block/block_int.h
902636
index 876a83d..41f13ec 100644
902636
--- a/include/block/block_int.h
902636
+++ b/include/block/block_int.h
902636
@@ -356,7 +356,7 @@ struct BlockDriver {
902636
      */
902636
     int coroutine_fn (*bdrv_co_truncate)(BlockDriverState *bs, int64_t offset,
902636
                                          bool exact, PreallocMode prealloc,
902636
-                                         Error **errp);
902636
+                                         BdrvRequestFlags flags, Error **errp);
902636
 
902636
     int64_t (*bdrv_getlength)(BlockDriverState *bs);
902636
     bool has_variable_length;
902636
@@ -849,6 +849,14 @@ struct BlockDriverState {
902636
     /* Flags honored during pwrite_zeroes (so far: BDRV_REQ_FUA,
902636
      * BDRV_REQ_MAY_UNMAP, BDRV_REQ_WRITE_UNCHANGED) */
902636
     unsigned int supported_zero_flags;
902636
+    /*
902636
+     * Flags honoured during truncate (so far: BDRV_REQ_ZERO_WRITE).
902636
+     *
902636
+     * If BDRV_REQ_ZERO_WRITE is given, the truncate operation must make sure
902636
+     * that any added space reads as all zeros. If this can't be guaranteed,
902636
+     * the operation must fail.
902636
+     */
902636
+    unsigned int supported_truncate_flags;
902636
 
902636
     /* the following member gives a name to every node on the bs graph. */
902636
     char node_name[32];
902636
diff --git a/tests/test-block-iothread.c b/tests/test-block-iothread.c
902636
index 0c86180..2f3b763 100644
902636
--- a/tests/test-block-iothread.c
902636
+++ b/tests/test-block-iothread.c
902636
@@ -46,7 +46,8 @@ static int coroutine_fn bdrv_test_co_pdiscard(BlockDriverState *bs,
902636
 
902636
 static int coroutine_fn
902636
 bdrv_test_co_truncate(BlockDriverState *bs, int64_t offset, bool exact,
902636
-                      PreallocMode prealloc, Error **errp)
902636
+                      PreallocMode prealloc, BdrvRequestFlags flags,
902636
+                      Error **errp)
902636
 {
902636
     return 0;
902636
 }
902636
-- 
902636
1.8.3.1
902636