Blame SOURCES/kvm-blockjob-Introduce-block_job_ratelimit_get_delay.patch

357786
From 0106ebf221d3cc30580249e7b9b4d90a0ad10c5c Mon Sep 17 00:00:00 2001
357786
From: Kevin Wolf <kwolf@redhat.com>
357786
Date: Tue, 26 Jun 2018 09:47:55 +0200
357786
Subject: [PATCH 26/89] blockjob: Introduce block_job_ratelimit_get_delay()
357786
357786
RH-Author: Kevin Wolf <kwolf@redhat.com>
357786
Message-id: <20180626094856.6924-13-kwolf@redhat.com>
357786
Patchwork-id: 81079
357786
O-Subject: [RHV-7.6 qemu-kvm-rhev PATCH v2 12/73] blockjob: Introduce block_job_ratelimit_get_delay()
357786
Bugzilla: 1513543
357786
RH-Acked-by: Jeffrey Cody <jcody@redhat.com>
357786
RH-Acked-by: Max Reitz <mreitz@redhat.com>
357786
RH-Acked-by: Fam Zheng <famz@redhat.com>
357786
357786
This gets us rid of more direct accesses to BlockJob fields from the
357786
job drivers.
357786
357786
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
357786
Reviewed-by: Eric Blake <eblake@redhat.com>
357786
Reviewed-by: Max Reitz <mreitz@redhat.com>
357786
Reviewed-by: John Snow <jsnow@redhat.com>
357786
(cherry picked from commit dee81d5111ff0e24ac63ab0dbbd19e84c2f87904)
357786
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
357786
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
357786
---
357786
 block/backup.c               | 18 +++++++-----------
357786
 block/commit.c               |  4 ++--
357786
 block/mirror.c               |  5 +----
357786
 block/stream.c               |  4 ++--
357786
 blockjob.c                   |  9 +++++++++
357786
 include/block/blockjob_int.h |  8 ++++++++
357786
 6 files changed, 29 insertions(+), 19 deletions(-)
357786
357786
diff --git a/block/backup.c b/block/backup.c
357786
index 8468fd9..cfdb6ec 100644
357786
--- a/block/backup.c
357786
+++ b/block/backup.c
357786
@@ -325,21 +325,17 @@ static void backup_complete(BlockJob *job, void *opaque)
357786
 
357786
 static bool coroutine_fn yield_and_check(BackupBlockJob *job)
357786
 {
357786
+    uint64_t delay_ns;
357786
+
357786
     if (block_job_is_cancelled(&job->common)) {
357786
         return true;
357786
     }
357786
 
357786
-    /* we need to yield so that bdrv_drain_all() returns.
357786
-     * (without, VM does not reboot)
357786
-     */
357786
-    if (job->common.speed) {
357786
-        uint64_t delay_ns = ratelimit_calculate_delay(&job->common.limit,
357786
-                                                      job->bytes_read);
357786
-        job->bytes_read = 0;
357786
-        block_job_sleep_ns(&job->common, delay_ns);
357786
-    } else {
357786
-        block_job_sleep_ns(&job->common, 0);
357786
-    }
357786
+    /* We need to yield even for delay_ns = 0 so that bdrv_drain_all() can
357786
+     * return. Without a yield, the VM would not reboot. */
357786
+    delay_ns = block_job_ratelimit_get_delay(&job->common, job->bytes_read);
357786
+    job->bytes_read = 0;
357786
+    block_job_sleep_ns(&job->common, delay_ns);
357786
 
357786
     if (block_job_is_cancelled(&job->common)) {
357786
         return true;
357786
diff --git a/block/commit.c b/block/commit.c
357786
index 46cbeae..ba5df6a 100644
357786
--- a/block/commit.c
357786
+++ b/block/commit.c
357786
@@ -197,8 +197,8 @@ static void coroutine_fn commit_run(void *opaque)
357786
         /* Publish progress */
357786
         block_job_progress_update(&s->common, n);
357786
 
357786
-        if (copy && s->common.speed) {
357786
-            delay_ns = ratelimit_calculate_delay(&s->common.limit, n);
357786
+        if (copy) {
357786
+            delay_ns = block_job_ratelimit_get_delay(&s->common, n);
357786
         } else {
357786
             delay_ns = 0;
357786
         }
357786
diff --git a/block/mirror.c b/block/mirror.c
357786
index d5e0ff2..a4197bb 100644
357786
--- a/block/mirror.c
357786
+++ b/block/mirror.c
357786
@@ -447,10 +447,7 @@ static uint64_t coroutine_fn mirror_iteration(MirrorBlockJob *s)
357786
         assert(io_bytes);
357786
         offset += io_bytes;
357786
         nb_chunks -= DIV_ROUND_UP(io_bytes, s->granularity);
357786
-        if (s->common.speed) {
357786
-            delay_ns = ratelimit_calculate_delay(&s->common.limit,
357786
-                                                 io_bytes_acct);
357786
-        }
357786
+        delay_ns = block_job_ratelimit_get_delay(&s->common, io_bytes_acct);
357786
     }
357786
     return delay_ns;
357786
 }
357786
diff --git a/block/stream.c b/block/stream.c
357786
index 797d7c4..df9660d 100644
357786
--- a/block/stream.c
357786
+++ b/block/stream.c
357786
@@ -185,8 +185,8 @@ static void coroutine_fn stream_run(void *opaque)
357786
 
357786
         /* Publish progress */
357786
         block_job_progress_update(&s->common, n);
357786
-        if (copy && s->common.speed) {
357786
-            delay_ns = ratelimit_calculate_delay(&s->common.limit, n);
357786
+        if (copy) {
357786
+            delay_ns = block_job_ratelimit_get_delay(&s->common, n);
357786
         } else {
357786
             delay_ns = 0;
357786
         }
357786
diff --git a/blockjob.c b/blockjob.c
357786
index 0f7214c..e30f5ec 100644
357786
--- a/blockjob.c
357786
+++ b/blockjob.c
357786
@@ -688,6 +688,15 @@ void block_job_set_speed(BlockJob *job, int64_t speed, Error **errp)
357786
     block_job_enter_cond(job, block_job_timer_pending);
357786
 }
357786
 
357786
+int64_t block_job_ratelimit_get_delay(BlockJob *job, uint64_t n)
357786
+{
357786
+    if (!job->speed) {
357786
+        return 0;
357786
+    }
357786
+
357786
+    return ratelimit_calculate_delay(&job->limit, n);
357786
+}
357786
+
357786
 void block_job_complete(BlockJob *job, Error **errp)
357786
 {
357786
     /* Should not be reachable via external interface for internal jobs */
357786
diff --git a/include/block/blockjob_int.h b/include/block/blockjob_int.h
357786
index ad510d5..62ec964 100644
357786
--- a/include/block/blockjob_int.h
357786
+++ b/include/block/blockjob_int.h
357786
@@ -166,6 +166,14 @@ void block_job_sleep_ns(BlockJob *job, int64_t ns);
357786
 void block_job_yield(BlockJob *job);
357786
 
357786
 /**
357786
+ * block_job_ratelimit_get_delay:
357786
+ *
357786
+ * Calculate and return delay for the next request in ns. See the documentation
357786
+ * of ratelimit_calculate_delay() for details.
357786
+ */
357786
+int64_t block_job_ratelimit_get_delay(BlockJob *job, uint64_t n);
357786
+
357786
+/**
357786
  * block_job_early_fail:
357786
  * @bs: The block device.
357786
  *
357786
-- 
357786
1.8.3.1
357786