All of lore.kernel.org
 help / color / mirror / Atom feed
From: Fam Zheng <famz@redhat.com>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>, Max Reitz <mreitz@redhat.com>,
	Jeff Cody <jcody@redhat.com>,
	Markus Armbruster <armbru@redhat.com>,
	Eric Blake <eblake@redhat.com>, John Snow <jsnow@redhat.com>,
	qemu-block@nongnu.org, berrange@redhat.com, pbonzini@redhat.com,
	den@openvz.org, stefanha@redhat.com
Subject: [Qemu-devel] [PATCH v5 04/27] block: Introduce image file locking
Date: Tue, 17 May 2016 15:35:13 +0800	[thread overview]
Message-ID: <1463470536-8981-5-git-send-email-famz@redhat.com> (raw)
In-Reply-To: <1463470536-8981-1-git-send-email-famz@redhat.com>

Block drivers can implement this new operation .bdrv_lockf to actually lock the
image in the protocol specific way.

Signed-off-by: Fam Zheng <famz@redhat.com>
---
 block.c                   | 48 +++++++++++++++++++++++++++++++++++++++++++++++
 include/block/block_int.h | 11 +++++++++++
 2 files changed, 59 insertions(+)

diff --git a/block.c b/block.c
index 18a497f..153f9d2 100644
--- a/block.c
+++ b/block.c
@@ -844,6 +844,41 @@ out:
     g_free(gen_node_name);
 }
 
+static int bdrv_lock_unlock_image_do(BlockDriverState *bs, bool lock_image)
+{
+    int cmd = BDRV_LOCKF_UNLOCK;
+    int ret;
+
+    if (bs->image_locked == lock_image) {
+        return 0;
+    } else if (!bs->drv) {
+        return -ENOMEDIUM;
+    } else if (!bs->drv->bdrv_lockf) {
+        return 0;
+    }
+    if (lock_image) {
+        cmd = (bs->open_flags & BDRV_O_RDWR) &&
+              !(bs->open_flags & BDRV_O_SHARED_LOCK) ? BDRV_LOCKF_EXCLUSIVE :
+                                                       BDRV_LOCKF_SHARED;
+    }
+    ret = bs->drv->bdrv_lockf(bs, cmd);
+    if (ret == -ENOTSUP) {
+        /* Handle it the same way as !bs->drv->bdrv_lockf */
+        ret = 0;
+    }
+    return ret;
+}
+
+static int bdrv_lock_image(BlockDriverState *bs)
+{
+    return bdrv_lock_unlock_image_do(bs, true);
+}
+
+static int bdrv_unlock_image(BlockDriverState *bs)
+{
+    return bdrv_lock_unlock_image_do(bs, false);
+}
+
 static QemuOptsList bdrv_runtime_opts = {
     .name = "bdrv_common",
     .head = QTAILQ_HEAD_INITIALIZER(bdrv_runtime_opts.head),
@@ -993,6 +1028,14 @@ static int bdrv_open_common(BlockDriverState *bs, BdrvChild *file,
         goto free_and_fail;
     }
 
+    if (!(open_flags & (BDRV_O_NO_LOCK | BDRV_O_INACTIVE))) {
+        ret = bdrv_lock_image(bs);
+        if (ret) {
+            error_setg(errp, "Failed to lock image");
+            goto free_and_fail;
+        }
+    }
+
     ret = refresh_total_sectors(bs, bs->total_sectors);
     if (ret < 0) {
         error_setg_errno(errp, -ret, "Could not refresh total sector count");
@@ -2142,6 +2185,7 @@ static void bdrv_close(BlockDriverState *bs)
     if (bs->drv) {
         BdrvChild *child, *next;
 
+        bdrv_unlock_image(bs);
         bs->drv->bdrv_close(bs);
         bs->drv = NULL;
 
@@ -3235,6 +3279,9 @@ void bdrv_invalidate_cache(BlockDriverState *bs, Error **errp)
         error_setg_errno(errp, -ret, "Could not refresh total sector count");
         return;
     }
+    if (!(bs->open_flags & BDRV_O_NO_LOCK)) {
+        bdrv_lock_image(bs);
+    }
 }
 
 void bdrv_invalidate_cache_all(Error **errp)
@@ -3276,6 +3323,7 @@ static int bdrv_inactivate_recurse(BlockDriverState *bs,
     }
 
     if (setting_flag) {
+        ret = bdrv_unlock_image(bs);
         bs->open_flags |= BDRV_O_INACTIVE;
     }
     return 0;
diff --git a/include/block/block_int.h b/include/block/block_int.h
index a029c20..2b82d49 100644
--- a/include/block/block_int.h
+++ b/include/block/block_int.h
@@ -85,6 +85,12 @@ typedef struct BdrvTrackedRequest {
     struct BdrvTrackedRequest *waiting_for;
 } BdrvTrackedRequest;
 
+typedef enum {
+    BDRV_LOCKF_EXCLUSIVE,
+    BDRV_LOCKF_SHARED,
+    BDRV_LOCKF_UNLOCK,
+} BdrvLockfCmd;
+
 struct BlockDriver {
     const char *format_name;
     int instance_size;
@@ -318,6 +324,10 @@ struct BlockDriver {
                            Error **errp);
     void (*bdrv_del_child)(BlockDriverState *parent, BdrvChild *child,
                            Error **errp);
+    /**
+     * Lock/unlock the image.
+     */
+    int (*bdrv_lockf)(BlockDriverState *bs, BdrvLockfCmd cmd);
 
     QLIST_ENTRY(BlockDriver) list;
 };
@@ -496,6 +506,7 @@ struct BlockDriverState {
     unsigned io_plug_disabled;
 
     int quiesce_counter;
+    bool image_locked;
 };
 
 struct BlockBackendRootState {
-- 
2.8.2

  parent reply	other threads:[~2016-05-17  7:35 UTC|newest]

Thread overview: 71+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-05-17  7:35 [Qemu-devel] [PATCH v5 00/27] block: Lock images when opening Fam Zheng
2016-05-17  7:35 ` [Qemu-devel] [PATCH v5 01/27] block: Add flag bits for image locking Fam Zheng
2016-05-24 12:14   ` Max Reitz
2016-05-17  7:35 ` [Qemu-devel] [PATCH v5 02/27] qapi: Add lock-mode in blockdev-add options Fam Zheng
2016-05-24 12:15   ` Max Reitz
2016-05-17  7:35 ` [Qemu-devel] [PATCH v5 03/27] blockdev: Add and parse "lock-mode" option for image locking Fam Zheng
2016-05-24 12:17   ` Max Reitz
2016-05-17  7:35 ` Fam Zheng [this message]
2016-05-24 16:01   ` [Qemu-devel] [PATCH v5 04/27] block: Introduce image file locking Max Reitz
2016-05-17  7:35 ` [Qemu-devel] [PATCH v5 05/27] block: Add bdrv_image_locked Fam Zheng
2016-05-24 16:04   ` Max Reitz
2016-05-17  7:35 ` [Qemu-devel] [PATCH v5 06/27] block: Make bdrv_reopen_{commit, abort} private functions Fam Zheng
2016-05-24 16:09   ` Max Reitz
2016-05-27  7:42     ` Fam Zheng
2016-05-17  7:35 ` [Qemu-devel] [PATCH v5 07/27] block: Handle image locking during reopen Fam Zheng
2016-05-24 16:28   ` Max Reitz
2016-05-27  7:48     ` Fam Zheng
2016-05-27  9:57       ` Max Reitz
2016-05-27 12:36         ` Fam Zheng
2016-05-17  7:35 ` [Qemu-devel] [PATCH v5 08/27] osdep: Add qemu_lock_fd and qemu_unlock_fd Fam Zheng
2016-05-24 16:42   ` Max Reitz
2016-05-17  7:35 ` [Qemu-devel] [PATCH v5 09/27] osdep: Introduce qemu_dup Fam Zheng
2016-05-24 16:52   ` Max Reitz
2016-05-17  7:35 ` [Qemu-devel] [PATCH v5 10/27] raw-posix: Use qemu_dup Fam Zheng
2016-05-24 16:55   ` Max Reitz
2016-05-17  7:35 ` [Qemu-devel] [PATCH v5 11/27] raw-posix: Implement .bdrv_lockf Fam Zheng
2016-05-24 17:09   ` Max Reitz
2016-05-27  7:50     ` Fam Zheng
2016-05-17  7:35 ` [Qemu-devel] [PATCH v5 12/27] gluster: " Fam Zheng
2016-05-17  7:35 ` [Qemu-devel] [PATCH v5 13/27] qemu-io: Add "-L" option for BDRV_O_NO_LOCK Fam Zheng
2016-05-24 17:21   ` Max Reitz
2016-05-17  7:35 ` [Qemu-devel] [PATCH v5 14/27] qemu-img: Add "-L" option to sub commands Fam Zheng
2016-05-24 18:06   ` Max Reitz
2016-06-01  5:34     ` Fam Zheng
2016-06-02 11:30       ` Max Reitz
2016-05-17  7:35 ` [Qemu-devel] [PATCH v5 15/27] qemu-img: Update documentation of "-L" option Fam Zheng
2016-05-24 18:09   ` Max Reitz
2016-05-17  7:35 ` [Qemu-devel] [PATCH v5 16/27] qemu-nbd: Add "--no-lock/-L" option Fam Zheng
2016-05-24 18:12   ` Max Reitz
2016-05-17  7:35 ` [Qemu-devel] [PATCH v5 17/27] block: Don't lock drive-backup target image in none mode Fam Zheng
2016-05-24 18:16   ` Max Reitz
2016-05-17  7:35 ` [Qemu-devel] [PATCH v5 18/27] mirror: Disable image locking on target backing chain Fam Zheng
2016-05-24 18:20   ` Max Reitz
2016-06-03  6:32     ` Fam Zheng
2016-06-03 13:24       ` Max Reitz
2016-05-17  7:35 ` [Qemu-devel] [PATCH v5 19/27] qemu-iotests: 140: Disable image lock for qemu-io access Fam Zheng
2016-05-25 13:16   ` Max Reitz
2016-06-03  6:34     ` Fam Zheng
2016-05-17  7:35 ` [Qemu-devel] [PATCH v5 20/27] qemu-iotests: 046: Move version detection out from verify_io Fam Zheng
2016-05-25 13:23   ` Max Reitz
2016-06-03  6:43     ` Fam Zheng
2016-05-17  7:35 ` [Qemu-devel] [PATCH v5 21/27] qemu-iotests: Wait for QEMU processes before checking image in 091 Fam Zheng
2016-05-25 13:28   ` Max Reitz
2016-05-17  7:35 ` [Qemu-devel] [PATCH v5 22/27] qemu-iotests: 030: Disable image lock when checking test image Fam Zheng
2016-05-25 13:30   ` Max Reitz
2016-05-17  7:35 ` [Qemu-devel] [PATCH v5 23/27] iotests: 087: Disable image lock in cases where file is shared Fam Zheng
2016-05-25 13:41   ` Max Reitz
2016-05-25 13:41   ` Max Reitz
2016-05-17  7:35 ` [Qemu-devel] [PATCH v5 24/27] iotests: Disable image locking in 085 Fam Zheng
2016-05-25 13:52   ` Max Reitz
2016-06-03  7:18     ` Fam Zheng
2016-06-03 14:41       ` Max Reitz
2016-05-17  7:35 ` [Qemu-devel] [PATCH v5 25/27] tests: Use null-co:// instead of /dev/null Fam Zheng
2016-05-25 13:57   ` Max Reitz
2016-05-17  7:35 ` [Qemu-devel] [PATCH v5 26/27] block: Turn on image locking by default Fam Zheng
2016-05-25 13:57   ` Max Reitz
2016-05-17  7:35 ` [Qemu-devel] [PATCH v5 27/27] qemu-iotests: Add test case 153 for image locking Fam Zheng
2016-05-25 14:20   ` Max Reitz
2016-05-24 11:48 ` [Qemu-devel] [PATCH v5 00/27] block: Lock images when opening Richard W.M. Jones
2016-05-24 12:46   ` Kevin Wolf
2016-05-24 12:58     ` Richard W.M. Jones

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1463470536-8981-5-git-send-email-famz@redhat.com \
    --to=famz@redhat.com \
    --cc=armbru@redhat.com \
    --cc=berrange@redhat.com \
    --cc=den@openvz.org \
    --cc=eblake@redhat.com \
    --cc=jcody@redhat.com \
    --cc=jsnow@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=mreitz@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.