Skip to content

vhost-user-blk: fix the migration issue and enhance qtests

Dima Stepanov qemu-devel 5 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v5 Latest7 patches 9 repliesIn review
  2. v47 patches 10 repliesSuperseded
  3. v37 patches 1 replySuperseded
Earlier versions · 2
VersionPostedPatchesRepliesStatus
v27 patches6 repliesSuperseded
v17 patches4 repliesSuperseded

Changes in v5 from the cover letter

- vhost: check queue state in the vhost_dev_set_log routine tests/qtest/vhost-user-test: prepare the tests for adding new dev class
tests/qtest/vhost-user-test: add support for the vhost-user-blk device
tests/qtest/vhost-user-test: add migrate_reconnect test
Reviewed-by: Raphael Norwitz
- Update qtest, by merging vhost-user-blk "if" case with the virtio-blk case.

Patches in v5 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/7vhost: recheck dev state in the vhost_migration_log routinehw/block/vhost-user-blk.c hw/virtio/vhost.c include/hw/virtio/vhost-user-blk.h+50 -60 replies
2/7vhost: check queue state in the vhost_dev_set_log routinehw/virtio/vhost.c+12 -00 replies
3/7tests/qtest/vhost-user-test: prepare the tests for adding new dev classtests/qtest/vhost-user-test.c+76 -290 replies
4/7tests/qtest/libqos/virtio-blk: add support for vhost-user-blktests/qtest/libqos/virtio-blk.c+13 -14 replies
5/7tests/qtest/vhost-user-test: add support for the vhost-user-blk devicetests/qtest/vhost-user-test.c+137 -20 replies
6/7tests/qtest/vhost-user-test: add migrate_reconnect testtests/qtest/vhost-user-test.c+25 -00 replies
7/7tests/qtest/vhost-user-test: enable the reconnect teststests/qtest/vhost-user-test.c+11 -140 replies

Reviews trailers per patch

6 of 7 patches have a Reviewed-by or Acked-by.

PatchRaphael Norwitz
1/7R-b
2/7R-b
3/7R-b
4/7R-b
5/7R-b
6/7R-b
7/7

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v5 thread

Cover letter [PATCH v5 0/7] vhost-user-blk: fix the migration issue and enhance qtests

v4 -> v5:
- vhost: check queue state in the vhost_dev_set_log routine tests/qtest/vhost-user-test: prepare the tests for adding new dev class
tests/qtest/vhost-user-test: add support for the vhost-user-blk device
tests/qtest/vhost-user-test: add migrate_reconnect test
Reviewed-by: Raphael Norwitz
- Update qtest, by merging vhost-user-blk "if" case with the virtio-blk case.

v3 -> v4:
- vhost: recheck dev state in the vhost_migration_log routine
Reviewed-by: Raphael Norwitz
- vhost: check queue state in the vhost_dev_set_log routine Use "continue" instead of "break" to handle non-initialized virtqueue case.

v2 -> v3:
- update commit message for the
"vhost: recheck dev state in the vhost_migration_log routine" commit
- rename "started" field of the VhostUserBlk structure to "started_vu", so there will be no confustion with the VHOST started field
- update vhost-user-test.c to always initialize nq local variable (spotted by patchew)

v1 -> v2:
- add comments to connected/started fields in the header file
- move the "s->started" logic from the vhost_user_blk_disconnect routine to the vhost_user_blk_stop routine

Reference e-mail threads:
- https://lists.gnu.org/archive/html/qemu-devel/2020-05/msg01509.html
- https://lists.gnu.org/archive/html/qemu-devel/2020-05/msg05241.html

If vhost-user daemon is used as a backend for the vhost device, then we should consider a possibility of disconnect at any moment. There was a general question here: should we consider it as an error or okay state for the vhost-user devices during migration process?
I think the disconnect event for the vhost-user devices should not break the migration process, because:
- the device will be in the stopped state, so it will not be changed during migration
- if reconnect will be made the migration log will be reinitialized as

    part of reconnect/init process:
    #0  vhost_log_global_start (listener=0x563989cf7be0)
    at hw/virtio/vhost.c:920
    #1  0x000056398603d8bc in listener_add_address_space (listener=0x563989cf7be0,
        as=0x563986ea4340 <address_space_memory>)
    at softmmu/memory.c:2664
    #2  0x000056398603dd30 in memory_listener_register (listener=0x563989cf7be0,
        as=0x563986ea4340 <address_space_memory>)
    at softmmu/memory.c:2740
    #3  0x0000563985fd6956 in vhost_dev_init (hdev=0x563989cf7bd8,
        opaque=0x563989cf7e30, backend_type=VHOST_BACKEND_TYPE_USER,
        busyloop_timeout=0)
    at hw/virtio/vhost.c:1385
    #4  0x0000563985f7d0b8 in vhost_user_blk_connect (dev=0x563989cf7990)
    at hw/block/vhost-user-blk.c:315
    #5  0x0000563985f7d3f6 in vhost_user_blk_event (opaque=0x563989cf7990,
        event=CHR_EVENT_OPENED)
    at hw/block/vhost-user-blk.c:379

The first patch in the patchset fixes this issue by setting vhost device to the stopped state in the disconnect handler and check it the vhost_migration_log() routine before returning from the function.
qtest framework was updated to test vhost-user-blk functionality. The vhost-user-blk/vhost-user-blk-tests/migrate_reconnect test was added to reproduce the original issue found.

Dima Stepanov (7):
vhost: recheck dev state in the vhost_migration_log routine
vhost: check queue state in the vhost_dev_set_log routine tests/qtest/vhost-user-test: prepare the tests for adding new dev
class
tests/qtest/libqos/virtio-blk: add support for vhost-user-blk tests/qtest/vhost-user-test: add support for the vhost-user-blk device tests/qtest/vhost-user-test: add migrate_reconnect test tests/qtest/vhost-user-test: enable the reconnect tests

 hw/block/vhost-user-blk.c          |  19 ++-
 hw/virtio/vhost.c                  |  39 ++++-
 include/hw/virtio/vhost-user-blk.h |  10 ++
 tests/qtest/libqos/virtio-blk.c    |  14 +-
 tests/qtest/vhost-user-test.c      | 290 +++++++++++++++++++++++++++++++------
 5 files changed, 322 insertions(+), 50 deletions(-)
Signature · 1 line
2.7.4