Skip to content

Add metadata overlap checks

Max Reitz qemu-devel 5 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v5 Latest8 patches 17 repliesIn review
  2. v48 patches 2 repliesApplied
  3. v38 patches 3 repliesSuperseded
Earlier versions · 2
VersionPostedPatchesRepliesStatus
v25 patches9 repliesSuperseded
v15 patches11 repliesSuperseded

Changes in v5 from the cover letter

- fixed patch 6 (forgot to update the event_names array for the new event BLKDBG_REFTABLE_UPDATE); no other changes

Patches in v5 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/8qcow2: Add corrupt bitblock/qcow2.c block/qcow2.h docs/specs/qcow2.txt +2 more+66 -90 replies
2/8qcow2: Metadata overlap checksblock/qcow2-refcount.c block/qcow2.h include/monitor/monitor.h +1 more+213 -00 replies
3/8qcow2: Employ metadata overlap checksblock/qcow2-cache.c block/qcow2-cluster.c block/qcow2-snapshot.c +1 more+86 -00 replies
4/8qcow2-refcount: Move OFLAG_COPIED checksblock/qcow2-refcount.c+82 -330 replies
5/8qcow2-refcount: Repair OFLAG_COPIED errorsblock/qcow2-cluster.c block/qcow2-refcount.c block/qcow2.h+55 -80 replies
6/8qcow2-refcount: Repair shared refcount blocksblock/blkdebug.c block/qcow2-refcount.c include/block/block.h+148 -20 replies
7/8qcow2_check: Mark image consistentblock/qcow2.c+5 -10 replies
8/8qemu-iotests: Overlapping cluster allocationstests/qemu-iotests/060 tests/qemu-iotests/060.out tests/qemu-iotests/group+156 -00 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v5 yet.

Read the v5 thread

Cover letter [Qemu-devel] [PATCH v5 0/8] Add metadata overlap checks

If a qcow2 image file becomes corrupted, any write may inadvertently overwrite important metadata structures such as the L1 table. This series adds functionality for detecting, preventing and (to some extent) repairing such collisions.

v5:
- fixed patch 6 (forgot to update the event_names array for the new event BLKDBG_REFTABLE_UPDATE); no other changes

v4:
- fixed handling of preallocated zero clusters in patch 4
- moved OFLAG_COPIED checks into a separate function (this affects patches 4 and 5); functionality remains unchanged
- patches 1, 2, 3, 6, 7 and 8 remain unmodified (except for line numbers in block/qcow2-refcount.c)

v3:
- split PATCH 4/5 into four distinct patches (4/8, 5/8, 6/8 and 7/8, respectively)
- directly generate a JSON message when marking the image corrupt
- other (minor) fixes according to Kevin's comments

v2:
- Generally implemented Kevin's comments, especially:
- new QMP event QEVENT_BLOCK_IMAGE_CORRUPTED
- removed BDRV_O_REPAIR in favor of BDRV_O_CHECK | BDRV_O_RDWR
- always check full clusters for overlaps
- removed qcow2_check_allocations in favor of some qcow2_check_refcounts extensions that will hopefully include all that functionality

Max Reitz (8):
qcow2: Add corrupt bit
qcow2: Metadata overlap checks
qcow2: Employ metadata overlap checks
qcow2-refcount: Move OFLAG_COPIED checks
qcow2-refcount: Repair OFLAG_COPIED errors
qcow2-refcount: Repair shared refcount blocks
qcow2_check: Mark image consistent
qemu-iotests: Overlapping cluster allocations

 block/blkdebug.c           |   1 +
 block/qcow2-cache.c        |  17 ++
 block/qcow2-cluster.c      |  25 ++-
 block/qcow2-refcount.c     | 481 +++++++++++++++++++++++++++++++++++++++++----
 block/qcow2-snapshot.c     |  22 +++
 block/qcow2.c              |  79 +++++++-
 block/qcow2.h              |  47 ++++-
 docs/specs/qcow2.txt       |   7 +-
 include/block/block.h      |   1 +
 include/monitor/monitor.h  |   1 +
 monitor.c                  |   1 +
 tests/qemu-iotests/031.out |  12 +-
 tests/qemu-iotests/036.out |   2 +-
 tests/qemu-iotests/060     | 111 +++++++++++
 tests/qemu-iotests/060.out |  44 +++++
 tests/qemu-iotests/group   |   1 +
 16 files changed, 805 insertions(+), 47 deletions(-)
 create mode 100755 tests/qemu-iotests/060
 create mode 100644 tests/qemu-iotests/060.out
Signature · 1 line
1.8.3.1