From 13e2076f5c4adbc9a3f96c8978150aa5e423e14a Mon Sep 17 00:00:00 2001

From: Kevin Wolf <kwolf@redhat.com>

Date: Mon, 8 Jun 2020 15:01:30 +0100

Subject: [PATCH 02/17] block: Add flags to BlockDriver.bdrv_co_truncate()

RH-Author: Kevin Wolf <kwolf@redhat.com>

Message-id: <20200608150140.38218-2-kwolf@redhat.com>

Patchwork-id: 97448

O-Subject: [RHEL-AV-8.2.1 qemu-kvm PATCH 01/11] block: Add flags to BlockDriver.bdrv_co_truncate()

Bugzilla: 1780574

RH-Acked-by: Sergio Lopez Pascual <slp@redhat.com>

RH-Acked-by: Eric Blake <eblake@redhat.com>

RH-Acked-by: Max Reitz <mreitz@redhat.com>

This adds a new BdrvRequestFlags parameter to the .bdrv_co_truncate()

driver callbacks, and a supported_truncate_flags field in

BlockDriverState that allows drivers to advertise support for request

flags in the context of truncate.

For now, we always pass 0 and no drivers declare support for any flag.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>

Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>

Reviewed-by: Alberto Garcia <berto@igalia.com>

Reviewed-by: Max Reitz <mreitz@redhat.com>

Message-Id: <20200424125448.63318-2-kwolf@redhat.com>

Signed-off-by: Kevin Wolf <kwolf@redhat.com>

(cherry picked from commit 92b92799dc8662b6f71809100a4aabc1ae408ebb)

Signed-off-by: Kevin Wolf <kwolf@redhat.com>

Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>

---

 block/crypto.c              |  3 ++-

 block/file-posix.c          |  2 +-

 block/file-win32.c          |  2 +-

 block/gluster.c             |  1 +

 block/io.c                  |  8 +++++++-

 block/iscsi.c               |  2 +-

 block/nfs.c                 |  3 ++-

 block/qcow2.c               |  2 +-

 block/qed.c                 |  1 +

 block/raw-format.c          |  2 +-

 block/rbd.c                 |  1 +

 block/sheepdog.c            |  4 ++--

 block/ssh.c                 |  2 +-

 include/block/block_int.h   | 10 +++++++++-

 tests/test-block-iothread.c |  3 ++-

 15 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/block/crypto.c b/block/crypto.c

index 5e3b15c..6e4b726 100644

--- a/block/crypto.c

+++ b/block/crypto.c

@@ -299,7 +299,8 @@ static int block_crypto_co_create_generic(BlockDriverState *bs,

 static int coroutine_fn

 block_crypto_co_truncate(BlockDriverState *bs, int64_t offset, bool exact,

-                         PreallocMode prealloc, Error **errp)

+                         PreallocMode prealloc, BdrvRequestFlags flags,

+                         Error **errp)

 {

     BlockCrypto *crypto = bs->opaque;

     uint64_t payload_offset =

diff --git a/block/file-posix.c b/block/file-posix.c

index 1609598..7551e8d 100644

--- a/block/file-posix.c

+++ b/block/file-posix.c

@@ -2021,7 +2021,7 @@ raw_regular_truncate(BlockDriverState *bs, int fd, int64_t offset,

 static int coroutine_fn raw_co_truncate(BlockDriverState *bs, int64_t offset,

                                         bool exact, PreallocMode prealloc,

-                                        Error **errp)

+                                        BdrvRequestFlags flags, Error **errp)

 {

     BDRVRawState *s = bs->opaque;

     struct stat st;

diff --git a/block/file-win32.c b/block/file-win32.c

index 1585983..a6b0dda 100644

--- a/block/file-win32.c

+++ b/block/file-win32.c

@@ -469,7 +469,7 @@ static void raw_close(BlockDriverState *bs)

 static int coroutine_fn raw_co_truncate(BlockDriverState *bs, int64_t offset,

                                         bool exact, PreallocMode prealloc,

-                                        Error **errp)

+                                        BdrvRequestFlags flags, Error **errp)

 {

     BDRVRawState *s = bs->opaque;

     LONG low, high;

diff --git a/block/gluster.c b/block/gluster.c

index 0aa1f2c..d06df90 100644

--- a/block/gluster.c

+++ b/block/gluster.c

@@ -1228,6 +1228,7 @@ static coroutine_fn int qemu_gluster_co_truncate(BlockDriverState *bs,

                                                  int64_t offset,

                                                  bool exact,

                                                  PreallocMode prealloc,

+                                                 BdrvRequestFlags flags,

                                                  Error **errp)

 {

     BDRVGlusterState *s = bs->opaque;

diff --git a/block/io.c b/block/io.c

index f75777f..549e5a4 100644

--- a/block/io.c

+++ b/block/io.c

@@ -3320,6 +3320,7 @@ int coroutine_fn bdrv_co_truncate(BdrvChild *child, int64_t offset, bool exact,

     BlockDriverState *bs = child->bs;

     BlockDriver *drv = bs->drv;

     BdrvTrackedRequest req;

+    BdrvRequestFlags flags = 0;

     int64_t old_size, new_bytes;

     int ret;

@@ -3370,7 +3371,12 @@ int coroutine_fn bdrv_co_truncate(BdrvChild *child, int64_t offset, bool exact,

     }

     if (drv->bdrv_co_truncate) {

-        ret = drv->bdrv_co_truncate(bs, offset, exact, prealloc, errp);

+        if (flags & ~bs->supported_truncate_flags) {

+            error_setg(errp, "Block driver does not support requested flags");

+            ret = -ENOTSUP;

+            goto out;

+        }

+        ret = drv->bdrv_co_truncate(bs, offset, exact, prealloc, flags, errp);

     } else if (bs->file && drv->is_filter) {

         ret = bdrv_co_truncate(bs->file, offset, exact, prealloc, errp);

     } else {

diff --git a/block/iscsi.c b/block/iscsi.c

index 16b0716..0bea2d3 100644

--- a/block/iscsi.c

+++ b/block/iscsi.c

@@ -2125,7 +2125,7 @@ static void iscsi_reopen_commit(BDRVReopenState *reopen_state)

 static int coroutine_fn iscsi_co_truncate(BlockDriverState *bs, int64_t offset,

                                           bool exact, PreallocMode prealloc,

-                                          Error **errp)

+                                          BdrvRequestFlags flags, Error **errp)

 {

     IscsiLun *iscsilun = bs->opaque;

     int64_t cur_length;

diff --git a/block/nfs.c b/block/nfs.c

index cc2413d..2393fbf 100644

--- a/block/nfs.c

+++ b/block/nfs.c

@@ -755,7 +755,8 @@ static int64_t nfs_get_allocated_file_size(BlockDriverState *bs)

 static int coroutine_fn

 nfs_file_co_truncate(BlockDriverState *bs, int64_t offset, bool exact,

-                     PreallocMode prealloc, Error **errp)

+                     PreallocMode prealloc, BdrvRequestFlags flags,

+                     Error **errp)

 {

     NFSClient *client = bs->opaque;

     int ret;

diff --git a/block/qcow2.c b/block/qcow2.c

index dbd870a..977445e 100644

--- a/block/qcow2.c

+++ b/block/qcow2.c

@@ -3948,7 +3948,7 @@ fail:

 static int coroutine_fn qcow2_co_truncate(BlockDriverState *bs, int64_t offset,

                                           bool exact, PreallocMode prealloc,

-                                          Error **errp)

+                                          BdrvRequestFlags flags, Error **errp)

 {

     BDRVQcow2State *s = bs->opaque;

     uint64_t old_length;

diff --git a/block/qed.c b/block/qed.c

index 1af9b3c..fb6100b 100644

--- a/block/qed.c

+++ b/block/qed.c

@@ -1467,6 +1467,7 @@ static int coroutine_fn bdrv_qed_co_truncate(BlockDriverState *bs,

                                              int64_t offset,

                                              bool exact,

                                              PreallocMode prealloc,

+                                             BdrvRequestFlags flags,

                                              Error **errp)

 {

     BDRVQEDState *s = bs->opaque;

diff --git a/block/raw-format.c b/block/raw-format.c

index 4bb54f4..f994c4a 100644

--- a/block/raw-format.c

+++ b/block/raw-format.c

@@ -371,7 +371,7 @@ static void raw_refresh_limits(BlockDriverState *bs, Error **errp)

 static int coroutine_fn raw_co_truncate(BlockDriverState *bs, int64_t offset,

                                         bool exact, PreallocMode prealloc,

-                                        Error **errp)

+                                        BdrvRequestFlags flags, Error **errp)

 {

     BDRVRawState *s = bs->opaque;

diff --git a/block/rbd.c b/block/rbd.c

index 8847259..fcdb60a 100644

--- a/block/rbd.c

+++ b/block/rbd.c

@@ -1090,6 +1090,7 @@ static int coroutine_fn qemu_rbd_co_truncate(BlockDriverState *bs,

                                              int64_t offset,

                                              bool exact,

                                              PreallocMode prealloc,

+                                             BdrvRequestFlags flags,

                                              Error **errp)

 {

     int r;

diff --git a/block/sheepdog.c b/block/sheepdog.c

index a8a7e32..077aed8 100644

--- a/block/sheepdog.c

+++ b/block/sheepdog.c

@@ -2288,7 +2288,7 @@ static int64_t sd_getlength(BlockDriverState *bs)

 static int coroutine_fn sd_co_truncate(BlockDriverState *bs, int64_t offset,

                                        bool exact, PreallocMode prealloc,

-                                       Error **errp)

+                                       BdrvRequestFlags flags, Error **errp)

 {

     BDRVSheepdogState *s = bs->opaque;

     int ret, fd;

@@ -2604,7 +2604,7 @@ static coroutine_fn int sd_co_writev(BlockDriverState *bs, int64_t sector_num,

     assert(!flags);

     if (offset > s->inode.vdi_size) {

-        ret = sd_co_truncate(bs, offset, false, PREALLOC_MODE_OFF, NULL);

+        ret = sd_co_truncate(bs, offset, false, PREALLOC_MODE_OFF, 0, NULL);

         if (ret < 0) {

             return ret;

         }

diff --git a/block/ssh.c b/block/ssh.c

index 84e9282..9eb33df 100644

--- a/block/ssh.c

+++ b/block/ssh.c

@@ -1298,7 +1298,7 @@ static int64_t ssh_getlength(BlockDriverState *bs)

 static int coroutine_fn ssh_co_truncate(BlockDriverState *bs, int64_t offset,

                                         bool exact, PreallocMode prealloc,

-                                        Error **errp)

+                                        BdrvRequestFlags flags, Error **errp)

 {

     BDRVSSHState *s = bs->opaque;

diff --git a/include/block/block_int.h b/include/block/block_int.h

index 876a83d..41f13ec 100644

--- a/include/block/block_int.h

+++ b/include/block/block_int.h

@@ -356,7 +356,7 @@ struct BlockDriver {

      */

     int coroutine_fn (*bdrv_co_truncate)(BlockDriverState *bs, int64_t offset,

                                          bool exact, PreallocMode prealloc,

-                                         Error **errp);

+                                         BdrvRequestFlags flags, Error **errp);

     int64_t (*bdrv_getlength)(BlockDriverState *bs);

     bool has_variable_length;

@@ -849,6 +849,14 @@ struct BlockDriverState {

     /* Flags honored during pwrite_zeroes (so far: BDRV_REQ_FUA,

      * BDRV_REQ_MAY_UNMAP, BDRV_REQ_WRITE_UNCHANGED) */

     unsigned int supported_zero_flags;

+    /*

+     * Flags honoured during truncate (so far: BDRV_REQ_ZERO_WRITE).

+     *

+     * If BDRV_REQ_ZERO_WRITE is given, the truncate operation must make sure

+     * that any added space reads as all zeros. If this can't be guaranteed,

+     * the operation must fail.

+     */

+    unsigned int supported_truncate_flags;

     /* the following member gives a name to every node on the bs graph. */

     char node_name[32];

diff --git a/tests/test-block-iothread.c b/tests/test-block-iothread.c

index 0c86180..2f3b763 100644

--- a/tests/test-block-iothread.c

+++ b/tests/test-block-iothread.c

@@ -46,7 +46,8 @@ static int coroutine_fn bdrv_test_co_pdiscard(BlockDriverState *bs,

 static int coroutine_fn

 bdrv_test_co_truncate(BlockDriverState *bs, int64_t offset, bool exact,

-                      PreallocMode prealloc, Error **errp)

+                      PreallocMode prealloc, BdrvRequestFlags flags,

+                      Error **errp)

 {

     return 0;

 }

-- 

1.8.3.1