v2: * Add abrt handler that terminates qemu-storage-daemon to vhost-user-blk-test. No more orphaned processes on test failure. [Peter] * Fix sector number calculation in vhost-user-blk-server.c * Introduce VIRTIO_BLK_SECTOR_BITS/SIZE to make code clearer [Max] * Fix vhost-user-blk-server.c blk_size double byteswap * Fix vhost-user-blk blkcfg->num_queues endianness [Peter] * Squashed cleanups into Coiby vhost-user-blk-test commit so the code is easier to review
The vhost-user-blk server test was already in Michael Tsirkin's recent vhost pull request, but was dropped because it exposed vhost-user regressions (b7c1bd9d7848 and the Based-on tag below). Now that the vhost-user regressions are fixed we can re-introduce the test case. This series adds missing input validation that led to a Coverity report. The virtio-blk read, write, discard, and write zeroes commands need to check sector/byte ranges and other inputs. This solves the issue Peter Maydell raised in "[PATCH for-5.2] block/export/vhost-user-blk-server.c: Avoid potential integer overflow". Merging just the input validation patches would be possible too, but I prefer to merge the corresponding tests so the code is exercised by the CI. Coiby Xu (1): test: new qTest case to test the vhost-user-blk-server Stefan Hajnoczi (11): vhost-user-blk: fix blkcfg->num_queues endianness libqtest: add qtest_socket_server() libqtest: add qtest_kill_qemu() libqtest: add qtest_remove_abrt_handler() tests/qtest: add multi-queue test case to vhost-user-blk-test block/export: fix blk_size double byteswap block/export: use VIRTIO_BLK_SECTOR_BITS block/export: fix vhost-user-blk export sector number calculation block/export: port virtio-blk discard/write zeroes input validation vhost-user-blk-test: test discard/write zeroes invalid inputs block/export: port virtio-blk read/write range check MAINTAINERS | 2 + tests/qtest/libqos/libqtest.h | 37 + tests/qtest/libqos/vhost-user-blk.h | 48 ++ block/export/vhost-user-blk-server.c | 150 +++- hw/block/vhost-user-blk.c | 7 +- tests/qtest/libqos/vhost-user-blk.c | 130 ++++ tests/qtest/libqtest.c | 82 ++- tests/qtest/vhost-user-blk-test.c | 983 +++++++++++++++++++++++++++ tests/qtest/libqos/meson.build | 1 + tests/qtest/meson.build | 4 + 10 files changed, 1385 insertions(+), 59 deletions(-) create mode 100644 tests/qtest/libqos/vhost-user-blk.h create mode 100644 tests/qtest/libqos/vhost-user-blk.c create mode 100644 tests/qtest/vhost-user-blk-test.c -- 2.28.0
