diff mbox

[PULL,2/4] block: Forbid I/O throttling on nodes with multiple parents for 2.6

Message ID 1459870888-9246-3-git-send-email-kwolf@redhat.com
State New
Headers show

Commit Message

Kevin Wolf April 5, 2016, 3:41 p.m. UTC
As the patches to move I/O throttling to BlockBackend didn't make it in
time for the 2.6 release, but the release adds new ways of configuring
VMs whose behaviour would change once the move is done, we need to
outlaw such configurations temporarily.

The problem exists whenever a BDS has more users than just its BB, for
example it is used as a backing file for another node. (This wasn't
possible in 2.5 yet as we introduced node references to specify a
backing file only recently.) In these cases, the throttling would
apply to these other users now, but after moving throttling to the
BlockBackend the other users wouldn't be throttled any more.

This patch prevents making new references to a throttled node as well as
using monitor commands to throttle a node with multiple parents.

Compared to 2.5 this changes behaviour in some corner cases where
references were allowed before, like bs->file or Quorum children. It
seems reasonable to assume that users didn't use I/O throttling on such
low level nodes. With the upcoming move of throttling into BlockBackend,
such configurations won't be possible anyway.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
 block.c    | 7 +++++++
 blockdev.c | 7 +++++++
 2 files changed, 14 insertions(+)
diff mbox


diff --git a/block.c b/block.c
index d36eb75..d4939b4 100644
--- a/block.c
+++ b/block.c
@@ -1526,6 +1526,13 @@  static int bdrv_open_inherit(BlockDriverState **pbs, const char *filename,
         if (!bs) {
             return -ENODEV;
+        if (bs->throttle_state) {
+            error_setg(errp, "Cannot reference an existing block device for "
+                       "which I/O throttling is enabled");
+            return -EINVAL;
+        }
         *pbs = bs;
         return 0;
diff --git a/blockdev.c b/blockdev.c
index 332068a..f1f520a 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -2661,6 +2661,13 @@  void qmp_block_set_io_throttle(const char *device, int64_t bps, int64_t bps_rd,
         goto out;
+    /* The BlockBackend must be the only parent */
+    assert(QLIST_FIRST(&bs->parents));
+    if (QLIST_NEXT(QLIST_FIRST(&bs->parents), next_parent)) {
+        error_setg(errp, "Cannot throttle device with multiple parents");
+        goto out;
+    }
     cfg.buckets[THROTTLE_BPS_TOTAL].avg = bps;
     cfg.buckets[THROTTLE_BPS_READ].avg  = bps_rd;