1. 18 6月, 2019 2 次提交
    • M
      block: Add bdrv_child_refresh_perms() · c1087f12
      Max Reitz 提交于
      If a block node uses bdrv_child_try_set_perm() to change the permission
      it takes on its child, the result may be very short-lived.  If anything
      makes the block layer recalculate the permissions internally, it will
      invoke the node driver's .bdrv_child_perm() implementation.  The
      permission/shared permissions masks that returns will then override the
      values previously passed to bdrv_child_try_set_perm().
      
      If drivers want a child edge to have specific values for the
      permissions/shared permissions mask, it must return them in
      .bdrv_child_perm().  Consequentially, there is no need for them to pass
      the same values to bdrv_child_try_set_perm() then: It is better to have
      a function that invokes .bdrv_child_perm() and calls
      bdrv_child_try_set_perm() with the result.  This patch adds such a
      function under the name of bdrv_child_refresh_perms().
      Signed-off-by: NMax Reitz <mreitz@redhat.com>
      Reviewed-by: NKevin Wolf <kwolf@redhat.com>
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      c1087f12
    • V
      block: drop bs->job · b23c580c
      Vladimir Sementsov-Ogievskiy 提交于
      Drop remaining users of bs->job:
      1. assertions actually duplicated by assert(!bs->refcnt)
      2. trace-point seems not enough reason to change stream_start to return
         BlockJob pointer
      3. Restricting creation of two jobs based on same bs is bad idea, as
         3.1 Some jobs creates filters to be their main node, so, this check
         don't actually prevent creating second job on same real node (which
         will create another filter node) (but I hope it is restricted by
         other mechanisms)
         3.2 Even without bs->job we have two systems of permissions:
         op-blockers and BLK_PERM
         3.3 We may want to run several jobs on one node one day
      
      And finally, drop bs->job pointer itself. Hurrah!
      Suggested-by: NKevin Wolf <kwolf@redhat.com>
      Signed-off-by: NVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      b23c580c
  2. 04 6月, 2019 6 次提交
    • K
      block: Remove bdrv_set_aio_context() · 42a65f02
      Kevin Wolf 提交于
      All callers of bdrv_set_aio_context() are eliminated now, they have
      moved to bdrv_try_set_aio_context() and related safe functions. Remove
      bdrv_set_aio_context().
      
      With this, we can now know that the .set_aio_ctx callback must be
      present in bdrv_set_aio_context_ignore() because
      bdrv_can_set_aio_context() would have returned false previously, so
      instead of checking the condition, we can assert it.
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      42a65f02
    • K
      block: Remove wrong bdrv_set_aio_context() calls · d0ee0204
      Kevin Wolf 提交于
      The mirror and commit block jobs use bdrv_set_aio_context() to move
      their filter node into the right AioContext before hooking it up in the
      graph. Similarly, bdrv_open_backing_file() explicitly moves the backing
      file node into the right AioContext first.
      
      This isn't necessary any more, they get automatically moved into the
      right context now when attaching them.
      
      However, in the case of bdrv_open_backing_file() with a node reference,
      it's actually not only unnecessary, but even wrong: The unchecked
      bdrv_set_aio_context() changes the AioContext of the child node even if
      other parents require it to retain the old context. So this is not only
      a simplification, but a bug fix, too.
      
      Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1684342Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      d0ee0204
    • K
      block: Move node without parents to main AioContext · ad943dcb
      Kevin Wolf 提交于
      A node should only be in a non-default AioContext if a user is attached
      to it that requires this. When the last parent of a node is gone, it can
      move back to the main AioContext.
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      ad943dcb
    • K
      block: Adjust AioContexts when attaching nodes · 132ada80
      Kevin Wolf 提交于
      So far, we only made sure that updating the AioContext of a node
      affected the whole subtree. However, if a node is newly attached to a
      new parent, we also need to make sure that both the subtree of the node
      and the parent are in the same AioContext. This tries to move the new
      child node to the parent AioContext and returns an error if this isn't
      possible.
      
      BlockBackends now actually apply their AioContext to their root node.
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      132ada80
    • K
      block: Add BlockBackend.ctx · d861ab3a
      Kevin Wolf 提交于
      This adds a new parameter to blk_new() which requires its callers to
      declare from which AioContext this BlockBackend is going to be used (or
      the locks of which AioContext need to be taken anyway).
      
      The given context is only stored and kept up to date when changing
      AioContexts. Actually applying the stored AioContext to the root node
      is saved for another commit.
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      d861ab3a
    • K
      block: Drain source node in bdrv_replace_node() · f871abd6
      Kevin Wolf 提交于
      Instead of just asserting that no requests are in flight in
      bdrv_replace_node(), which is a requirement that most callers ignore, we
      can just drain the source node right there. This fixes at least starting
      a commit job while I/O is active on the backing chain, but probably
      other callers, too.
      
      Having requests in flight on the target node isn't a problem because the
      target just gets new parents, but the call path of running requests
      isn't modified. So we can just drop this assertion without a replacement.
      
      Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1711643Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      Reviewed-by: NMax Reitz <mreitz@redhat.com>
      f871abd6
  3. 29 5月, 2019 2 次提交
    • A
      block: Make bdrv_root_attach_child() unref child_bs on failure · b441dc71
      Alberto Garcia 提交于
      A consequence of the previous patch is that bdrv_attach_child()
      transfers the reference to child_bs from the caller to parent_bs,
      which will drop it on bdrv_close() or when someone calls
      bdrv_unref_child().
      
      But this only happens when bdrv_attach_child() succeeds. If it fails
      then the caller is responsible for dropping the reference to child_bs.
      
      This patch makes bdrv_attach_child() take the reference also when
      there is an error, freeing the caller for having to do it.
      
      A similar situation happens with bdrv_root_attach_child(), so the
      changes on this patch affect both functions.
      Signed-off-by: NAlberto Garcia <berto@igalia.com>
      Message-id: 20dfb3d9ccec559cdd1a9690146abad5d204a186.1557754872.git.berto@igalia.com
      [mreitz: Removed now superfluous BdrvChild * variable in
               bdrv_open_child()]
      Signed-off-by: NMax Reitz <mreitz@redhat.com>
      b441dc71
    • A
      block: Use bdrv_unref_child() for all children in bdrv_close() · dd4118c7
      Alberto Garcia 提交于
      bdrv_unref_child() does the following things:
      
        - Updates the child->bs->inherits_from pointer.
        - Calls bdrv_detach_child() to remove the BdrvChild from bs->children.
        - Calls bdrv_unref() to unref the child BlockDriverState.
      
      When bdrv_unref_child() was introduced in commit 33a60407 it was not
      used in bdrv_close() because the drivers that had additional children
      (like quorum or blkverify) had already called bdrv_unref() on their
      children during their own close functions.
      
      This was changed later (in 0bd6e91a for quorum, in 3e586be0 for
      blkverify) so there's no reason not to use bdrv_unref_child() in
      bdrv_close() anymore.
      
      After this there's also no need to remove bs->backing and bs->file
      separately from the rest of the children, so bdrv_close() can be
      simplified.
      
      Now bdrv_close() unrefs all children (before this patch it was only
      bs->file and bs->backing). As a result, none of the callers of
      brvd_attach_child() should remove their reference to child_bs (because
      this function effectively steals that reference). This patch updates a
      couple of tests that were doing their own bdrv_unref().
      Signed-off-by: NAlberto Garcia <berto@igalia.com>
      Message-id: 6d1d5feaa53aa1ab127adb73d605dc4503e3abd5.1557754872.git.berto@igalia.com
      [mreitz: s/where/were/]
      Signed-off-by: NMax Reitz <mreitz@redhat.com>
      dd4118c7
  4. 20 5月, 2019 5 次提交
    • M
      block: Improve "Block node is read-only" message · 481e0eee
      Max Reitz 提交于
      This message does not make any sense when it appears as the response to
      making an R/W node read-only.  We should detect that case and emit a
      different message, then.
      Signed-off-by: NMax Reitz <mreitz@redhat.com>
      Reviewed-by: NAlberto Garcia <berto@igalia.com>
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      481e0eee
    • K
      block: Propagate AioContext change to parents · 53a7d041
      Kevin Wolf 提交于
      All block nodes and users in any connected component of the block graph
      must be in the same AioContext, so changing the AioContext of one node
      must not only change all of its children, but all of its parents (and
      in turn their children etc.) as well.
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      53a7d041
    • K
      block: Move recursion to bdrv_set_aio_context() · 0d83708a
      Kevin Wolf 提交于
      Instead of having two recursions, in bdrv_attach_aio_context() and in
      bdrv_detach_aio_context(), just having one recursion is enough. Said
      functions are only about a single node now.
      
      It is important that the recursion doesn't happen between detaching and
      attaching a context to the current node because the nested call will
      drain the node, and draining with a NULL context would segfault.
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      0d83708a
    • K
      block: Make bdrv_attach/detach_aio_context() static · a3a683c3
      Kevin Wolf 提交于
      Since commit b97511c7, there is no reason for block drivers any more
      to call these functions (see the function comment in block_int.h). They
      are now just internal helper functions for bdrv_set_aio_context()
      and can be made static.
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      a3a683c3
    • K
      block: Add bdrv_try_set_aio_context() · 5d231849
      Kevin Wolf 提交于
      Eventually, we want to make sure that all parents and all children of a
      node are in the same AioContext as the node itself. This means that
      changing the AioContext may fail because one of the other involved
      parties (e.g. a guest device that was configured with an iothread)
      cannot allow switching to a different AioContext.
      
      Introduce a set of functions that allow to first check whether all
      involved nodes can switch to a new context and only then do the actual
      switch. The check recursively covers children and parents.
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      5d231849
  5. 10 5月, 2019 2 次提交
  6. 07 5月, 2019 1 次提交
  7. 30 4月, 2019 1 次提交
    • K
      block: Fix AioContext switch for bs->drv == NULL · 1bffe1ae
      Kevin Wolf 提交于
      Even for block nodes with bs->drv == NULL, we can't just ignore a
      bdrv_set_aio_context() call. Leaving the node in its old context can
      mean that it's still in an iothread context in bdrv_close_all() during
      shutdown, resulting in an attempted unlock of the AioContext lock which
      we don't hold.
      
      This is an example stack trace of a related crash:
      
       #0  0x00007ffff59da57f in raise () at /lib64/libc.so.6
       #1  0x00007ffff59c4895 in abort () at /lib64/libc.so.6
       #2  0x0000555555b97b1e in error_exit (err=<optimized out>, msg=msg@entry=0x555555d386d0 <__func__.19059> "qemu_mutex_unlock_impl") at util/qemu-thread-posix.c:36
       #3  0x0000555555b97f7f in qemu_mutex_unlock_impl (mutex=mutex@entry=0x5555568002f0, file=file@entry=0x555555d378df "util/async.c", line=line@entry=507) at util/qemu-thread-posix.c:97
       #4  0x0000555555b92f55 in aio_context_release (ctx=ctx@entry=0x555556800290) at util/async.c:507
       #5  0x0000555555b05cf8 in bdrv_prwv_co (child=child@entry=0x7fffc80012f0, offset=offset@entry=131072, qiov=qiov@entry=0x7fffffffd4f0, is_write=is_write@entry=true, flags=flags@entry=0)
               at block/io.c:833
       #6  0x0000555555b060a9 in bdrv_pwritev (qiov=0x7fffffffd4f0, offset=131072, child=0x7fffc80012f0) at block/io.c:990
       #7  0x0000555555b060a9 in bdrv_pwrite (child=0x7fffc80012f0, offset=131072, buf=<optimized out>, bytes=<optimized out>) at block/io.c:990
       #8  0x0000555555ae172b in qcow2_cache_entry_flush (bs=bs@entry=0x555556810680, c=c@entry=0x5555568cc740, i=i@entry=0) at block/qcow2-cache.c:51
       #9  0x0000555555ae18dd in qcow2_cache_write (bs=bs@entry=0x555556810680, c=0x5555568cc740) at block/qcow2-cache.c:248
       #10 0x0000555555ae15de in qcow2_cache_flush (bs=0x555556810680, c=<optimized out>) at block/qcow2-cache.c:259
       #11 0x0000555555ae16b1 in qcow2_cache_flush_dependency (c=0x5555568a1700, c=0x5555568a1700, bs=0x555556810680) at block/qcow2-cache.c:194
       #12 0x0000555555ae16b1 in qcow2_cache_entry_flush (bs=bs@entry=0x555556810680, c=c@entry=0x5555568a1700, i=i@entry=0) at block/qcow2-cache.c:194
       #13 0x0000555555ae18dd in qcow2_cache_write (bs=bs@entry=0x555556810680, c=0x5555568a1700) at block/qcow2-cache.c:248
       #14 0x0000555555ae15de in qcow2_cache_flush (bs=bs@entry=0x555556810680, c=<optimized out>) at block/qcow2-cache.c:259
       #15 0x0000555555ad242c in qcow2_inactivate (bs=bs@entry=0x555556810680) at block/qcow2.c:2124
       #16 0x0000555555ad2590 in qcow2_close (bs=0x555556810680) at block/qcow2.c:2153
       #17 0x0000555555ab0c62 in bdrv_close (bs=0x555556810680) at block.c:3358
       #18 0x0000555555ab0c62 in bdrv_delete (bs=0x555556810680) at block.c:3542
       #19 0x0000555555ab0c62 in bdrv_unref (bs=0x555556810680) at block.c:4598
       #20 0x0000555555af4d72 in blk_remove_bs (blk=blk@entry=0x5555568103d0) at block/block-backend.c:785
       #21 0x0000555555af4dbb in blk_remove_all_bs () at block/block-backend.c:483
       #22 0x0000555555aae02f in bdrv_close_all () at block.c:3412
       #23 0x00005555557f9796 in main (argc=<optimized out>, argv=<optimized out>, envp=<optimized out>) at vl.c:4776
      
      The reproducer I used is a qcow2 image on gluster volume, where the
      virtual disk size (4 GB) is larger than the gluster volume size (64M),
      so we can easily trigger an ENOSPC. This backend is assigned to a
      virtio-blk device using an iothread, and then from the guest a
      'dd if=/dev/zero of=/dev/vda bs=1G count=1' causes the VM to stop
      because of an I/O error. qemu_gluster_co_flush_to_disk() sets
      bs->drv = NULL on error, so when virtio-blk stops the dataplane, the
      block nodes stay in the iothread AioContext. A 'quit' monitor command
      issued from this paused state crashes the process.
      
      Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1631227
      Cc: qemu-stable@nongnu.org
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      Reviewed-by: NEric Blake <eblake@redhat.com>
      Reviewed-by: NMax Reitz <mreitz@redhat.com>
      Reviewed-by: NStefano Garzarella <sgarzare@redhat.com>
      1bffe1ae
  8. 08 4月, 2019 1 次提交
  9. 02 4月, 2019 1 次提交
  10. 19 3月, 2019 1 次提交
  11. 13 3月, 2019 10 次提交
    • A
      block: Remove the AioContext parameter from bdrv_reopen_multiple() · 5019aece
      Alberto Garcia 提交于
      This parameter has been unused since 1a63a907Signed-off-by: NAlberto Garcia <berto@igalia.com>
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      5019aece
    • A
      block: Add bdrv_reset_options_allowed() · faf116b4
      Alberto Garcia 提交于
      bdrv_reopen_prepare() receives a BDRVReopenState with (among other
      things) a new set of options to be applied to that BlockDriverState.
      
      If an option is missing then it means that we want to reset it to its
      default value rather than keep the previous one. This way the state
      of the block device after being reopened is comparable to that of a
      device added with "blockdev-add" using the same set of options.
      
      Not all options from all drivers can be changed this way, however.
      If the user attempts to reset an immutable option to its default value
      using this method then we must forbid it.
      
      This new function takes a BlockDriverState and a new set of options
      and checks if there's any option that was previously set but is
      missing from the new set of options.
      
      If the option is present in both sets we don't need to check that they
      have the same value. The loop at the end of bdrv_reopen_prepare()
      already takes care of that.
      Signed-off-by: NAlberto Garcia <berto@igalia.com>
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      faf116b4
    • A
      block: Allow changing the backing file on reopen · cb828c31
      Alberto Garcia 提交于
      This patch allows the user to change the backing file of an image that
      is being reopened. Here's what it does:
      
       - In bdrv_reopen_prepare(): check that the value of 'backing' points
         to an existing node or is null. If it points to an existing node it
         also needs to make sure that replacing the backing file will not
         create a cycle in the node graph (i.e. you cannot reach the parent
         from the new backing file).
      
       - In bdrv_reopen_commit(): perform the actual node replacement by
         calling bdrv_set_backing_hd().
      
      There may be temporary implicit nodes between a BDS and its backing
      file (e.g. a commit filter node). In these cases bdrv_reopen_prepare()
      looks for the real (non-implicit) backing file and requires that the
      'backing' option points to it. Replacing or detaching a backing file
      is forbidden if there are implicit nodes in the middle.
      
      Although x-blockdev-reopen is meant to be used like blockdev-add,
      there's an important thing that must be taken into account: the only
      way to set a new backing file is by using a reference to an existing
      node (previously added with e.g. blockdev-add).  If 'backing' contains
      a dictionary with a new set of options ({"driver": "qcow2", "file": {
      ... }}) then it is interpreted that the _existing_ backing file must
      be reopened with those options.
      Signed-off-by: NAlberto Garcia <berto@igalia.com>
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      cb828c31
    • A
      block: Allow omitting the 'backing' option in certain cases · bacd9b87
      Alberto Garcia 提交于
      Of all options of type BlockdevRef used to specify children in
      BlockdevOptions, 'backing' is the only one that is optional.
      
      For "x-blockdev-reopen" we want that if an option is omitted then it
      must be reset to its default value. The default value of 'backing'
      means that QEMU opens the backing file specified in the image
      metadata, but this is not something that we want to support for the
      reopen operation.
      
      Because of this the 'backing' option has to be specified during
      reopen, pointing to the existing backing file if we want to keep it,
      or pointing to a different one (or NULL) if we want to replace it (to
      be implemented in a subsequent patch).
      
      In order to simplify things a bit and not to require that the user
      passes the 'backing' option to every single block device even when
      it's clearly not necessary, this patch allows omitting this option if
      the block device being reopened doesn't have a backing file attached
      _and_ no default backing file is specified in the image metadata.
      Signed-off-by: NAlberto Garcia <berto@igalia.com>
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      bacd9b87
    • A
      block: Handle child references in bdrv_reopen_queue() · 8546632e
      Alberto Garcia 提交于
      Children in QMP are specified with BlockdevRef / BlockdevRefOrNull,
      which can contain a set of child options, a child reference, or
      NULL. In optional attributes like "backing" it can also be missing.
      
      Only the first case (set of child options) is being handled properly
      by bdrv_reopen_queue(). This patch deals with all the others.
      
      Here's how these cases should be handled when bdrv_reopen_queue() is
      deciding what to do with each child of a BlockDriverState:
      
         1) Set of child options: if the child was implicitly created (i.e
            inherits_from points to the parent) then the options are removed
            from the parent's options QDict and are passed to the child with
            a recursive bdrv_reopen_queue() call. This case was already
            working fine.
      
         2) Child reference: there's two possibilites here.
      
            2a) Reference to the current child: if the child was implicitly
                created then it is put in the reopen queue, keeping its
                current set of options (since this was a child reference
                there was no way to specify a different set of options).
                If the child is not implicit then it keeps its current set
                of options but it is not reopened (and therefore does not
                inherit any new option from the parent).
      
            2b) Reference to a different BDS: the current child is not put
                in the reopen queue at all. Passing a reference to a
                different BDS can be used to replace a child, although at
                the moment no driver implements this, so it results in an
                error. In any case, the current child is not going to be
                reopened (and might in fact disappear if it's replaced)
      
         3) NULL: This is similar to (2b). Although no driver allows this
            yet it can be used to detach the current child so it should not
            be put in the reopen queue.
      
         4) Missing option: at the moment "backing" is the only case where
            this can happen. With "blockdev-add", leaving "backing" out
            means that the default backing file is opened. We don't want to
            open a new image during reopen, so we require that "backing" is
            always present. We'll relax this requirement a bit in the next
            patch. If keep_old_opts is true and "backing" is missing then
            this behaves like 2a (the current child is reopened).
      Signed-off-by: NAlberto Garcia <berto@igalia.com>
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      8546632e
    • A
      block: Add 'keep_old_opts' parameter to bdrv_reopen_queue() · 077e8e20
      Alberto Garcia 提交于
      The bdrv_reopen_queue() function is used to create a queue with
      the BDSs that are going to be reopened and their new options. Once
      the queue is ready bdrv_reopen_multiple() is called to perform the
      operation.
      
      The original options from each one of the BDSs are kept, with the new
      options passed to bdrv_reopen_queue() applied on top of them.
      
      For "x-blockdev-reopen" we want a function that behaves much like
      "blockdev-add". We want to ignore the previous set of options so that
      only the ones actually specified by the user are applied, with the
      rest having their default values.
      
      One of the things that we need is a way to tell bdrv_reopen_queue()
      whether we want to keep the old set of options or not, and that's what
      this patch does. All current callers are setting this new parameter to
      true and x-blockdev-reopen will set it to false.
      Signed-off-by: NAlberto Garcia <berto@igalia.com>
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      077e8e20
    • A
      block: Allow freezing BdrvChild links · 2cad1ebe
      Alberto Garcia 提交于
      Our permission system is useful to define what operations are allowed
      on a certain block node and includes things like BLK_PERM_WRITE or
      BLK_PERM_RESIZE among others.
      
      One of the permissions is BLK_PERM_GRAPH_MOD which allows "changing
      the node that this BdrvChild points to". The exact meaning of this has
      never been very clear, but it can be understood as "change any of the
      links connected to the node". This can be used to prevent changing a
      backing link, but it's too coarse.
      
      This patch adds a new 'frozen' attribute to BdrvChild, which forbids
      detaching the link from the node it points to, and new API to freeze
      and unfreeze a backing chain.
      
      After this change a few functions can fail, so they need additional
      checks.
      Signed-off-by: NAlberto Garcia <berto@igalia.com>
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      2cad1ebe
    • K
      file-posix: Fix bdrv_open_flags() for snapshot=on · 30855137
      Kevin Wolf 提交于
      Using a different read-only setting for bs->open_flags than for the
      flags to the driver's open function is just inconsistent and a bad idea.
      After this patch, the temporary snapshot keeps being opened read-only if
      read-only=on,snapshot=on is passed.
      
      If we wanted to change this behaviour to make only the orginal image
      file read-only, but the temporary overlay read-write (as the comment in
      the removed code suggests), that change would have to be made in
      bdrv_temp_snapshot_options() (where the comment suggests otherwise).
      
      Addressing this inconsistency before introducing dynamic auto-read-only
      is important because otherwise we would immediately try to reopen the
      temporary overlay even though the file is already unlinked.
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      30855137
    • K
      block: Make permission changes in reopen less wrong · 69b736e7
      Kevin Wolf 提交于
      The way that reopen interacts with permission changes has one big
      problem: Both operations are recursive, and the permissions are changes
      for each node in the reopen queue.
      
      For a simple graph that consists just of parent and child,
      .bdrv_check_perm will be called twice for the child, once recursively
      when adjusting the permissions of parent, and once again when the child
      itself is reopened.
      
      Even worse, the first .bdrv_check_perm call happens before
      .bdrv_reopen_prepare was called for the child and the second one is
      called afterwards.
      
      Making sure that .bdrv_check_perm (and the other permission callbacks)
      are called only once is hard. We can cope with multiple calls right now,
      but as soon as file-posix gets a dynamic auto-read-only that may need to
      open a new file descriptor, we get the additional requirement that all
      of them are after the .bdrv_reopen_prepare call.
      
      So reorder things in bdrv_reopen_multiple() to first call
      .bdrv_reopen_prepare for all involved nodes and only then adjust
      permissions.
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      69b736e7
    • K
      block: Avoid useless local_err · a4615ab3
      Kevin Wolf 提交于
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      Reviewed-by: NAlberto Garcia <berto@igalia.com>
      Reviewed-by: NEric Blake <eblake@redhat.com>
      a4615ab3
  12. 08 3月, 2019 1 次提交
    • A
      block: iterate_format with account of whitelisting · 9ac404c5
      Andrey Shinkevich 提交于
      bdrv_iterate_format (which is currently only used for printing out the
      formats supported by the block layer) doesn't take format whitelisting
      into account.
      
      This creates a problem for tests: they enumerate supported formats to
      decide which tests to enable, but then discover that QEMU doesn't let
      them actually use some of those formats.
      
      To avoid that, exclude formats that are not whitelisted from
      enumeration, if whitelisting is in use.  Since we have separate
      whitelists for r/w and r/o, take this a parameter to
      bdrv_iterate_format, and print two lists of supported formats (r/w and
      r/o) in main qemu.
      Signed-off-by: NRoman Kagan <rkagan@virtuozzo.com>
      Signed-off-by: NAndrey Shinkevich <andrey.shinkevich@virtuozzo.com>
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      9ac404c5
  13. 25 2月, 2019 7 次提交
    • M
      block: BDS options may lack the "driver" option · 62a01a27
      Max Reitz 提交于
      When BDSs are created by qemu itself (e.g. as filters in block jobs),
      they may not have a "driver" option in their options QDict.  When
      generating a json:{} filename, however, it must always be present.
      Signed-off-by: NMax Reitz <mreitz@redhat.com>
      Reviewed-by: NAlberto Garcia <berto@igalia.com>
      Message-id: 20190201192935.18394-31-mreitz@redhat.com
      Signed-off-by: NMax Reitz <mreitz@redhat.com>
      62a01a27
    • M
      block: Do not copy exact_filename from format file · fb695c74
      Max Reitz 提交于
      If a format BDS's file BDS is in turn a format BDS, we cannot simply use
      the same filename, because when opening a BDS tree based on a filename
      alone, qemu will create only one format node on top of one protocol node
      (disregarding a potential backing file).
      Signed-off-by: NMax Reitz <mreitz@redhat.com>
      Reviewed-by: NAlberto Garcia <berto@igalia.com>
      Message-id: 20190201192935.18394-26-mreitz@redhat.com
      Signed-off-by: NMax Reitz <mreitz@redhat.com>
      fb695c74
    • M
      block: Purify .bdrv_refresh_filename() · 998b3a1e
      Max Reitz 提交于
      Currently, BlockDriver.bdrv_refresh_filename() is supposed to both
      refresh the filename (BDS.exact_filename) and set BDS.full_open_options.
      Now that we have generic code in the central bdrv_refresh_filename() for
      creating BDS.full_open_options, we can drop the latter part from all
      BlockDriver.bdrv_refresh_filename() implementations.
      
      This also means that we can drop all of the existing default code for
      this from the global bdrv_refresh_filename() itself.
      
      Furthermore, we now have to call BlockDriver.bdrv_refresh_filename()
      after having set BDS.full_open_options, because the block driver's
      implementation should now be allowed to depend on BDS.full_open_options
      being set correctly.
      
      Finally, with this patch we can drop the @options parameter from
      BlockDriver.bdrv_refresh_filename(); also, add a comment on this
      function's purpose in block/block_int.h while touching its interface.
      
      This completely obsoletes blklogwrite's implementation of
      .bdrv_refresh_filename().
      Signed-off-by: NMax Reitz <mreitz@redhat.com>
      Message-id: 20190201192935.18394-25-mreitz@redhat.com
      Signed-off-by: NMax Reitz <mreitz@redhat.com>
      998b3a1e
    • M
      block: Generically refresh runtime options · 97e2f021
      Max Reitz 提交于
      Instead of having every block driver which implements
      bdrv_refresh_filename() copy all of the strong runtime options over to
      bs->full_open_options, implement this process generically in
      bdrv_refresh_filename().
      
      This patch only adds this new generic implementation, it does not remove
      the old functionality. This is done in a follow-up patch.
      
      With this patch, some superfluous information (that should never have
      been there) may be removed from some JSON filenames, as can be seen in
      the change to iotests 110's and 228's reference outputs.
      Signed-off-by: NMax Reitz <mreitz@redhat.com>
      Message-id: 20190201192935.18394-24-mreitz@redhat.com
      Signed-off-by: NMax Reitz <mreitz@redhat.com>
      97e2f021
    • M
      block: Use bdrv_dirname() for relative filenames · 8df68616
      Max Reitz 提交于
      bdrv_get_full_backing_filename_from_filename() breaks down when it comes
      to JSON filenames. Using bdrv_dirname() as the basis is better because
      since we have BDS, we can descend through the BDS tree to the protocol
      layer, which gives us a greater probability of finding a non-JSON name;
      also, bdrv_dirname() is more correct as it allows block drivers to
      override the generation of that directory name in a protocol-specific
      way.
      
      We still need to keep bdrv_get_full_backing_filename_from_filename(),
      though, because it has valid callers which need it during image creation
      when no BDS is available yet.
      
      This makes a test case in qemu-iotest 110, which was supposed to fail,
      work. That is actually good, but we need to change the reference output
      (and the comment in 110) accordingly.
      Signed-off-by: NMax Reitz <mreitz@redhat.com>
      Reviewed-by: NAlberto Garcia <berto@igalia.com>
      Message-id: 20190201192935.18394-20-mreitz@redhat.com
      Signed-off-by: NMax Reitz <mreitz@redhat.com>
      8df68616
    • M
      block: Add bdrv_dirname() · 1e89d0f9
      Max Reitz 提交于
      This function may be implemented by block drivers to derive a directory
      name from a BDS. Concatenating this g_free()-able string with a relative
      filename must result in a valid (not necessarily existing) filename, so
      this is a function that should generally be not implemented by format
      drivers, because this is protocol-specific.
      
      If a BDS's driver does not implement this function, bdrv_dirname() will
      fall through to the BDS's file if it exists. If it does not, the
      exact_filename field will be used to generate a directory name.
      Signed-off-by: NMax Reitz <mreitz@redhat.com>
      Reviewed-by: NAlberto Garcia <berto@igalia.com>
      Message-id: 20190201192935.18394-15-mreitz@redhat.com
      Signed-off-by: NMax Reitz <mreitz@redhat.com>
      1e89d0f9
    • M
      block: Fix bdrv_find_backing_image() · 2d9158ce
      Max Reitz 提交于
      bdrv_find_backing_image() should use bdrv_get_full_backing_filename() or
      bdrv_make_absolute_filename() instead of trying to do what those
      functions do by itself.
      
      path_combine_deprecated() can now be dropped, so let's do that.
      Signed-off-by: NMax Reitz <mreitz@redhat.com>
      Reviewed-by: NAlberto Garcia <berto@igalia.com>
      Message-id: 20190201192935.18394-14-mreitz@redhat.com
      Signed-off-by: NMax Reitz <mreitz@redhat.com>
      2d9158ce