From: "Benoît Canet" <benoit@irqsave.net>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, pbonzini@redhat.com,
"Benoît Canet" <benoit@irqsave.net>,
stefanha@redhat.com
Subject: [Qemu-devel] [RFC V1 07/12] qcow2: Add qcow2_pause_dedup.
Date: Wed, 16 Jan 2013 17:25:13 +0100 [thread overview]
Message-ID: <1358353518-5421-8-git-send-email-benoit@irqsave.net> (raw)
In-Reply-To: <1358353518-5421-1-git-send-email-benoit@irqsave.net>
---
block/qcow2-dedup.c | 19 +++++++++++++++++++
block/qcow2.c | 2 ++
block/qcow2.h | 1 +
3 files changed, 22 insertions(+)
diff --git a/block/qcow2-dedup.c b/block/qcow2-dedup.c
index dd320bf..e007387 100644
--- a/block/qcow2-dedup.c
+++ b/block/qcow2-dedup.c
@@ -1278,15 +1278,20 @@ static void qcow2_deduplicate_after_resuming(BlockDriverState *bs)
BDRVQcowState *s = bs->opaque;
uint64_t i;
bool processed;
+ bool exit;
/* for each l2 entry */
for (i = 0; i < s->l2_size * s->l1_size; i++) {
qemu_co_mutex_lock(&s->lock);
processed = qcow2_process_to_dedup_cluster(bs, i);
+ exit = s->dedup_status == QCOW_DEDUP_STOPPING;
qemu_co_mutex_unlock(&s->lock);
if (processed || !(i % s->l2_size)) {
co_sleep_ns(rt_clock, s->dedup_co_delay);
}
+ if (exit) {
+ return;
+ }
}
}
@@ -1450,3 +1455,17 @@ void qcow2_dedup_update_metrics(BlockDriverState *bs)
s->dedup_metrics.ram_usage = nb_hashs * GTREE_NODE_SIZE * 2;
s->dedup_metrics.ram_usage += nb_hashs * sizeof(QCowHashNode);
}
+
+void qcow2_pause_dedup(BlockDriverState *bs)
+{
+ BDRVQcowState *s = bs->opaque;
+
+ if (s->dedup_status != QCOW_DEDUP_STARTED) {
+ return;
+ }
+
+ s->dedup_status = QCOW_DEDUP_STOPPING;
+ /* must handle half processed write requests */
+ qcow2_dedup_reset(bs);
+ s->dedup_status = QCOW_DEDUP_STOPPED;
+}
diff --git a/block/qcow2.c b/block/qcow2.c
index e442268..c17ab63 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -2011,6 +2011,8 @@ static BlockDriver bdrv_qcow2 = {
.bdrv_invalidate_cache = qcow2_invalidate_cache,
+ .bdrv_pause_dedup = qcow2_pause_dedup,
+
.create_options = qcow2_create_options,
.bdrv_check = qcow2_check,
};
diff --git a/block/qcow2.h b/block/qcow2.h
index d8e8539..5940c89 100644
--- a/block/qcow2.h
+++ b/block/qcow2.h
@@ -511,5 +511,6 @@ bool qcow2_dedup_is_running(BlockDriverState *bs);
int qcow2_dedup_init(BlockDriverState *bs);
void qcow2_dedup_close(BlockDriverState *bs);
void qcow2_dedup_update_metrics(BlockDriverState *bs);
+void qcow2_pause_dedup(BlockDriverState *bs);
#endif
--
1.7.10.4
next prev parent reply other threads:[~2013-01-16 16:29 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-16 16:25 [Qemu-devel] [RFC V1 00/12] QCOW2 asynchronous deduplication Benoît Canet
2013-01-16 16:25 ` [Qemu-devel] [RFC V1 01/12] block: Add BlockDriver function prototype to pause and resume deduplication Benoît Canet
2013-01-16 16:25 ` [Qemu-devel] [RFC V1 02/12] qcow2: Add code to deduplicate cluster flagged with QCOW_OFLAG_TO_DEDUP Benoît Canet
2013-01-16 16:25 ` [Qemu-devel] [RFC V1 03/12] block: Add bdrv_has_dedup Benoît Canet
2013-01-16 16:25 ` [Qemu-devel] [RFC V1 04/12] block: Add bdrv_is_dedup_running Benoît Canet
2013-01-16 16:25 ` [Qemu-devel] [RFC V1 05/12] block: Add bdrv_resume_dedup Benoît Canet
2013-01-16 16:25 ` [Qemu-devel] [RFC V1 06/12] block: Add bdrv_pause_dedup Benoît Canet
2013-01-16 16:25 ` Benoît Canet [this message]
2013-01-16 16:25 ` [Qemu-devel] [RFC V1 08/12] qcow2: Add qcow2_resume_dedup Benoît Canet
2013-01-16 16:25 ` [Qemu-devel] [RFC V1 09/12] qcow2: Make dedup status persists Benoît Canet
2013-01-16 16:25 ` [Qemu-devel] [RFC V1 10/12] qerror: Add QERR_DEVICE_NOT_DEDUPLICATED Benoît Canet
2013-01-16 23:00 ` Eric Blake
2013-01-16 16:25 ` [Qemu-devel] [RFC V1 11/12] qmp: Add block-pause-dedup Benoît Canet
2013-01-16 23:32 ` Eric Blake
2013-01-17 11:20 ` Benoît Canet
2013-01-16 16:25 ` [Qemu-devel] [RFC V1 12/12] qmp: Add block_resume_dedup Benoît Canet
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=1358353518-5421-8-git-send-email-benoit@irqsave.net \
--to=benoit@irqsave.net \
--cc=kwolf@redhat.com \
--cc=pbonzini@redhat.com \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).