2018-03-21 14:15:59 +03:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Alexandre Derumier <aderumier@odiso.com>
|
2020-04-07 17:53:19 +03:00
|
|
|
Date: Mon, 6 Apr 2020 12:16:42 +0200
|
2020-07-02 14:07:28 +03:00
|
|
|
Subject: [PATCH] PVE: [Up] qemu-img dd: add -n skip_create
|
2018-03-21 14:15:59 +03:00
|
|
|
|
2019-06-06 13:58:15 +03:00
|
|
|
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
2022-02-11 12:24:34 +03:00
|
|
|
[FE: fix getopt-string + add documentation]
|
2022-12-14 17:16:32 +03:00
|
|
|
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
|
2018-03-21 14:15:59 +03:00
|
|
|
---
|
2022-02-11 12:24:34 +03:00
|
|
|
docs/tools/qemu-img.rst | 11 ++++++++++-
|
|
|
|
|
qemu-img-cmds.hx | 4 ++--
|
|
|
|
|
qemu-img.c | 23 ++++++++++++++---------
|
|
|
|
|
3 files changed, 26 insertions(+), 12 deletions(-)
|
2018-03-21 14:15:59 +03:00
|
|
|
|
2022-02-11 12:24:34 +03:00
|
|
|
diff --git a/docs/tools/qemu-img.rst b/docs/tools/qemu-img.rst
|
2024-04-25 18:21:29 +03:00
|
|
|
index 3653adb963..d83e8fb3c0 100644
|
2022-02-11 12:24:34 +03:00
|
|
|
--- a/docs/tools/qemu-img.rst
|
|
|
|
|
+++ b/docs/tools/qemu-img.rst
|
update submodule and patches to QEMU 8.2.2
This version includes both the AioContext lock and the block graph
lock, so there might be some deadlocks lurking. It's not possible to
disable the block graph lock like was done in QEMU 8.1, because there
are no changes like the function bdrv_schedule_unref() that require
it. QEMU 9.0 will finally get rid of the AioContext locking.
During live-restore with a VirtIO SCSI drive with iothread there is a
known racy deadlock related to the AioContext lock. Not new [1], but
not sure if more likely now. Should be fixed in QEMU 9.0.
The block graph lock comes with annotations that can be checked by
clang's TSA. This required changes to the block drivers, i.e.
alloc-track, pbs, zeroinit as well as taking the appropriate locks
in pve-backup, savevm-async, vma-reader.
Local variable shadowing is prohibited via a compiler flag now,
required slight adaptation in vma.c.
Major changes only affect alloc-track:
* It is not possible to call a generated co-wrapper like
bdrv_get_info() while holding the block graph lock exclusively [0],
which does happen during initialization of alloc-track when the
backing hd is set and the refresh_limits driver callback is invoked.
The bdrv_get_info() call to get the cluster size is moved to
directly after opening the file child in track_open().
The important thing is that at least the request alignment for the
write target is used, because then the RMW cycle in bdrv_pwritev
will gather enough data from the backing file. Partial cluster
allocations in the target are not a fundamental issue, because the
driver returns its allocation status based on the bitmap, so any
other data that maps to the same cluster will still be copied later
by a stream job (or during writes to that cluster).
* Replacing the node cannot be done in the
track_co_change_backing_file() callback, because it is a coroutine
and cannot hold the block graph lock exclusively. So it is moved to
the stream job itself with the auto-remove option not having an
effect anymore (qemu-server would always set it anyways).
In the future, there could either be a special option for the stream
job, or maybe the upcoming blockdev-replace QMP command can be used.
Replacing the backing child is actually already done in the stream
job, so no need to do it in the track_co_change_backing_file()
callback. It also cannot be called from a coroutine. Looking at the
implementation in the qcow2 driver, it doesn't seem to be intended
to change the backing child itself, just update driver-internal
state.
Other changes:
* alloc-track: Error out early when used without auto-remove. Since
replacing the node now happens in the stream job, where the option
cannot be read from (it's internal to the driver), it will always be
treated as 'on'. Makes sure to have users beside qemu-server notice
the change (should they even exist). The option can be fully dropped
in the future while adding a version guard in qemu-server.
* alloc-track: Avoid seemingly superfluous child permission update.
Doesn't seem necessary nowadays (maybe after commit "alloc-track:
fix deadlock during drop" where the dropping is not rescheduled and
delayed anymore or some upstream change). Replacing the block node
will already update the permissions of the new node (which was the
file child before). Should there really be some issue, instead of
having a drop state, this could also be just based off the fact
whether there is still a backing child.
Dumping the cumulative (shared) permissions for the BDS with a debug
print yields the same values after this patch and with QEMU 8.1,
namely 3 and 5.
* PBS block driver: compile unconditionally. Proxmox VE always needs
it and something in the build process changed to make it not enabled
by default. Probably would need to move the build option to meson
otherwise.
* backup: job unreferencing during cleanup needs to happen outside of
coroutine, so it was moved to before invoking the clean
* mirror: Cherry-pick stable fix to avoid potential deadlock.
* savevm-async: migrate_init now can fail, so propagate potential
error.
* savevm-async: compression counters are not accessible outside
migration/ram-compress now, so drop code that prophylactically set
it to zero.
[0]: https://lore.kernel.org/qemu-devel/220be383-3b0d-4938-b584-69ad214e5d5d@proxmox.com/
[1]: https://lore.kernel.org/qemu-devel/e13b488e-bf13-44f2-acca-e724d14f43fd@proxmox.com/
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
2024-04-25 18:21:28 +03:00
|
|
|
@@ -212,6 +212,10 @@ Parameters to convert subcommand:
|
2022-02-11 12:24:34 +03:00
|
|
|
|
|
|
|
|
Parameters to dd subcommand:
|
|
|
|
|
|
|
|
|
|
+.. option:: -n
|
|
|
|
|
+
|
|
|
|
|
+ Skip the creation of the target volume
|
|
|
|
|
+
|
|
|
|
|
.. program:: qemu-img-dd
|
|
|
|
|
|
|
|
|
|
.. option:: bs=BLOCK_SIZE
|
update submodule and patches to QEMU 8.2.2
This version includes both the AioContext lock and the block graph
lock, so there might be some deadlocks lurking. It's not possible to
disable the block graph lock like was done in QEMU 8.1, because there
are no changes like the function bdrv_schedule_unref() that require
it. QEMU 9.0 will finally get rid of the AioContext locking.
During live-restore with a VirtIO SCSI drive with iothread there is a
known racy deadlock related to the AioContext lock. Not new [1], but
not sure if more likely now. Should be fixed in QEMU 9.0.
The block graph lock comes with annotations that can be checked by
clang's TSA. This required changes to the block drivers, i.e.
alloc-track, pbs, zeroinit as well as taking the appropriate locks
in pve-backup, savevm-async, vma-reader.
Local variable shadowing is prohibited via a compiler flag now,
required slight adaptation in vma.c.
Major changes only affect alloc-track:
* It is not possible to call a generated co-wrapper like
bdrv_get_info() while holding the block graph lock exclusively [0],
which does happen during initialization of alloc-track when the
backing hd is set and the refresh_limits driver callback is invoked.
The bdrv_get_info() call to get the cluster size is moved to
directly after opening the file child in track_open().
The important thing is that at least the request alignment for the
write target is used, because then the RMW cycle in bdrv_pwritev
will gather enough data from the backing file. Partial cluster
allocations in the target are not a fundamental issue, because the
driver returns its allocation status based on the bitmap, so any
other data that maps to the same cluster will still be copied later
by a stream job (or during writes to that cluster).
* Replacing the node cannot be done in the
track_co_change_backing_file() callback, because it is a coroutine
and cannot hold the block graph lock exclusively. So it is moved to
the stream job itself with the auto-remove option not having an
effect anymore (qemu-server would always set it anyways).
In the future, there could either be a special option for the stream
job, or maybe the upcoming blockdev-replace QMP command can be used.
Replacing the backing child is actually already done in the stream
job, so no need to do it in the track_co_change_backing_file()
callback. It also cannot be called from a coroutine. Looking at the
implementation in the qcow2 driver, it doesn't seem to be intended
to change the backing child itself, just update driver-internal
state.
Other changes:
* alloc-track: Error out early when used without auto-remove. Since
replacing the node now happens in the stream job, where the option
cannot be read from (it's internal to the driver), it will always be
treated as 'on'. Makes sure to have users beside qemu-server notice
the change (should they even exist). The option can be fully dropped
in the future while adding a version guard in qemu-server.
* alloc-track: Avoid seemingly superfluous child permission update.
Doesn't seem necessary nowadays (maybe after commit "alloc-track:
fix deadlock during drop" where the dropping is not rescheduled and
delayed anymore or some upstream change). Replacing the block node
will already update the permissions of the new node (which was the
file child before). Should there really be some issue, instead of
having a drop state, this could also be just based off the fact
whether there is still a backing child.
Dumping the cumulative (shared) permissions for the BDS with a debug
print yields the same values after this patch and with QEMU 8.1,
namely 3 and 5.
* PBS block driver: compile unconditionally. Proxmox VE always needs
it and something in the build process changed to make it not enabled
by default. Probably would need to move the build option to meson
otherwise.
* backup: job unreferencing during cleanup needs to happen outside of
coroutine, so it was moved to before invoking the clean
* mirror: Cherry-pick stable fix to avoid potential deadlock.
* savevm-async: migrate_init now can fail, so propagate potential
error.
* savevm-async: compression counters are not accessible outside
migration/ram-compress now, so drop code that prophylactically set
it to zero.
[0]: https://lore.kernel.org/qemu-devel/220be383-3b0d-4938-b584-69ad214e5d5d@proxmox.com/
[1]: https://lore.kernel.org/qemu-devel/e13b488e-bf13-44f2-acca-e724d14f43fd@proxmox.com/
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
2024-04-25 18:21:28 +03:00
|
|
|
@@ -492,7 +496,7 @@ Command description:
|
2022-02-11 12:24:34 +03:00
|
|
|
it doesn't need to be specified separately in this case.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
-.. option:: dd [--image-opts] [-U] [-f FMT] [-O OUTPUT_FMT] [bs=BLOCK_SIZE] [count=BLOCKS] [skip=BLOCKS] if=INPUT of=OUTPUT
|
|
|
|
|
+.. option:: dd [--image-opts] [-U] [-f FMT] [-O OUTPUT_FMT] [-n] [bs=BLOCK_SIZE] [count=BLOCKS] [skip=BLOCKS] if=INPUT of=OUTPUT
|
|
|
|
|
|
|
|
|
|
dd copies from *INPUT* file to *OUTPUT* file converting it from
|
|
|
|
|
*FMT* format to *OUTPUT_FMT* format.
|
update submodule and patches to QEMU 8.2.2
This version includes both the AioContext lock and the block graph
lock, so there might be some deadlocks lurking. It's not possible to
disable the block graph lock like was done in QEMU 8.1, because there
are no changes like the function bdrv_schedule_unref() that require
it. QEMU 9.0 will finally get rid of the AioContext locking.
During live-restore with a VirtIO SCSI drive with iothread there is a
known racy deadlock related to the AioContext lock. Not new [1], but
not sure if more likely now. Should be fixed in QEMU 9.0.
The block graph lock comes with annotations that can be checked by
clang's TSA. This required changes to the block drivers, i.e.
alloc-track, pbs, zeroinit as well as taking the appropriate locks
in pve-backup, savevm-async, vma-reader.
Local variable shadowing is prohibited via a compiler flag now,
required slight adaptation in vma.c.
Major changes only affect alloc-track:
* It is not possible to call a generated co-wrapper like
bdrv_get_info() while holding the block graph lock exclusively [0],
which does happen during initialization of alloc-track when the
backing hd is set and the refresh_limits driver callback is invoked.
The bdrv_get_info() call to get the cluster size is moved to
directly after opening the file child in track_open().
The important thing is that at least the request alignment for the
write target is used, because then the RMW cycle in bdrv_pwritev
will gather enough data from the backing file. Partial cluster
allocations in the target are not a fundamental issue, because the
driver returns its allocation status based on the bitmap, so any
other data that maps to the same cluster will still be copied later
by a stream job (or during writes to that cluster).
* Replacing the node cannot be done in the
track_co_change_backing_file() callback, because it is a coroutine
and cannot hold the block graph lock exclusively. So it is moved to
the stream job itself with the auto-remove option not having an
effect anymore (qemu-server would always set it anyways).
In the future, there could either be a special option for the stream
job, or maybe the upcoming blockdev-replace QMP command can be used.
Replacing the backing child is actually already done in the stream
job, so no need to do it in the track_co_change_backing_file()
callback. It also cannot be called from a coroutine. Looking at the
implementation in the qcow2 driver, it doesn't seem to be intended
to change the backing child itself, just update driver-internal
state.
Other changes:
* alloc-track: Error out early when used without auto-remove. Since
replacing the node now happens in the stream job, where the option
cannot be read from (it's internal to the driver), it will always be
treated as 'on'. Makes sure to have users beside qemu-server notice
the change (should they even exist). The option can be fully dropped
in the future while adding a version guard in qemu-server.
* alloc-track: Avoid seemingly superfluous child permission update.
Doesn't seem necessary nowadays (maybe after commit "alloc-track:
fix deadlock during drop" where the dropping is not rescheduled and
delayed anymore or some upstream change). Replacing the block node
will already update the permissions of the new node (which was the
file child before). Should there really be some issue, instead of
having a drop state, this could also be just based off the fact
whether there is still a backing child.
Dumping the cumulative (shared) permissions for the BDS with a debug
print yields the same values after this patch and with QEMU 8.1,
namely 3 and 5.
* PBS block driver: compile unconditionally. Proxmox VE always needs
it and something in the build process changed to make it not enabled
by default. Probably would need to move the build option to meson
otherwise.
* backup: job unreferencing during cleanup needs to happen outside of
coroutine, so it was moved to before invoking the clean
* mirror: Cherry-pick stable fix to avoid potential deadlock.
* savevm-async: migrate_init now can fail, so propagate potential
error.
* savevm-async: compression counters are not accessible outside
migration/ram-compress now, so drop code that prophylactically set
it to zero.
[0]: https://lore.kernel.org/qemu-devel/220be383-3b0d-4938-b584-69ad214e5d5d@proxmox.com/
[1]: https://lore.kernel.org/qemu-devel/e13b488e-bf13-44f2-acca-e724d14f43fd@proxmox.com/
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
2024-04-25 18:21:28 +03:00
|
|
|
@@ -503,6 +507,11 @@ Command description:
|
2022-02-11 12:24:34 +03:00
|
|
|
|
|
|
|
|
The size syntax is similar to :manpage:`dd(1)`'s size syntax.
|
|
|
|
|
|
|
|
|
|
+ If the ``-n`` option is specified, the target volume creation will be
|
|
|
|
|
+ skipped. This is useful for formats such as ``rbd`` if the target
|
|
|
|
|
+ volume has already been created with site specific options that cannot
|
|
|
|
|
+ be supplied through ``qemu-img``.
|
|
|
|
|
+
|
|
|
|
|
.. option:: info [--object OBJECTDEF] [--image-opts] [-f FMT] [--output=OFMT] [--backing-chain] [-U] FILENAME
|
|
|
|
|
|
|
|
|
|
Give information about the disk image *FILENAME*. Use it in
|
|
|
|
|
diff --git a/qemu-img-cmds.hx b/qemu-img-cmds.hx
|
2024-04-25 18:21:29 +03:00
|
|
|
index 048788b23d..0b29a67a06 100644
|
2022-02-11 12:24:34 +03:00
|
|
|
--- a/qemu-img-cmds.hx
|
|
|
|
|
+++ b/qemu-img-cmds.hx
|
2024-04-25 18:21:29 +03:00
|
|
|
@@ -60,9 +60,9 @@ SRST
|
2022-02-11 12:24:34 +03:00
|
|
|
ERST
|
|
|
|
|
|
|
|
|
|
DEF("dd", img_dd,
|
|
|
|
|
- "dd [--image-opts] [-U] [-f fmt] [-O output_fmt] [bs=block_size] [count=blocks] [skip=blocks] [osize=output_size] if=input of=output")
|
|
|
|
|
+ "dd [--image-opts] [-U] [-f fmt] [-O output_fmt] [-n] [bs=block_size] [count=blocks] [skip=blocks] [osize=output_size] if=input of=output")
|
|
|
|
|
SRST
|
|
|
|
|
-.. option:: dd [--image-opts] [-U] [-f FMT] [-O OUTPUT_FMT] [bs=BLOCK_SIZE] [count=BLOCKS] [skip=BLOCKS] [osize=OUTPUT_SIZE] if=INPUT of=OUTPUT
|
|
|
|
|
+.. option:: dd [--image-opts] [-U] [-f FMT] [-O OUTPUT_FMT] [-n] [bs=BLOCK_SIZE] [count=BLOCKS] [skip=BLOCKS] [osize=OUTPUT_SIZE] if=INPUT of=OUTPUT
|
|
|
|
|
ERST
|
|
|
|
|
|
|
|
|
|
DEF("info", img_info,
|
2018-03-21 14:15:59 +03:00
|
|
|
diff --git a/qemu-img.c b/qemu-img.c
|
2024-04-25 18:21:29 +03:00
|
|
|
index b98184bba1..6fc8384f64 100644
|
2018-03-21 14:15:59 +03:00
|
|
|
--- a/qemu-img.c
|
|
|
|
|
+++ b/qemu-img.c
|
2024-04-25 18:21:29 +03:00
|
|
|
@@ -5118,7 +5118,7 @@ static int img_dd(int argc, char **argv)
|
2018-03-21 14:15:59 +03:00
|
|
|
const char *fmt = NULL;
|
|
|
|
|
int64_t size = 0, readsize = 0;
|
2022-12-14 17:16:32 +03:00
|
|
|
int64_t out_pos, in_pos;
|
2018-03-21 14:15:59 +03:00
|
|
|
- bool force_share = false;
|
|
|
|
|
+ bool force_share = false, skip_create = false;
|
|
|
|
|
struct DdInfo dd = {
|
|
|
|
|
.flags = 0,
|
|
|
|
|
.count = 0,
|
2024-04-25 18:21:29 +03:00
|
|
|
@@ -5156,7 +5156,7 @@ static int img_dd(int argc, char **argv)
|
2018-03-21 14:15:59 +03:00
|
|
|
{ 0, 0, 0, 0 }
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
- while ((c = getopt_long(argc, argv, ":hf:O:U", long_options, NULL))) {
|
2022-02-11 12:24:34 +03:00
|
|
|
+ while ((c = getopt_long(argc, argv, ":hf:O:Un", long_options, NULL))) {
|
2018-03-21 14:15:59 +03:00
|
|
|
if (c == EOF) {
|
|
|
|
|
break;
|
|
|
|
|
}
|
2024-04-25 18:21:29 +03:00
|
|
|
@@ -5176,6 +5176,9 @@ static int img_dd(int argc, char **argv)
|
2018-03-21 14:15:59 +03:00
|
|
|
case 'h':
|
|
|
|
|
help();
|
|
|
|
|
break;
|
|
|
|
|
+ case 'n':
|
|
|
|
|
+ skip_create = true;
|
|
|
|
|
+ break;
|
|
|
|
|
case 'U':
|
|
|
|
|
force_share = true;
|
|
|
|
|
break;
|
2024-04-25 18:21:29 +03:00
|
|
|
@@ -5306,13 +5309,15 @@ static int img_dd(int argc, char **argv)
|
2018-03-21 14:15:59 +03:00
|
|
|
size - in.bsz * in.offset, &error_abort);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
- ret = bdrv_create(drv, out.filename, opts, &local_err);
|
|
|
|
|
- if (ret < 0) {
|
|
|
|
|
- error_reportf_err(local_err,
|
|
|
|
|
- "%s: error while creating output image: ",
|
|
|
|
|
- out.filename);
|
|
|
|
|
- ret = -1;
|
|
|
|
|
- goto out;
|
|
|
|
|
+ if (!skip_create) {
|
|
|
|
|
+ ret = bdrv_create(drv, out.filename, opts, &local_err);
|
|
|
|
|
+ if (ret < 0) {
|
|
|
|
|
+ error_reportf_err(local_err,
|
|
|
|
|
+ "%s: error while creating output image: ",
|
|
|
|
|
+ out.filename);
|
|
|
|
|
+ ret = -1;
|
|
|
|
|
+ goto out;
|
|
|
|
|
+ }
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* TODO, we can't honour --image-opts for the target,
|