bf251437e9
Many changes were necessary this time around:
* QAPI was changed to avoid redundant has_* variables, see commit
44ea9d9be3 ("qapi: Start to elide redundant has_FOO in generated C")
for details. This affected many QMP commands added by Proxmox too.
* Pending querying for migration got split into two functions, one to
estimate, one for exact value, see commit c8df4a7aef ("migration:
Split save_live_pending() into state_pending_*") for details. Relevant
for savevm-async and PBS dirty bitmap.
* Some block (driver) functions got converted to coroutines, so the
Proxmox block drivers needed to be adapted.
* Alloc track auto-detaching during PBS live restore got broken by
AioContext-related changes resulting in a deadlock. The current, hacky
method was replaced by a simpler one. Stefan apparently ran into a
problem with that when he wrote the driver, but there were
improvements in the stream job code since then and I didn't manage to
reproduce the issue. It's a separate patch "alloc-track: fix deadlock
during drop" for now, you can find the details there.
* Async snapshot-related changes:
- The pending querying got adapted to the above-mentioned split and
a patch is added to optimize it/make it more similar to what
upstream code does.
- Added initialization of the compression counters (for
future-proofing).
- It's necessary the hold the BQL (big QEMU lock = iothread mutex)
during the setup phase, because block layer functions are used there
and not doing so leads to racy, hard-to-debug crashes or hangs. It's
necessary to change some upstream code too for this, a version of
the patch "migration: for snapshots, hold the BQL during setup
callbacks" is intended to be upstreamed.
- Need to take the bdrv graph read lock before flushing.
* hmp_info_balloon was moved to a different file.
* Needed to include a new headers from time to time to still get the
correct functions.
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
135 lines
4.9 KiB
Diff
135 lines
4.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Wolfgang Bumiller <w.bumiller@proxmox.com>
|
|
Date: Mon, 6 Apr 2020 12:16:50 +0200
|
|
Subject: [PATCH] PVE: [Up+Config] file-posix: make locking optiono on create
|
|
|
|
Otherwise creating images on nfs/cifs can be problematic.
|
|
|
|
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
|
|
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|
---
|
|
block/file-posix.c | 59 ++++++++++++++++++++++++++++++--------------
|
|
qapi/block-core.json | 3 ++-
|
|
2 files changed, 42 insertions(+), 20 deletions(-)
|
|
|
|
diff --git a/block/file-posix.c b/block/file-posix.c
|
|
index 9681bd0434..044890822d 100644
|
|
--- a/block/file-posix.c
|
|
+++ b/block/file-posix.c
|
|
@@ -2483,6 +2483,7 @@ raw_co_create(BlockdevCreateOptions *options, Error **errp)
|
|
int fd;
|
|
uint64_t perm, shared;
|
|
int result = 0;
|
|
+ bool locked = false;
|
|
|
|
/* Validate options and set default values */
|
|
assert(options->driver == BLOCKDEV_DRIVER_FILE);
|
|
@@ -2523,19 +2524,22 @@ raw_co_create(BlockdevCreateOptions *options, Error **errp)
|
|
perm = BLK_PERM_WRITE | BLK_PERM_RESIZE;
|
|
shared = BLK_PERM_ALL & ~BLK_PERM_RESIZE;
|
|
|
|
- /* Step one: Take locks */
|
|
- result = raw_apply_lock_bytes(NULL, fd, perm, ~shared, false, errp);
|
|
- if (result < 0) {
|
|
- goto out_close;
|
|
- }
|
|
+ if (file_opts->locking != ON_OFF_AUTO_OFF) {
|
|
+ /* Step one: Take locks */
|
|
+ result = raw_apply_lock_bytes(NULL, fd, perm, ~shared, false, errp);
|
|
+ if (result < 0) {
|
|
+ goto out_close;
|
|
+ }
|
|
+ locked = true;
|
|
|
|
- /* Step two: Check that nobody else has taken conflicting locks */
|
|
- result = raw_check_lock_bytes(fd, perm, shared, errp);
|
|
- if (result < 0) {
|
|
- error_append_hint(errp,
|
|
- "Is another process using the image [%s]?\n",
|
|
- file_opts->filename);
|
|
- goto out_unlock;
|
|
+ /* Step two: Check that nobody else has taken conflicting locks */
|
|
+ result = raw_check_lock_bytes(fd, perm, shared, errp);
|
|
+ if (result < 0) {
|
|
+ error_append_hint(errp,
|
|
+ "Is another process using the image [%s]?\n",
|
|
+ file_opts->filename);
|
|
+ goto out_unlock;
|
|
+ }
|
|
}
|
|
|
|
/* Clear the file by truncating it to 0 */
|
|
@@ -2589,13 +2593,15 @@ raw_co_create(BlockdevCreateOptions *options, Error **errp)
|
|
}
|
|
|
|
out_unlock:
|
|
- raw_apply_lock_bytes(NULL, fd, 0, 0, true, &local_err);
|
|
- if (local_err) {
|
|
- /* The above call should not fail, and if it does, that does
|
|
- * not mean the whole creation operation has failed. So
|
|
- * report it the user for their convenience, but do not report
|
|
- * it to the caller. */
|
|
- warn_report_err(local_err);
|
|
+ if (locked) {
|
|
+ raw_apply_lock_bytes(NULL, fd, 0, 0, true, &local_err);
|
|
+ if (local_err) {
|
|
+ /* The above call should not fail, and if it does, that does
|
|
+ * not mean the whole creation operation has failed. So
|
|
+ * report it the user for their convenience, but do not report
|
|
+ * it to the caller. */
|
|
+ warn_report_err(local_err);
|
|
+ }
|
|
}
|
|
|
|
out_close:
|
|
@@ -2619,6 +2625,7 @@ raw_co_create_opts(BlockDriver *drv, const char *filename,
|
|
PreallocMode prealloc;
|
|
char *buf = NULL;
|
|
Error *local_err = NULL;
|
|
+ OnOffAuto locking;
|
|
|
|
/* Skip file: protocol prefix */
|
|
strstart(filename, "file:", &filename);
|
|
@@ -2641,6 +2648,18 @@ raw_co_create_opts(BlockDriver *drv, const char *filename,
|
|
return -EINVAL;
|
|
}
|
|
|
|
+ locking = qapi_enum_parse(&OnOffAuto_lookup,
|
|
+ qemu_opt_get(opts, "locking"),
|
|
+ ON_OFF_AUTO_AUTO, &local_err);
|
|
+ if (local_err) {
|
|
+ error_propagate(errp, local_err);
|
|
+ return -EINVAL;
|
|
+ }
|
|
+
|
|
+ if (locking == ON_OFF_AUTO_AUTO) {
|
|
+ locking = ON_OFF_AUTO_OFF;
|
|
+ }
|
|
+
|
|
options = (BlockdevCreateOptions) {
|
|
.driver = BLOCKDEV_DRIVER_FILE,
|
|
.u.file = {
|
|
@@ -2652,6 +2671,8 @@ raw_co_create_opts(BlockDriver *drv, const char *filename,
|
|
.nocow = nocow,
|
|
.has_extent_size_hint = has_extent_size_hint,
|
|
.extent_size_hint = extent_size_hint,
|
|
+ .has_locking = true,
|
|
+ .locking = locking,
|
|
},
|
|
};
|
|
return raw_co_create(&options, errp);
|
|
diff --git a/qapi/block-core.json b/qapi/block-core.json
|
|
index 3c945c1f93..542add004b 100644
|
|
--- a/qapi/block-core.json
|
|
+++ b/qapi/block-core.json
|
|
@@ -4740,7 +4740,8 @@
|
|
'size': 'size',
|
|
'*preallocation': 'PreallocMode',
|
|
'*nocow': 'bool',
|
|
- '*extent-size-hint': 'size'} }
|
|
+ '*extent-size-hint': 'size',
|
|
+ '*locking': 'OnOffAuto' } }
|
|
|
|
##
|
|
# @BlockdevCreateOptionsGluster:
|