Skip to contentSkip to conversation

qcow2: add compression type feature

RFC PATCH In review Denis Plotnikov 4 participants 7 messages Feb 5, 2019 – May 16, 2019 Block layer

lore
Share & tools
lore
#0 lore raw

RFC PATCH 1/1 qcow2: add compression type feature

The patch adds some preparation parts for incompatible compression type feature into QCOW2 header that indicates that *all* compressed clusters must be (de)compressed using a certain compression type.

It is implied that the compression type is set on the image creation and can be changed only later by image convertion, thus the only compression algorithm is used for the image.

The plan is to add support for ZSTD and then may be something more effective in the future.

ZSDT compression algorithm consumes 3-5 times less CPU power with a comparable comression ratio with zlib. It would be wise to use it for data compression f.e. for backups.

The default compression is ZLIB.

---
 block/qcow2.c | 25 +++++++++++++++++++++++++
 block/qcow2.h | 26 ++++++++++++++++++++++----
 2 files changed, 47 insertions(+), 4 deletions(-)
block/qcow2.c +25 -0
index 8c91b92865..cb3d6cc1c0 100644
@@ -73,6 +73,7 @@ typedef struct {
 #define  QCOW2_EXT_MAGIC_FEATURE_TABLE 0x6803f857
 #define  QCOW2_EXT_MAGIC_CRYPTO_HEADER 0x0537be77
 #define  QCOW2_EXT_MAGIC_BITMAPS 0x23852875
+#define  QCOW2_EXT_MAGIC_COMPRESSION_TYPE 0x434D5052
 
 static int coroutine_fn
 qcow2_co_preadv_compressed(BlockDriverState *bs,
@@ -397,6 +398,9 @@ static int qcow2_read_extensions(BlockDriverState *bs, uint64_t start_offset,
 #endif
             break;
 
+        case QCOW2_EXT_MAGIC_COMPRESSION_TYPE:
+            /* Setting compression type to BDRVQcow2State->compression_type */
+            /* from the image header is going to be here */
         default:
             /* unknown magic - save it in case we need to rewrite the header */
             /* If you add a new feature, make sure to also update the fast
@@ -2431,6 +2435,11 @@ int qcow2_update_header(BlockDriverState *bs)
                 .bit  = QCOW2_COMPAT_LAZY_REFCOUNTS_BITNR,
                 .name = "lazy refcounts",
             },
+            {
+                .type = QCOW2_FEAT_TYPE_INCOMPATIBLE,
+                .bit  = QCOW2_INCOMPAT_COMPRESSION_TYPE_BITNR,
+                .name = "compression type",
+            },
         };
 
         ret = header_ext_add(buf, QCOW2_EXT_MAGIC_FEATURE_TABLE,
@@ -2461,6 +2470,22 @@ int qcow2_update_header(BlockDriverState *bs)
         buflen -= ret;
     }
 
+    /* Compression type extension */
+    if (s->compression_type != 0) {
+        Qcow2CompressionTypeExt comp_header = {
+            .compression_type = cpu_to_be32(s->compression_type),
+        };
+        ret = header_ext_add(buf, QCOW2_EXT_MAGIC_COMPRESSION_TYPE,
+                             &comp_header,
+                             cpu_to_be64(sizeof(comp_header)),
+                             buflen);
+        if (ret < 0) {
+            goto fail;
+        }
+        buf += ret;
+        buflen -= ret;
+    }
+
     /* Keep unknown header extensions */
     QLIST_FOREACH(uext, &s->unknown_header_ext, next) {
         ret = header_ext_add(buf, uext->magic, uext->data, uext->len, buflen);
block/qcow2.h +22 -4
index 32cce9eee2..fdde5bbefd 100644
@@ -112,6 +112,10 @@
 #define QCOW2_OPT_REFCOUNT_CACHE_SIZE "refcount-cache-size"
 #define QCOW2_OPT_CACHE_CLEAN_INTERVAL "cache-clean-interval"
 
+/* Compression types */
+#define QCOW2_COMPRESSION_TYPE_ZLIB    0
+#define QCOW2_COMPRESSION_TYPE_ZSTD    1
+
 typedef struct QCowHeader {
     uint32_t magic;
     uint32_t version;
@@ -197,10 +201,13 @@ enum {
 
 /* Incompatible feature bits */
 enum {
-    QCOW2_INCOMPAT_DIRTY_BITNR   = 0,
-    QCOW2_INCOMPAT_CORRUPT_BITNR = 1,
-    QCOW2_INCOMPAT_DIRTY         = 1 << QCOW2_INCOMPAT_DIRTY_BITNR,
-    QCOW2_INCOMPAT_CORRUPT       = 1 << QCOW2_INCOMPAT_CORRUPT_BITNR,
+    QCOW2_INCOMPAT_DIRTY_BITNR            = 0,
+    QCOW2_INCOMPAT_CORRUPT_BITNR          = 1,
+    QCOW2_INCOMPAT_COMPRESSION_TYPE_BITNR = 2,
+    QCOW2_INCOMPAT_DIRTY                  = 1 << QCOW2_INCOMPAT_DIRTY_BITNR,
+    QCOW2_INCOMPAT_CORRUPT                = 1 << QCOW2_INCOMPAT_CORRUPT_BITNR,
+    QCOW2_INCOMPAT_COMPRESSION_TYPE       =
+                                    1 << QCOW2_INCOMPAT_COMPRESSION_TYPE_BITNR,
 
     QCOW2_INCOMPAT_MASK          = QCOW2_INCOMPAT_DIRTY
                                  | QCOW2_INCOMPAT_CORRUPT,
@@ -256,6 +263,10 @@ typedef struct Qcow2BitmapHeaderExt {
     uint64_t bitmap_directory_offset;
 } QEMU_PACKED Qcow2BitmapHeaderExt;
 
+typedef struct Qcow2CompressionTypeExt {
+    uint32_t compression_type;
+} QEMU_PACKED Qcow2CompressionTypeExt;
+
 typedef struct BDRVQcow2State {
     int cluster_bits;
     int cluster_size;
@@ -340,6 +351,13 @@ typedef struct BDRVQcow2State {
 
     CoQueue compress_wait_queue;
     int nb_compress_threads;
+    /**
+     * Compression type used for the image. Default: 0 - ZLIB
+     * The image compression type is set on image creation.
+     * The only way to change the compression type is to convert the image
+     * with the desired compresion type set
+     */
+    uint32_t compression_type;
 } BDRVQcow2State;
 
 typedef struct Qcow2COWRegion {
Signature · 1 line
2.17.0
#1 lore raw
Quoted 15 lines · Denis Plotnikov

The patch adds some preparation parts for incompatible compression type feature into QCOW2 header that indicates that *all* compressed clusters must be (de)compressed using a certain compression type.

It is implied that the compression type is set on the image creation and can be changed only later by image convertion, thus the only compression algorithm is used for the image.

The plan is to add support for ZSTD and then may be something more effective in the future.

ZSDT compression algorithm consumes 3-5 times less CPU power with a comparable comression ratio with zlib. It would be wise to use it for data compression f.e. for backups.

Quoted 7 lines

The default compression is ZLIB.

---
 block/qcow2.c | 25 +++++++++++++++++++++++++
 block/qcow2.h | 26 ++++++++++++++++++++++----
 2 files changed, 47 insertions(+), 4 deletions(-)

Are there plans to pursue this further?

[...]

block/qcow2.h line 117

Quoted 11 lines
block/qcow2.h +3 -0
index 32cce9eee2..fdde5bbefd 100644
@@ -112,6 +112,10 @@
 #define QCOW2_OPT_REFCOUNT_CACHE_SIZE "refcount-cache-size"
 #define QCOW2_OPT_CACHE_CLEAN_INTERVAL "cache-clean-interval"
 
+/* Compression types */
+#define QCOW2_COMPRESSION_TYPE_ZLIB    0
+#define QCOW2_COMPRESSION_TYPE_ZSTD    1

We probably want QAPI types anyway (qemu-img info should report the compression type), so I think we could use them instead.

Quoted 11 lines
block/qcow2.h +0 -4
 typedef struct QCowHeader {
     uint32_t magic;
     uint32_t version;
@@ -197,10 +201,13 @@ enum {
 
 /* Incompatible feature bits */
 enum {
-    QCOW2_INCOMPAT_DIRTY_BITNR   = 0,
-    QCOW2_INCOMPAT_CORRUPT_BITNR = 1,
-    QCOW2_INCOMPAT_DIRTY         = 1 << QCOW2_INCOMPAT_DIRTY_BITNR,
-    QCOW2_INCOMPAT_CORRUPT       = 1 << QCOW2_INCOMPAT_CORRUPT_BITNR,

block/qcow2.h enum { · line 213

Quoted 10 lines
block/qcow2.h +7 -0
+    QCOW2_INCOMPAT_DIRTY_BITNR            = 0,
+    QCOW2_INCOMPAT_CORRUPT_BITNR          = 1,
+    QCOW2_INCOMPAT_COMPRESSION_TYPE_BITNR = 2,
+    QCOW2_INCOMPAT_DIRTY                  = 1 << QCOW2_INCOMPAT_DIRTY_BITNR,
+    QCOW2_INCOMPAT_CORRUPT                = 1 << QCOW2_INCOMPAT_CORRUPT_BITNR,
+    QCOW2_INCOMPAT_COMPRESSION_TYPE       =
+                                    1 << QCOW2_INCOMPAT_COMPRESSION_TYPE_BITNR,
 
     QCOW2_INCOMPAT_MASK          = QCOW2_INCOMPAT_DIRTY
                                  | QCOW2_INCOMPAT_CORRUPT,

This mask needs to be expanded by QCOW2_INCOMPAT_COMPRESSION_TYPE.

Quoted 12 lines
block/qcow2.h +4 -0
@@ -256,6 +263,10 @@ typedef struct Qcow2BitmapHeaderExt {
     uint64_t bitmap_directory_offset;
 } QEMU_PACKED Qcow2BitmapHeaderExt;
 
+typedef struct Qcow2CompressionTypeExt {
+    uint32_t compression_type;
+} QEMU_PACKED Qcow2CompressionTypeExt;
+
 typedef struct BDRVQcow2State {
     int cluster_bits;
     int cluster_size;

block/qcow2.h typedef struct BDRVQcow2State { · line 358

Quoted 8 lines
block/qcow2.h +5 -0
@@ -340,6 +351,13 @@ typedef struct BDRVQcow2State {
 
     CoQueue compress_wait_queue;
     int nb_compress_threads;
+    /**
+     * Compression type used for the image. Default: 0 - ZLIB
+     * The image compression type is set on image creation.
+     * The only way to change the compression type is to convert the image
+     * with the desired compresion type set

*compression

And, well, ideally qemu-img amend could perform this operation, too.

Max

Quoted 6 lines
block/qcow2.h +2 -0
+     */
+    uint32_t compression_type;
 } BDRVQcow2State;
 
 typedef struct Qcow2COWRegion {
#2 lore raw
Quoted 18 lines · Max Reitz
Quoted 17 lines · Denis Plotnikov

The patch adds some preparation parts for incompatible compression type feature into QCOW2 header that indicates that *all* compressed clusters must be (de)compressed using a certain compression type.

It is implied that the compression type is set on the image creation and can be changed only later by image convertion, thus the only compression algorithm is used for the image.

The plan is to add support for ZSTD and then may be something more effective in the future.

ZSDT compression algorithm consumes 3-5 times less CPU power with a comparable comression ratio with zlib. It would be wise to use it for data compression f.e. for backups.

The default compression is ZLIB.

Quoted 7 lines
Quoted 5 lines
---
  block/qcow2.c | 25 +++++++++++++++++++++++++
  block/qcow2.h | 26 ++++++++++++++++++++++----
  2 files changed, 47 insertions(+), 4 deletions(-)

Are there plans to pursue this further?

Yes, I'm going to come up with the first version in a few weeks

Quoted 11 lines

[...]

Quoted 8 lines
block/qcow2.h +0 -0
index 32cce9eee2..fdde5bbefd 100644
@@ -112,6 +112,10 @@
  #define QCOW2_OPT_REFCOUNT_CACHE_SIZE "refcount-cache-size"
  #define QCOW2_OPT_CACHE_CLEAN_INTERVAL "cache-clean-interval"
 
Quoted 6 lines

block/qcow2.h line 117

Quoted 3 lines
block/qcow2.h +3 -0
+/* Compression types */
+#define QCOW2_COMPRESSION_TYPE_ZLIB    0
+#define QCOW2_COMPRESSION_TYPE_ZSTD    1

We probably want QAPI types anyway (qemu-img info should report the compression type), so I think we could use them instead.

I'm not sure that I understood the idea. Could you please explain what is meant here? We don't need those constants and should use the constants defined somewhere else (where)?

Denis

Quoted 60 lines
Quoted 12 lines
block/qcow2.h +0 -4
  typedef struct QCowHeader {
      uint32_t magic;
      uint32_t version;
@@ -197,10 +201,13 @@ enum {
 
  /* Incompatible feature bits */
  enum {
-    QCOW2_INCOMPAT_DIRTY_BITNR   = 0,
-    QCOW2_INCOMPAT_CORRUPT_BITNR = 1,
-    QCOW2_INCOMPAT_DIRTY         = 1 << QCOW2_INCOMPAT_DIRTY_BITNR,
-    QCOW2_INCOMPAT_CORRUPT       = 1 << QCOW2_INCOMPAT_CORRUPT_BITNR,

block/qcow2.h enum { · line 213

Quoted 10 lines
block/qcow2.h +7 -0
+    QCOW2_INCOMPAT_DIRTY_BITNR            = 0,
+    QCOW2_INCOMPAT_CORRUPT_BITNR          = 1,
+    QCOW2_INCOMPAT_COMPRESSION_TYPE_BITNR = 2,
+    QCOW2_INCOMPAT_DIRTY                  = 1 << QCOW2_INCOMPAT_DIRTY_BITNR,
+    QCOW2_INCOMPAT_CORRUPT                = 1 << QCOW2_INCOMPAT_CORRUPT_BITNR,
+    QCOW2_INCOMPAT_COMPRESSION_TYPE       =
+                                    1 << QCOW2_INCOMPAT_COMPRESSION_TYPE_BITNR,
 
      QCOW2_INCOMPAT_MASK          = QCOW2_INCOMPAT_DIRTY
                                   | QCOW2_INCOMPAT_CORRUPT,

This mask needs to be expanded by QCOW2_INCOMPAT_COMPRESSION_TYPE.

Quoted 12 lines
block/qcow2.h +4 -0
@@ -256,6 +263,10 @@ typedef struct Qcow2BitmapHeaderExt {
      uint64_t bitmap_directory_offset;
  } QEMU_PACKED Qcow2BitmapHeaderExt;
 
+typedef struct Qcow2CompressionTypeExt {
+    uint32_t compression_type;
+} QEMU_PACKED Qcow2CompressionTypeExt;
+
  typedef struct BDRVQcow2State {
      int cluster_bits;
      int cluster_size;

block/qcow2.h typedef struct BDRVQcow2State { · line 358

Quoted 8 lines
block/qcow2.h +5 -0
@@ -340,6 +351,13 @@ typedef struct BDRVQcow2State {
 
      CoQueue compress_wait_queue;
      int nb_compress_threads;
+    /**
+     * Compression type used for the image. Default: 0 - ZLIB
+     * The image compression type is set on image creation.
+     * The only way to change the compression type is to convert the image
+     * with the desired compresion type set

*compression

And, well, ideally qemu-img amend could perform this operation, too.

Max

Quoted 6 lines
block/qcow2.h +2 -0
+     */
+    uint32_t compression_type;
  } BDRVQcow2State;
 
  typedef struct Qcow2COWRegion {
Signature · 2 lines
Best,
Denis
#3 lore raw
Quoted 21 lines · Denis Plotnikov
Quoted 18 lines · Max Reitz
Quoted 17 lines · Denis Plotnikov

The patch adds some preparation parts for incompatible compression type feature into QCOW2 header that indicates that *all* compressed clusters must be (de)compressed using a certain compression type.

It is implied that the compression type is set on the image creation and can be changed only later by image convertion, thus the only compression algorithm is used for the image.

The plan is to add support for ZSTD and then may be something more effective in the future.

ZSDT compression algorithm consumes 3-5 times less CPU power with a comparable comression ratio with zlib. It would be wise to use it for data compression f.e. for backups.

The default compression is ZLIB.

Quoted 8 lines
Quoted 7 lines
Quoted 5 lines
---
  block/qcow2.c | 25 +++++++++++++++++++++++++
  block/qcow2.h | 26 ++++++++++++++++++++++----
  2 files changed, 47 insertions(+), 4 deletions(-)

Are there plans to pursue this further?

Yes, I'm going to come up with the first version in a few weeks

OK.

Quoted 16 lines
Quoted 10 lines

[...]

Quoted 8 lines
block/qcow2.h +0 -0
index 32cce9eee2..fdde5bbefd 100644
@@ -112,6 +112,10 @@
  #define QCOW2_OPT_REFCOUNT_CACHE_SIZE "refcount-cache-size"
  #define QCOW2_OPT_CACHE_CLEAN_INTERVAL "cache-clean-interval"
 
Quoted 6 lines

block/qcow2.h line 117

Quoted 3 lines
block/qcow2.h +3 -0
+/* Compression types */
+#define QCOW2_COMPRESSION_TYPE_ZLIB    0
+#define QCOW2_COMPRESSION_TYPE_ZSTD    1

We probably want QAPI types anyway (qemu-img info should report the compression type), so I think we could use them instead.

Quoted 3 lines

I'm not sure that I understood the idea. Could you please explain what is meant here? We don't need those constants and should use the constants defined somewhere else (where)?

qemu-img info can report format-specific information. I think the compression type should be listed there as well, once there is more than one.

Format-specific information is a QAPI type, namely ImageInfoSpecificQCow2. Therefore, everything it contains needs to be a QAPI object, and this includes potential compression information. We thus need a QAPI enum like Qcow2CompressionType, and that would automatically give us these values.

Max

#4 lore raw
Quoted 57 lines · Max Reitz
Quoted 21 lines · Denis Plotnikov
Quoted 18 lines · Max Reitz
Quoted 17 lines · Denis Plotnikov

The patch adds some preparation parts for incompatible compression type feature into QCOW2 header that indicates that *all* compressed clusters must be (de)compressed using a certain compression type.

It is implied that the compression type is set on the image creation and can be changed only later by image convertion, thus the only compression algorithm is used for the image.

The plan is to add support for ZSTD and then may be something more effective in the future.

ZSDT compression algorithm consumes 3-5 times less CPU power with a comparable comression ratio with zlib. It would be wise to use it for data compression f.e. for backups.

The default compression is ZLIB.

Quoted 8 lines
Quoted 7 lines
Quoted 5 lines
---
   block/qcow2.c | 25 +++++++++++++++++++++++++
   block/qcow2.h | 26 ++++++++++++++++++++++----
   2 files changed, 47 insertions(+), 4 deletions(-)

Are there plans to pursue this further?

Yes, I'm going to come up with the first version in a few weeks

OK.

Quoted 16 lines
Quoted 10 lines

[...]

Quoted 8 lines
block/qcow2.h +0 -0
index 32cce9eee2..fdde5bbefd 100644
@@ -112,6 +112,10 @@
   #define QCOW2_OPT_REFCOUNT_CACHE_SIZE "refcount-cache-size"
   #define QCOW2_OPT_CACHE_CLEAN_INTERVAL "cache-clean-interval"
 
Quoted 6 lines

block/qcow2.h line 117

Quoted 3 lines
block/qcow2.h +3 -0
+/* Compression types */
+#define QCOW2_COMPRESSION_TYPE_ZLIB    0
+#define QCOW2_COMPRESSION_TYPE_ZSTD    1

We probably want QAPI types anyway (qemu-img info should report the compression type), so I think we could use them instead.

Quoted 3 lines

I'm not sure that I understood the idea. Could you please explain what is meant here? We don't need those constants and should use the constants defined somewhere else (where)?

qemu-img info can report format-specific information. I think the compression type should be listed there as well, once there is more than one.

Quoted 5 lines

Format-specific information is a QAPI type, namely ImageInfoSpecificQCow2. Therefore, everything it contains needs to be a QAPI object, and this includes potential compression information. We thus need a QAPI enum like Qcow2CompressionType, and that would automatically give us these values.

Thanks for clarification. Will do that way.

Denis

Quoted 3 lines

Max

Signature · 2 lines
Best,
Denis
#5 lore raw
In reply to Denis Plotnikov

Hi Denis,
few simple comments below regarding the CODING_STYLE (point 7. Comment style)

Quoted 36 lines · Denis Plotnikov

The patch adds some preparation parts for incompatible compression type feature into QCOW2 header that indicates that *all* compressed clusters must be (de)compressed using a certain compression type.

It is implied that the compression type is set on the image creation and can be changed only later by image convertion, thus the only compression algorithm is used for the image.

The plan is to add support for ZSTD and then may be something more effective in the future.

ZSDT compression algorithm consumes 3-5 times less CPU power with a comparable comression ratio with zlib. It would be wise to use it for data compression f.e. for backups.

The default compression is ZLIB.

---
 block/qcow2.c | 25 +++++++++++++++++++++++++
 block/qcow2.h | 26 ++++++++++++++++++++++----
 2 files changed, 47 insertions(+), 4 deletions(-)
block/qcow2.c +1 -0
index 8c91b92865..cb3d6cc1c0 100644
@@ -73,6 +73,7 @@ typedef struct {
 #define  QCOW2_EXT_MAGIC_FEATURE_TABLE 0x6803f857
 #define  QCOW2_EXT_MAGIC_CRYPTO_HEADER 0x0537be77
 #define  QCOW2_EXT_MAGIC_BITMAPS 0x23852875
+#define  QCOW2_EXT_MAGIC_COMPRESSION_TYPE 0x434D5052
 
 static int coroutine_fn
 qcow2_co_preadv_compressed(BlockDriverState *bs,

block/qcow2.c static int qcow2_read_extensions(BlockDriverState *bs, uint64_t start_offset, · line 403

Quoted 6 lines
block/qcow2.c +3 -0
@@ -397,6 +398,9 @@ static int qcow2_read_extensions(BlockDriverState *bs, uint64_t start_offset,
 #endif
             break;
 
+        case QCOW2_EXT_MAGIC_COMPRESSION_TYPE:
+            /* Setting compression type to BDRVQcow2State->compression_type */
+            /* from the image header is going to be here */

I'd use a multiline comment block here.

Quoted 83 lines
block/qcow2.c +21 -0
         default:
             /* unknown magic - save it in case we need to rewrite the header */
             /* If you add a new feature, make sure to also update the fast
@@ -2431,6 +2435,11 @@ int qcow2_update_header(BlockDriverState *bs)
                 .bit  = QCOW2_COMPAT_LAZY_REFCOUNTS_BITNR,
                 .name = "lazy refcounts",
             },
+            {
+                .type = QCOW2_FEAT_TYPE_INCOMPATIBLE,
+                .bit  = QCOW2_INCOMPAT_COMPRESSION_TYPE_BITNR,
+                .name = "compression type",
+            },
         };
 
         ret = header_ext_add(buf, QCOW2_EXT_MAGIC_FEATURE_TABLE,
@@ -2461,6 +2470,22 @@ int qcow2_update_header(BlockDriverState *bs)
         buflen -= ret;
     }
 
+    /* Compression type extension */
+    if (s->compression_type != 0) {
+        Qcow2CompressionTypeExt comp_header = {
+            .compression_type = cpu_to_be32(s->compression_type),
+        };
+        ret = header_ext_add(buf, QCOW2_EXT_MAGIC_COMPRESSION_TYPE,
+                             &comp_header,
+                             cpu_to_be64(sizeof(comp_header)),
+                             buflen);
+        if (ret < 0) {
+            goto fail;
+        }
+        buf += ret;
+        buflen -= ret;
+    }
+
     /* Keep unknown header extensions */
     QLIST_FOREACH(uext, &s->unknown_header_ext, next) {
         ret = header_ext_add(buf, uext->magic, uext->data, uext->len, buflen);
block/qcow2.h +15 -4
index 32cce9eee2..fdde5bbefd 100644
@@ -112,6 +112,10 @@
 #define QCOW2_OPT_REFCOUNT_CACHE_SIZE "refcount-cache-size"
 #define QCOW2_OPT_CACHE_CLEAN_INTERVAL "cache-clean-interval"
 
+/* Compression types */
+#define QCOW2_COMPRESSION_TYPE_ZLIB    0
+#define QCOW2_COMPRESSION_TYPE_ZSTD    1
+
 typedef struct QCowHeader {
     uint32_t magic;
     uint32_t version;
@@ -197,10 +201,13 @@ enum {
 
 /* Incompatible feature bits */
 enum {
-    QCOW2_INCOMPAT_DIRTY_BITNR   = 0,
-    QCOW2_INCOMPAT_CORRUPT_BITNR = 1,
-    QCOW2_INCOMPAT_DIRTY         = 1 << QCOW2_INCOMPAT_DIRTY_BITNR,
-    QCOW2_INCOMPAT_CORRUPT       = 1 << QCOW2_INCOMPAT_CORRUPT_BITNR,
+    QCOW2_INCOMPAT_DIRTY_BITNR            = 0,
+    QCOW2_INCOMPAT_CORRUPT_BITNR          = 1,
+    QCOW2_INCOMPAT_COMPRESSION_TYPE_BITNR = 2,
+    QCOW2_INCOMPAT_DIRTY                  = 1 << QCOW2_INCOMPAT_DIRTY_BITNR,
+    QCOW2_INCOMPAT_CORRUPT                = 1 << QCOW2_INCOMPAT_CORRUPT_BITNR,
+    QCOW2_INCOMPAT_COMPRESSION_TYPE       =
+                                    1 << QCOW2_INCOMPAT_COMPRESSION_TYPE_BITNR,
 
     QCOW2_INCOMPAT_MASK          = QCOW2_INCOMPAT_DIRTY
                                  | QCOW2_INCOMPAT_CORRUPT,
@@ -256,6 +263,10 @@ typedef struct Qcow2BitmapHeaderExt {
     uint64_t bitmap_directory_offset;
 } QEMU_PACKED Qcow2BitmapHeaderExt;
 
+typedef struct Qcow2CompressionTypeExt {
+    uint32_t compression_type;
+} QEMU_PACKED Qcow2CompressionTypeExt;
+
 typedef struct BDRVQcow2State {
     int cluster_bits;
     int cluster_size;

block/qcow2.h typedef struct BDRVQcow2State { · line 354

Quoted 4 lines
block/qcow2.h +1 -0
@@ -340,6 +351,13 @@ typedef struct BDRVQcow2State {
 
     CoQueue compress_wait_queue;
     int nb_compress_threads;
+    /**

I'd remove the second asterisk here.

Quoted 13 lines
block/qcow2.h +6 -0
+     * Compression type used for the image. Default: 0 - ZLIB
+     * The image compression type is set on image creation.
+     * The only way to change the compression type is to convert the image
+     * with the desired compresion type set
+     */
+    uint32_t compression_type;
 } BDRVQcow2State;
 
 typedef struct Qcow2COWRegion {
Signature · 1 line
2.17.0

Thanks,
Stefano

#6 lore raw
In reply to Denis Plotnikov
Quoted 6 lines · Denis Plotnikov

The patch adds some preparation parts for incompatible compression type feature into QCOW2 header that indicates that *all* compressed clusters must be (de)compressed using a certain compression type.

It is implied that the compression type is set on the image creation and can be changed only later by image convertion, thus the only compression

s/convertion/conversion/

Quoted 6 lines

algorithm is used for the image.

The plan is to add support for ZSTD and then may be something more effective in the future.

ZSDT compression algorithm consumes 3-5 times less CPU power with a

s/ZSDT/ZSTD/

Quoted 1 line

comparable comression ratio with zlib. It would be wise to use it for

s/comression/compression/

Quoted 15 lines

data compression f.e. for backups.

The default compression is ZLIB.

---
 block/qcow2.c | 25 +++++++++++++++++++++++++
 block/qcow2.h | 26 ++++++++++++++++++++++----
 2 files changed, 47 insertions(+), 4 deletions(-)
block/qcow2.c +0 -0
index 8c91b92865..cb3d6cc1c0 100644

block/qcow2.c typedef struct { · line 76

Quoted 4 lines
block/qcow2.c +1 -0
@@ -73,6 +73,7 @@ typedef struct {
 #define  QCOW2_EXT_MAGIC_FEATURE_TABLE 0x6803f857
 #define  QCOW2_EXT_MAGIC_CRYPTO_HEADER 0x0537be77
 #define  QCOW2_EXT_MAGIC_BITMAPS 0x23852875
+#define  QCOW2_EXT_MAGIC_COMPRESSION_TYPE 0x434D5052

This appears to be adding a new header extension magic number, but didn't actually modify the specification. I'd expect this patch to touch docs/interop/qcow2.txt before it can be considered complete.

Signature · 3 lines
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3226
Virtualization:  qemu.org | libvirt.org