Skip to content

block: LUKS encryption slot management + iotest tweaks

Max Reitz qemu-devel 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest19 patches 12 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/19iotests: Make _filter_img_create more activetests/qemu-iotests/112.out tests/qemu-iotests/141 tests/qemu-iotests/153 +1 more+91 -311 reply
2/19iotests: filter few more luks specific create optionstests/qemu-iotests/087.out tests/qemu-iotests/134.out tests/qemu-iotests/158.out +6 more+17 -200 replies
3/19iotests/common.rc: Add _require_working_lukstests/qemu-iotests/common.rc+27 -01 reply
4/19iotests.py: Add qemu_img_pipe_and_status()tests/qemu-iotests/iotests.py+17 -171 reply
5/19iotests.py: Add (verify|has)_working_luks()tests/qemu-iotests/iotests.py+39 -02 replies
6/19iotests: Check whether luks workstests/qemu-iotests/087 tests/qemu-iotests/178 tests/qemu-iotests/188 +7 more+16 -02 replies
7/19qcrypto/core: add generic infrastructure for crypto options amendmentblock/crypto.c block/crypto.h crypto/block.c +3 more+95 -00 replies
8/19qcrypto/luks: implement encryption key managementcrypto/block-luks.c qapi/crypto.json+469 -60 replies
9/19block/amend: add 'force' optionblock.c block/qcow2.c docs/tools/qemu-img.rst +4 more+19 -50 replies
10/19block/amend: separate amend and create options for qemu-imgblock/qcow2.c include/block/block_int.h qemu-img.c+107 -880 replies
11/19block/amend: refactor qcow2 amend optionsblock/qcow2.c qemu-img.c tests/qemu-iotests/049.out +9 more+183 -3530 replies
12/19block/crypto: rename two functionsblock/crypto.c+12 -130 replies
13/19block/crypto: implement the encryption key managementblock/crypto.c block/crypto.h+161 -30 replies
14/19block/qcow2: extend qemu-img amend interface with crypto optionsblock/qcow2.c tests/qemu-iotests/082.out+107 -90 replies
15/19iotests: qemu-img tests for luks key managementtests/qemu-iotests/293 tests/qemu-iotests/293.out tests/qemu-iotests/294 +2 more+429 -03 replies
16/19block/core: add generic infrastructure for x-blockdev-amend qmp commandblock/Makefile.objs block/amend.c include/block/block_int.h +2 more+174 -80 replies
17/19block/crypto: implement blockdev-amendblock/crypto.c qapi/block-core.json+66 -200 replies
18/19block/qcow2: implement blockdev-amendblock/qcow2.c qapi/block-core.json+54 -10 replies
19/19iotests: add tests for blockdev-amendtests/qemu-iotests/295 tests/qemu-iotests/295.out tests/qemu-iotests/296 +2 more+589 -01 reply

Reviews trailers per patch

All 19 patches have a Reviewed-by or Acked-by.

PatchMaxim LevitskyDaniel P. BerrangéMax Reitz
1/19R-b
2/19R-b
3/19R-b
4/19R-b
5/19R-b
6/19R-b
7/19R-b
8/19R-b
9/19R-b R-b
10/19R-b R-b
11/19R-b
12/19R-b
13/19R-b R-b
14/19R-b R-b
15/19R-b
16/19R-b
17/19R-b R-b
18/19R-b R-b
19/19R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 3 reviewers.

Read the v1 thread

Cover letter [PATCH 00/19] block: LUKS encryption slot management + iotest tweaks

Hi,

This series collects all patches from Maxim’s series “LUKS: encryption slot management using amend interface”, plus iotest patches that seem useful to have before it. (And then I modified some of Maxim’s patches to take advantage of those patches.)

Maxim’s series was here:
https://lists.nongnu.org/archive/html/qemu-block/2020-06/msg00330.html

I already posted patches 1 and 2 here:
https://lists.nongnu.org/archive/html/qemu-block/2020-06/msg00954.html

Change from the latter series:
- Patch 1:
- Use $SED instead of plain “sed” in one place I missed
- Older bash versions do not support readarray’s -d switch, so we have to separate the Formatting line by a \n instead of \0. Unfortunately, that means we cannot just split by \0 and be done with it, but we have to ensure we put everything before the line starting by “Formatting” into $filename_part, and we do that with a loop that iterates over the split array until it finds the “Formatting” line.
- Use multiple -e for grep instead of '(...|...|...)'
- Patch 2: Rebase fallout du to grep now using multiple -e parameters

git-backport-diff against Maxim’s series:

001/19:[down] 'iotests: Make _filter_img_create more active'
002/19:[0053] [FC] 'iotests: filter few more luks specific create options' 003/19:[down] 'iotests/common.rc: Add _require_working_luks'
004/19:[down] 'iotests.py: Add qemu_img_pipe_and_status()'
005/19:[down] 'iotests.py: Add (verify|has)_working_luks()'
006/19:[down] 'iotests: Check whether luks works'
007/19:[----] [--] 'qcrypto/core: add generic infrastructure for crypto options amendment' 008/19:[----] [--] 'qcrypto/luks: implement encryption key management' 009/19:[----] [--] 'block/amend: add 'force' option'
010/19:[----] [--] 'block/amend: separate amend and create options for qemu-img' 011/19:[0268] [FC] 'block/amend: refactor qcow2 amend options'
012/19:[----] [--] 'block/crypto: rename two functions'
013/19:[----] [--] 'block/crypto: implement the encryption key management' 014/19:[----] [--] 'block/qcow2: extend qemu-img amend interface with crypto options' 015/19:[0007] [FC] 'iotests: qemu-img tests for luks key management' 016/19:[----] [--] 'block/core: add generic infrastructure for x-blockdev-amend qmp command' 017/19:[----] [--] 'block/crypto: implement blockdev-amend'
018/19:[----] [--] 'block/qcow2: implement blockdev-amend'
019/19:[0005] [FC] 'iotests: add tests for blockdev-amend'

git-backport-diff against “iotests: Make _filter_img_create more active”:

Key:
[----] : patches are identical
[####] : number of functional differences between upstream/downstream patch [down] : patch is downstream-only
The flags [FC] indicate (F)unctional and (C)ontextual differences, respectively

001/19:[0035] [FC] 'iotests: Make _filter_img_create more active' 002/19:[0004] [FC] 'iotests: filter few more luks specific create options' 003/19:[down] 'iotests/common.rc: Add _require_working_luks' 004/19:[down] 'iotests.py: Add qemu_img_pipe_and_status()'
005/19:[down] 'iotests.py: Add (verify|has)_working_luks()'
006/19:[down] 'iotests: Check whether luks works'
007/19:[down] 'qcrypto/core: add generic infrastructure for crypto options amendment' 008/19:[down] 'qcrypto/luks: implement encryption key management' 009/19:[down] 'block/amend: add 'force' option'
010/19:[down] 'block/amend: separate amend and create options for qemu-img' 011/19:[down] 'block/amend: refactor qcow2 amend options'
012/19:[down] 'block/crypto: rename two functions'
013/19:[down] 'block/crypto: implement the encryption key management' 014/19:[down] 'block/qcow2: extend qemu-img amend interface with crypto options' 015/19:[down] 'iotests: qemu-img tests for luks key management' 016/19:[down] 'block/core: add generic infrastructure for x-blockdev-amend qmp command' 017/19:[down] 'block/crypto: implement blockdev-amend'
018/19:[down] 'block/qcow2: implement blockdev-amend'
019/19:[down] 'iotests: add tests for blockdev-amend'

Max Reitz (5):
iotests: Make _filter_img_create more active
iotests/common.rc: Add _require_working_luks
iotests.py: Add qemu_img_pipe_and_status()
iotests.py: Add (verify|has)_working_luks()
iotests: Check whether luks works

Maxim Levitsky (14):
iotests: filter few more luks specific create options qcrypto/core: add generic infrastructure for crypto options amendment qcrypto/luks: implement encryption key management block/amend: add 'force' option
block/amend: separate amend and create options for qemu-img block/amend: refactor qcow2 amend options
block/crypto: rename two functions
block/crypto: implement the encryption key management block/qcow2: extend qemu-img amend interface with crypto options
iotests: qemu-img tests for luks key management block/core: add generic infrastructure for x-blockdev-amend qmp
command
block/crypto: implement blockdev-amend
block/qcow2: implement blockdev-amend
iotests: add tests for blockdev-amend

 docs/tools/qemu-img.rst          |   5 +-
 qapi/block-core.json             |  68 +++++
 qapi/crypto.json                 |  73 +++++-
 qapi/job.json                    |   4 +-
 block/crypto.h                   |  37 +++
 crypto/blockpriv.h               |   8 +
 include/block/block.h            |   1 +
 include/block/block_int.h        |  24 +-
 include/crypto/block.h           |  22 ++
 block.c                          |   4 +-
 block/amend.c                    | 113 +++++++++
 block/crypto.c                   | 206 +++++++++++++--
 block/qcow2.c                    | 332 +++++++++++++-----------
 crypto/block-luks.c              | 416 ++++++++++++++++++++++++++++++-
 crypto/block.c                   |  29 +++
 qemu-img.c                       |  44 +++-
 block/Makefile.objs              |   2 +-
 qemu-img-cmds.hx                 |   4 +-
 tests/qemu-iotests/049.out       | 102 ++++----
 tests/qemu-iotests/061.out       |  12 +-
 tests/qemu-iotests/082.out       | 185 ++++----------
 tests/qemu-iotests/085.out       |  38 +--
 tests/qemu-iotests/087           |   1 +
 tests/qemu-iotests/087.out       |   6 +-
 tests/qemu-iotests/112.out       |   2 +-
 tests/qemu-iotests/134.out       |   2 +-
 tests/qemu-iotests/141           |   2 +-
 tests/qemu-iotests/144.out       |   4 +-
 tests/qemu-iotests/153           |   9 +-
 tests/qemu-iotests/158.out       |   4 +-
 tests/qemu-iotests/178           |   1 +
 tests/qemu-iotests/182.out       |   2 +-
 tests/qemu-iotests/185.out       |   8 +-
 tests/qemu-iotests/188           |   1 +
 tests/qemu-iotests/188.out       |   2 +-
 tests/qemu-iotests/189           |   1 +
 tests/qemu-iotests/189.out       |   4 +-
 tests/qemu-iotests/198           |   1 +
 tests/qemu-iotests/198.out       |   4 +-
 tests/qemu-iotests/206           |   1 +
 tests/qemu-iotests/255.out       |   8 +-
 tests/qemu-iotests/263           |   1 +
 tests/qemu-iotests/263.out       |   4 +-
 tests/qemu-iotests/274.out       |  46 ++--
 tests/qemu-iotests/280.out       |   2 +-
 tests/qemu-iotests/284           |   1 +
 tests/qemu-iotests/284.out       |   6 +-
 tests/qemu-iotests/293           | 208 ++++++++++++++++
 tests/qemu-iotests/293.out       |  99 ++++++++
 tests/qemu-iotests/294           |  90 +++++++
 tests/qemu-iotests/294.out       |  30 +++
 tests/qemu-iotests/295           | 280 +++++++++++++++++++++
 tests/qemu-iotests/295.out       |  40 +++
 tests/qemu-iotests/296           | 234 +++++++++++++++++
 tests/qemu-iotests/296.out       |  33 +++
 tests/qemu-iotests/common.filter | 106 ++++++--
 tests/qemu-iotests/common.rc     |  30 +++
 tests/qemu-iotests/group         |   4 +
 tests/qemu-iotests/iotests.py    |  78 ++++--
 59 files changed, 2591 insertions(+), 493 deletions(-)
 create mode 100644 block/amend.c
 create mode 100755 tests/qemu-iotests/293
 create mode 100644 tests/qemu-iotests/293.out
 create mode 100755 tests/qemu-iotests/294
 create mode 100644 tests/qemu-iotests/294.out
 create mode 100755 tests/qemu-iotests/295
 create mode 100644 tests/qemu-iotests/295.out
 create mode 100755 tests/qemu-iotests/296
 create mode 100644 tests/qemu-iotests/296.out
Signature · 1 line
2.26.2