cryptospore / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
26ba25
From b48a7b70caf3883782f8e90fb58b7f46ef6ace88 Mon Sep 17 00:00:00 2001
26ba25
From: Max Reitz <mreitz@redhat.com>
26ba25
Date: Mon, 18 Jun 2018 16:12:06 +0200
26ba25
Subject: [PATCH 039/268] block: Add BDRV_REQ_WRITE_UNCHANGED flag
26ba25
26ba25
RH-Author: Max Reitz <mreitz@redhat.com>
26ba25
Message-id: <20180618161212.14444-5-mreitz@redhat.com>
26ba25
Patchwork-id: 80764
26ba25
O-Subject: [RHV-7.6 qemu-kvm-rhev PATCH 04/10] block: Add BDRV_REQ_WRITE_UNCHANGED flag
26ba25
Bugzilla: 1518738
26ba25
RH-Acked-by: John Snow <jsnow@redhat.com>
26ba25
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
26ba25
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
26ba25
26ba25
This flag signifies that a write request will not change the visible
26ba25
disk content.  With this flag set, it is sufficient to have the
26ba25
BLK_PERM_WRITE_UNCHANGED permission instead of BLK_PERM_WRITE.
26ba25
26ba25
Signed-off-by: Max Reitz <mreitz@redhat.com>
26ba25
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
26ba25
Reviewed-by: Alberto Garcia <berto@igalia.com>
26ba25
Message-id: 20180421132929.21610-4-mreitz@redhat.com
26ba25
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
26ba25
Signed-off-by: Max Reitz <mreitz@redhat.com>
26ba25
(cherry picked from commit c6035964f8316b504060618d05b5dd434f18595b)
26ba25
Signed-off-by: Max Reitz <mreitz@redhat.com>
26ba25
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
26ba25
---
26ba25
 block/io.c            | 6 +++++-
26ba25
 include/block/block.h | 6 +++++-
26ba25
 2 files changed, 10 insertions(+), 2 deletions(-)
26ba25
26ba25
diff --git a/block/io.c b/block/io.c
26ba25
index bd9a19a..134b2a4 100644
26ba25
--- a/block/io.c
26ba25
+++ b/block/io.c
26ba25
@@ -1501,7 +1501,11 @@ static int coroutine_fn bdrv_aligned_pwritev(BdrvChild *child,
26ba25
     assert(!waited || !req->serialising);
26ba25
     assert(req->overlap_offset <= offset);
26ba25
     assert(offset + bytes <= req->overlap_offset + req->overlap_bytes);
26ba25
-    assert(child->perm & BLK_PERM_WRITE);
26ba25
+    if (flags & BDRV_REQ_WRITE_UNCHANGED) {
26ba25
+        assert(child->perm & (BLK_PERM_WRITE_UNCHANGED | BLK_PERM_WRITE));
26ba25
+    } else {
26ba25
+        assert(child->perm & BLK_PERM_WRITE);
26ba25
+    }
26ba25
     assert(end_sector <= bs->total_sectors || child->perm & BLK_PERM_RESIZE);
26ba25
 
26ba25
     ret = notifier_with_return_list_notify(&bs->before_write_notifiers, req);
26ba25
diff --git a/include/block/block.h b/include/block/block.h
26ba25
index 397b5e8..3894edd 100644
26ba25
--- a/include/block/block.h
26ba25
+++ b/include/block/block.h
26ba25
@@ -54,8 +54,12 @@ typedef enum {
26ba25
     BDRV_REQ_FUA                = 0x10,
26ba25
     BDRV_REQ_WRITE_COMPRESSED   = 0x20,
26ba25
 
26ba25
+    /* Signifies that this write request will not change the visible disk
26ba25
+     * content. */
26ba25
+    BDRV_REQ_WRITE_UNCHANGED    = 0x40,
26ba25
+
26ba25
     /* Mask of valid flags */
26ba25
-    BDRV_REQ_MASK               = 0x3f,
26ba25
+    BDRV_REQ_MASK               = 0x7f,
26ba25
 } BdrvRequestFlags;
26ba25
 
26ba25
 typedef struct BlockSizes {
26ba25
-- 
26ba25
1.8.3.1
26ba25