- support TLS client authorization in NBD servers - iotest 223 race fix -----BEGIN PGP SIGNATURE----- iQEcBAABCAAGBQJcgqh3AAoJEKeha0olJ0Nq/bgH/1TXo49gC9SMNcBBHd5vqc6/ J+eXYQihmGLy7pNkfCBTB0QZz9d7V4tN/N1PAuIfzsHxcQJeyUBwcY7jin2SiTTM lfR9NWDY43OE+8tcPSXODyo3mge8g3d1X3vw8/QMX95TDrKQ8SMwAllegCFBKPZs T0+Jyfd8oA0NcQz4EPPUL5f2ptLo2slye2ZjbMBn/1WFrYkL+joUYJgyakYcZnY/ mcvmXF2JLG2fPzFoU1yvF+oZn6J2fx5pw92P+SZ7lA+qRzlWfvrVyK9sNqCS+K5m qdfMeeL/SyUPsUvlcbDH7iSjxWkR/h7MtXRq83FHzupasMeXiQ9ieb3MFAtHnGM= =5pyZ -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2019-03-08' into staging nbd patches for 2019-03-08 - support TLS client authorization in NBD servers - iotest 223 race fix # gpg: Signature made Fri 08 Mar 2019 17:37:59 GMT # gpg: using RSA key A7A16B4A2527436A # gpg: Good signature from "Eric Blake <eblake@redhat.com>" [full] # gpg: aka "Eric Blake (Free Software Programmer) <ebb9@byu.net>" [full] # gpg: aka "[jpeg image of size 6874]" [full] # Primary key fingerprint: 71C2 CC22 B1C4 6029 27D2 F3AA A7A1 6B4A 2527 436A * remotes/ericb/tags/pull-nbd-2019-03-08: iotests: Wait for qemu to end in 223 nbd: fix outdated qapi docs syntax for tls-creds nbd: allow authorization with nbd-server-start QMP command qemu-nbd: add support for authorization of TLS clients Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
202 lines
6.3 KiB
Bash
Executable file
202 lines
6.3 KiB
Bash
Executable file
#!/usr/bin/env bash
|
|
#
|
|
# Test reading dirty bitmap over NBD
|
|
#
|
|
# Copyright (C) 2018 Red Hat, Inc.
|
|
#
|
|
# This program is free software; you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation; either version 2 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
#
|
|
|
|
seq="$(basename $0)"
|
|
echo "QA output created by $seq"
|
|
|
|
status=1 # failure is the default!
|
|
|
|
_cleanup()
|
|
{
|
|
nbd_server_stop
|
|
_cleanup_test_img
|
|
_cleanup_qemu
|
|
rm -f "$TEST_DIR/nbd"
|
|
}
|
|
trap "_cleanup; exit \$status" 0 1 2 3 15
|
|
|
|
# get standard environment, filters and checks
|
|
. ./common.rc
|
|
. ./common.filter
|
|
. ./common.qemu
|
|
. ./common.nbd
|
|
|
|
_supported_fmt qcow2
|
|
_supported_proto file # uses NBD as well
|
|
_supported_os Linux
|
|
# Persistent dirty bitmaps require compat=1.1
|
|
_unsupported_imgopts 'compat=0.10'
|
|
|
|
do_run_qemu()
|
|
{
|
|
echo Testing: "$@"
|
|
$QEMU -nographic -qmp stdio -serial none "$@"
|
|
echo
|
|
}
|
|
|
|
run_qemu()
|
|
{
|
|
do_run_qemu "$@" 2>&1 | _filter_testdir | _filter_qmp \
|
|
| _filter_qemu | _filter_imgfmt \
|
|
| _filter_actual_image_size
|
|
}
|
|
|
|
echo
|
|
echo "=== Create partially sparse image, then add dirty bitmaps ==="
|
|
echo
|
|
|
|
# Two bitmaps, to contrast granularity issues
|
|
# Also note that b will be disabled, while b2 is left enabled, to
|
|
# check for read-only interactions
|
|
_make_test_img -o cluster_size=4k 4M
|
|
$QEMU_IO -c 'w -P 0x11 1M 2M' "$TEST_IMG" | _filter_qemu_io
|
|
run_qemu <<EOF
|
|
{ "execute": "qmp_capabilities" }
|
|
{ "execute": "blockdev-add",
|
|
"arguments": {
|
|
"driver": "$IMGFMT",
|
|
"node-name": "n",
|
|
"file": {
|
|
"driver": "file",
|
|
"filename": "$TEST_IMG"
|
|
}
|
|
}
|
|
}
|
|
{ "execute": "block-dirty-bitmap-add",
|
|
"arguments": {
|
|
"node": "n",
|
|
"name": "b",
|
|
"persistent": true,
|
|
"granularity": 65536
|
|
}
|
|
}
|
|
{ "execute": "block-dirty-bitmap-add",
|
|
"arguments": {
|
|
"node": "n",
|
|
"name": "b2",
|
|
"persistent": true,
|
|
"granularity": 512
|
|
}
|
|
}
|
|
{ "execute": "quit" }
|
|
EOF
|
|
|
|
echo
|
|
echo "=== Write part of the file under active bitmap ==="
|
|
echo
|
|
|
|
$QEMU_IO -c 'w -P 0x22 512 512' -c 'w -P 0x33 2M 2M' "$TEST_IMG" \
|
|
| _filter_qemu_io
|
|
|
|
echo
|
|
echo "=== End dirty bitmaps, and start serving image over NBD ==="
|
|
echo
|
|
|
|
_launch_qemu 2> >(_filter_nbd)
|
|
|
|
# Intentionally provoke some errors as well, to check error handling
|
|
silent=
|
|
_send_qemu_cmd $QEMU_HANDLE '{"execute":"qmp_capabilities"}' "return"
|
|
_send_qemu_cmd $QEMU_HANDLE '{"execute":"blockdev-add",
|
|
"arguments":{"driver":"qcow2", "node-name":"n",
|
|
"file":{"driver":"file", "filename":"'"$TEST_IMG"'"}}}' "return"
|
|
_send_qemu_cmd $QEMU_HANDLE '{"execute":"block-dirty-bitmap-disable",
|
|
"arguments":{"node":"n", "name":"b"}}' "return"
|
|
_send_qemu_cmd $QEMU_HANDLE '{"execute":"nbd-server-add",
|
|
"arguments":{"device":"n"}}' "error" # Attempt add without server
|
|
_send_qemu_cmd $QEMU_HANDLE '{"execute":"nbd-server-start",
|
|
"arguments":{"addr":{"type":"unix",
|
|
"data":{"path":"'"$TEST_DIR/nbd"'"}}}}' "return"
|
|
_send_qemu_cmd $QEMU_HANDLE '{"execute":"nbd-server-start",
|
|
"arguments":{"addr":{"type":"unix",
|
|
"data":{"path":"'"$TEST_DIR/nbd"1'"}}}}' "error" # Attempt second server
|
|
$QEMU_NBD_PROG -L -k "$TEST_DIR/nbd"
|
|
_send_qemu_cmd $QEMU_HANDLE '{"execute":"nbd-server-add",
|
|
"arguments":{"device":"n", "bitmap":"b"}}' "return"
|
|
_send_qemu_cmd $QEMU_HANDLE '{"execute":"nbd-server-add",
|
|
"arguments":{"device":"nosuch"}}' "error" # Attempt to export missing node
|
|
_send_qemu_cmd $QEMU_HANDLE '{"execute":"nbd-server-add",
|
|
"arguments":{"device":"n"}}' "error" # Attempt to export same name twice
|
|
_send_qemu_cmd $QEMU_HANDLE '{"execute":"nbd-server-add",
|
|
"arguments":{"device":"n", "name":"n2",
|
|
"bitmap":"b2"}}' "error" # enabled vs. read-only
|
|
_send_qemu_cmd $QEMU_HANDLE '{"execute":"nbd-server-add",
|
|
"arguments":{"device":"n", "name":"n2",
|
|
"bitmap":"b3"}}' "error" # Missing bitmap
|
|
_send_qemu_cmd $QEMU_HANDLE '{"execute":"nbd-server-add",
|
|
"arguments":{"device":"n", "name":"n2", "writable":true,
|
|
"bitmap":"b2"}}' "return"
|
|
$QEMU_NBD_PROG -L -k "$TEST_DIR/nbd"
|
|
|
|
echo
|
|
echo "=== Contrast normal status to large granularity dirty-bitmap ==="
|
|
echo
|
|
|
|
QEMU_IO_OPTIONS=$QEMU_IO_OPTIONS_NO_FMT
|
|
IMG="driver=nbd,export=n,server.type=unix,server.path=$TEST_DIR/nbd"
|
|
$QEMU_IO -r -c 'r -P 0x22 512 512' -c 'r -P 0 512k 512k' -c 'r -P 0x11 1m 1m' \
|
|
-c 'r -P 0x33 2m 2m' --image-opts "$IMG" | _filter_qemu_io
|
|
$QEMU_IMG map --output=json --image-opts \
|
|
"$IMG" | _filter_qemu_img_map
|
|
$QEMU_IMG map --output=json --image-opts \
|
|
"$IMG,x-dirty-bitmap=qemu:dirty-bitmap:b" | _filter_qemu_img_map
|
|
|
|
echo
|
|
echo "=== Contrast to small granularity dirty-bitmap ==="
|
|
echo
|
|
|
|
IMG="driver=nbd,export=n2,server.type=unix,server.path=$TEST_DIR/nbd"
|
|
$QEMU_IMG map --output=json --image-opts \
|
|
"$IMG,x-dirty-bitmap=qemu:dirty-bitmap:b2" | _filter_qemu_img_map
|
|
|
|
echo
|
|
echo "=== End qemu NBD server ==="
|
|
echo
|
|
|
|
_send_qemu_cmd $QEMU_HANDLE '{"execute":"nbd-server-remove",
|
|
"arguments":{"name":"n"}}' "return"
|
|
_send_qemu_cmd $QEMU_HANDLE '{"execute":"nbd-server-remove",
|
|
"arguments":{"name":"n2"}}' "return"
|
|
_send_qemu_cmd $QEMU_HANDLE '{"execute":"nbd-server-remove",
|
|
"arguments":{"name":"n2"}}' "error" # Attempt duplicate clean
|
|
_send_qemu_cmd $QEMU_HANDLE '{"execute":"nbd-server-stop"}' "return"
|
|
_send_qemu_cmd $QEMU_HANDLE '{"execute":"nbd-server-stop"}' "error" # Again
|
|
_send_qemu_cmd $QEMU_HANDLE '{"execute":"quit"}' "return"
|
|
wait=yes _cleanup_qemu
|
|
|
|
echo
|
|
echo "=== Use qemu-nbd as server ==="
|
|
echo
|
|
|
|
nbd_server_start_unix_socket -r -f $IMGFMT -B b "$TEST_IMG"
|
|
IMG="driver=nbd,server.type=unix,server.path=$nbd_unix_socket"
|
|
$QEMU_IMG map --output=json --image-opts \
|
|
"$IMG,x-dirty-bitmap=qemu:dirty-bitmap:b" | _filter_qemu_img_map
|
|
|
|
nbd_server_start_unix_socket -f $IMGFMT -B b2 "$TEST_IMG"
|
|
IMG="driver=nbd,server.type=unix,server.path=$nbd_unix_socket"
|
|
$QEMU_IMG map --output=json --image-opts \
|
|
"$IMG,x-dirty-bitmap=qemu:dirty-bitmap:b2" | _filter_qemu_img_map
|
|
|
|
# success, all done
|
|
echo '*** done'
|
|
rm -f $seq.full
|
|
status=0
|