NBD patches for 2024-05-30
- Fix AioContext assertion with NBD+TLS -----BEGIN PGP SIGNATURE----- iQEzBAABCAAdFiEEccLMIrHEYCkn0vOqp6FrSiUnQ2oFAmZd0MYACgkQp6FrSiUn Q2rrxwf8C+nhCy5d/d0DfBvDANEWB5zFGffC89t9P2ULJ6ehGlZuAyF8bCqnptPM 76qhZfCz1XCUM0B+H+JXzcOsphTY5Y+hQ6Aq95VbuJgzq4CbAz4D30RNS0P5Q/ei v1+goMTEegH1sSS6b0NueTj4chesMui3bJpiUnb3qPptZ+L0OWhIsk6Pe0N418UM kmWC3kPWUPkmpxqXprcV/OunS6ipkfSVORfjxFNbFQcceuP45lt+f0YxhMHU8NIU PwFiUaPPCy/mDFTHgqCmpqoivFroUyhQIFl5ucHmds2wTOTx9VpxunYNcrVCq6vY UUfKc/p5lRArTqJXEth8cHlo1sFOEw== =7ZGy -----END PGP SIGNATURE----- Merge tag 'pull-nbd-2024-05-30-v2' of https://repo.or.cz/qemu/ericb into staging NBD patches for 2024-05-30 - Fix AioContext assertion with NBD+TLS # -----BEGIN PGP SIGNATURE----- # # iQEzBAABCAAdFiEEccLMIrHEYCkn0vOqp6FrSiUnQ2oFAmZd0MYACgkQp6FrSiUn # Q2rrxwf8C+nhCy5d/d0DfBvDANEWB5zFGffC89t9P2ULJ6ehGlZuAyF8bCqnptPM # 76qhZfCz1XCUM0B+H+JXzcOsphTY5Y+hQ6Aq95VbuJgzq4CbAz4D30RNS0P5Q/ei # v1+goMTEegH1sSS6b0NueTj4chesMui3bJpiUnb3qPptZ+L0OWhIsk6Pe0N418UM # kmWC3kPWUPkmpxqXprcV/OunS6ipkfSVORfjxFNbFQcceuP45lt+f0YxhMHU8NIU # PwFiUaPPCy/mDFTHgqCmpqoivFroUyhQIFl5ucHmds2wTOTx9VpxunYNcrVCq6vY # UUfKc/p5lRArTqJXEth8cHlo1sFOEw== # =7ZGy # -----END PGP SIGNATURE----- # gpg: Signature made Mon 03 Jun 2024 09:18:46 AM CDT # gpg: using RSA key 71C2CC22B1C4602927D2F3AAA7A16B4A2527436A # 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] * tag 'pull-nbd-2024-05-30-v2' of https://repo.or.cz/qemu/ericb: iotests: test NBD+TLS+iothread qio: Inherit follow_coroutine_ctx across TLS Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson
commit
121e47c8bf
@ -69,37 +69,40 @@ qio_channel_tls_new_server(QIOChannel *master,
|
||||
const char *aclname,
|
||||
Error **errp)
|
||||
{
|
||||
QIOChannelTLS *ioc;
|
||||
QIOChannelTLS *tioc;
|
||||
QIOChannel *ioc;
|
||||
|
||||
ioc = QIO_CHANNEL_TLS(object_new(TYPE_QIO_CHANNEL_TLS));
|
||||
tioc = QIO_CHANNEL_TLS(object_new(TYPE_QIO_CHANNEL_TLS));
|
||||
ioc = QIO_CHANNEL(tioc);
|
||||
|
||||
ioc->master = master;
|
||||
tioc->master = master;
|
||||
ioc->follow_coroutine_ctx = master->follow_coroutine_ctx;
|
||||
if (qio_channel_has_feature(master, QIO_CHANNEL_FEATURE_SHUTDOWN)) {
|
||||
qio_channel_set_feature(QIO_CHANNEL(ioc), QIO_CHANNEL_FEATURE_SHUTDOWN);
|
||||
qio_channel_set_feature(ioc, QIO_CHANNEL_FEATURE_SHUTDOWN);
|
||||
}
|
||||
object_ref(OBJECT(master));
|
||||
|
||||
ioc->session = qcrypto_tls_session_new(
|
||||
tioc->session = qcrypto_tls_session_new(
|
||||
creds,
|
||||
NULL,
|
||||
aclname,
|
||||
QCRYPTO_TLS_CREDS_ENDPOINT_SERVER,
|
||||
errp);
|
||||
if (!ioc->session) {
|
||||
if (!tioc->session) {
|
||||
goto error;
|
||||
}
|
||||
|
||||
qcrypto_tls_session_set_callbacks(
|
||||
ioc->session,
|
||||
tioc->session,
|
||||
qio_channel_tls_write_handler,
|
||||
qio_channel_tls_read_handler,
|
||||
ioc);
|
||||
tioc);
|
||||
|
||||
trace_qio_channel_tls_new_server(ioc, master, creds, aclname);
|
||||
return ioc;
|
||||
trace_qio_channel_tls_new_server(tioc, master, creds, aclname);
|
||||
return tioc;
|
||||
|
||||
error:
|
||||
object_unref(OBJECT(ioc));
|
||||
object_unref(OBJECT(tioc));
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@ -116,6 +119,7 @@ qio_channel_tls_new_client(QIOChannel *master,
|
||||
ioc = QIO_CHANNEL(tioc);
|
||||
|
||||
tioc->master = master;
|
||||
ioc->follow_coroutine_ctx = master->follow_coroutine_ctx;
|
||||
if (qio_channel_has_feature(master, QIO_CHANNEL_FEATURE_SHUTDOWN)) {
|
||||
qio_channel_set_feature(ioc, QIO_CHANNEL_FEATURE_SHUTDOWN);
|
||||
}
|
||||
|
||||
@ -883,6 +883,7 @@ qio_channel_websock_new_server(QIOChannel *master)
|
||||
ioc = QIO_CHANNEL(wioc);
|
||||
|
||||
wioc->master = master;
|
||||
ioc->follow_coroutine_ctx = master->follow_coroutine_ctx;
|
||||
if (qio_channel_has_feature(master, QIO_CHANNEL_FEATURE_SHUTDOWN)) {
|
||||
qio_channel_set_feature(ioc, QIO_CHANNEL_FEATURE_SHUTDOWN);
|
||||
}
|
||||
|
||||
168
tests/qemu-iotests/tests/nbd-tls-iothread
Executable file
168
tests/qemu-iotests/tests/nbd-tls-iothread
Executable file
@ -0,0 +1,168 @@
|
||||
#!/usr/bin/env bash
|
||||
# group: rw quick
|
||||
#
|
||||
# Test of NBD+TLS+iothread
|
||||
#
|
||||
# Copyright (C) 2024 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/>.
|
||||
#
|
||||
|
||||
# creator
|
||||
owner=eblake@redhat.com
|
||||
|
||||
seq=`basename $0`
|
||||
echo "QA output created by $seq"
|
||||
|
||||
status=1 # failure is the default!
|
||||
|
||||
_cleanup()
|
||||
{
|
||||
_cleanup_qemu
|
||||
_cleanup_test_img
|
||||
rm -f "$dst_image"
|
||||
tls_x509_cleanup
|
||||
}
|
||||
trap "_cleanup; exit \$status" 0 1 2 3 15
|
||||
|
||||
# get standard environment, filters and checks
|
||||
cd ..
|
||||
. ./common.rc
|
||||
. ./common.filter
|
||||
. ./common.qemu
|
||||
. ./common.tls
|
||||
. ./common.nbd
|
||||
|
||||
_supported_fmt qcow2 # Hardcoded to qcow2 command line and QMP below
|
||||
_supported_proto file
|
||||
|
||||
# pick_unused_port
|
||||
#
|
||||
# Picks and returns an "unused" port, setting the global variable
|
||||
# $port.
|
||||
#
|
||||
# This is inherently racy, but we need it because qemu does not currently
|
||||
# permit NBD+TLS over a Unix domain socket
|
||||
pick_unused_port ()
|
||||
{
|
||||
if ! (ss --version) >/dev/null 2>&1; then
|
||||
_notrun "ss utility required, skipped this test"
|
||||
fi
|
||||
|
||||
# Start at a random port to make it less likely that two parallel
|
||||
# tests will conflict.
|
||||
port=$(( 50000 + (RANDOM%15000) ))
|
||||
while ss -ltn | grep -sqE ":$port\b"; do
|
||||
((port++))
|
||||
if [ $port -eq 65000 ]; then port=50000; fi
|
||||
done
|
||||
echo picked unused port
|
||||
}
|
||||
|
||||
tls_x509_init
|
||||
|
||||
size=1G
|
||||
DST_IMG="$TEST_DIR/dst.qcow2"
|
||||
|
||||
echo
|
||||
echo "== preparing TLS creds and spare port =="
|
||||
|
||||
pick_unused_port
|
||||
tls_x509_create_root_ca "ca1"
|
||||
tls_x509_create_server "ca1" "server1"
|
||||
tls_x509_create_client "ca1" "client1"
|
||||
tls_obj_base=tls-creds-x509,id=tls0,verify-peer=true,dir="${tls_dir}"
|
||||
|
||||
echo
|
||||
echo "== preparing image =="
|
||||
|
||||
_make_test_img $size
|
||||
$QEMU_IMG create -f qcow2 "$DST_IMG" $size | _filter_img_create
|
||||
|
||||
echo
|
||||
echo === Starting Src QEMU ===
|
||||
echo
|
||||
|
||||
_launch_qemu -machine q35 \
|
||||
-object iothread,id=iothread0 \
|
||||
-object "${tls_obj_base}"/client1,endpoint=client \
|
||||
-device '{"driver":"pcie-root-port", "id":"root0", "multifunction":true,
|
||||
"bus":"pcie.0"}' \
|
||||
-device '{"driver":"virtio-scsi-pci", "id":"virtio_scsi_pci0",
|
||||
"bus":"root0", "iothread":"iothread0"}' \
|
||||
-device '{"driver":"scsi-hd", "id":"image1", "drive":"drive_image1",
|
||||
"bus":"virtio_scsi_pci0.0"}' \
|
||||
-blockdev '{"driver":"file", "cache":{"direct":true, "no-flush":false},
|
||||
"filename":"'"$TEST_IMG"'", "node-name":"drive_sys1"}' \
|
||||
-blockdev '{"driver":"qcow2", "node-name":"drive_image1",
|
||||
"file":"drive_sys1"}'
|
||||
h1=$QEMU_HANDLE
|
||||
_send_qemu_cmd $h1 '{"execute": "qmp_capabilities"}' 'return'
|
||||
|
||||
echo
|
||||
echo === Starting Dst VM2 ===
|
||||
echo
|
||||
|
||||
_launch_qemu -machine q35 \
|
||||
-object iothread,id=iothread0 \
|
||||
-object "${tls_obj_base}"/server1,endpoint=server \
|
||||
-device '{"driver":"pcie-root-port", "id":"root0", "multifunction":true,
|
||||
"bus":"pcie.0"}' \
|
||||
-device '{"driver":"virtio-scsi-pci", "id":"virtio_scsi_pci0",
|
||||
"bus":"root0", "iothread":"iothread0"}' \
|
||||
-device '{"driver":"scsi-hd", "id":"image1", "drive":"drive_image1",
|
||||
"bus":"virtio_scsi_pci0.0"}' \
|
||||
-blockdev '{"driver":"file", "cache":{"direct":true, "no-flush":false},
|
||||
"filename":"'"$DST_IMG"'", "node-name":"drive_sys1"}' \
|
||||
-blockdev '{"driver":"qcow2", "node-name":"drive_image1",
|
||||
"file":"drive_sys1"}' \
|
||||
-incoming defer
|
||||
h2=$QEMU_HANDLE
|
||||
_send_qemu_cmd $h2 '{"execute": "qmp_capabilities"}' 'return'
|
||||
|
||||
echo
|
||||
echo === Dst VM: Enable NBD server for incoming storage migration ===
|
||||
echo
|
||||
|
||||
_send_qemu_cmd $h2 '{"execute": "nbd-server-start", "arguments":
|
||||
{"addr": {"type": "inet", "data": {"host": "127.0.0.1", "port": "'$port'"}},
|
||||
"tls-creds": "tls0"}}' '{"return": {}}' | sed "s/\"$port\"/PORT/g"
|
||||
_send_qemu_cmd $h2 '{"execute": "block-export-add", "arguments":
|
||||
{"node-name": "drive_image1", "type": "nbd", "writable": true,
|
||||
"id": "drive_image1"}}' '{"return": {}}'
|
||||
|
||||
echo
|
||||
echo === Src VM: Mirror to dst NBD for outgoing storage migration ===
|
||||
echo
|
||||
|
||||
_send_qemu_cmd $h1 '{"execute": "blockdev-add", "arguments":
|
||||
{"node-name": "mirror", "driver": "nbd",
|
||||
"server": {"type": "inet", "host": "127.0.0.1", "port": "'$port'"},
|
||||
"export": "drive_image1", "tls-creds": "tls0",
|
||||
"tls-hostname": "127.0.0.1"}}' '{"return": {}}' | sed "s/\"$port\"/PORT/g"
|
||||
_send_qemu_cmd $h1 '{"execute": "blockdev-mirror", "arguments":
|
||||
{"sync": "full", "device": "drive_image1", "target": "mirror",
|
||||
"job-id": "drive_image1_53"}}' '{"return": {}}'
|
||||
_timed_wait_for $h1 '"ready"'
|
||||
|
||||
echo
|
||||
echo === Cleaning up ===
|
||||
echo
|
||||
|
||||
_send_qemu_cmd $h1 '{"execute":"quit"}' ''
|
||||
_send_qemu_cmd $h2 '{"execute":"quit"}' ''
|
||||
|
||||
echo "*** done"
|
||||
rm -f $seq.full
|
||||
status=0
|
||||
54
tests/qemu-iotests/tests/nbd-tls-iothread.out
Normal file
54
tests/qemu-iotests/tests/nbd-tls-iothread.out
Normal file
@ -0,0 +1,54 @@
|
||||
QA output created by nbd-tls-iothread
|
||||
|
||||
== preparing TLS creds and spare port ==
|
||||
picked unused port
|
||||
Generating a self signed certificate...
|
||||
Generating a signed certificate...
|
||||
Generating a signed certificate...
|
||||
|
||||
== preparing image ==
|
||||
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
|
||||
Formatting 'TEST_DIR/dst.IMGFMT', fmt=IMGFMT size=1073741824
|
||||
|
||||
=== Starting Src QEMU ===
|
||||
|
||||
{"execute": "qmp_capabilities"}
|
||||
{"return": {}}
|
||||
|
||||
=== Starting Dst VM2 ===
|
||||
|
||||
{"execute": "qmp_capabilities"}
|
||||
{"return": {}}
|
||||
|
||||
=== Dst VM: Enable NBD server for incoming storage migration ===
|
||||
|
||||
{"execute": "nbd-server-start", "arguments":
|
||||
{"addr": {"type": "inet", "data": {"host": "127.0.0.1", "port": PORT}},
|
||||
"tls-creds": "tls0"}}
|
||||
{"return": {}}
|
||||
{"execute": "block-export-add", "arguments":
|
||||
{"node-name": "drive_image1", "type": "nbd", "writable": true,
|
||||
"id": "drive_image1"}}
|
||||
{"return": {}}
|
||||
|
||||
=== Src VM: Mirror to dst NBD for outgoing storage migration ===
|
||||
|
||||
{"execute": "blockdev-add", "arguments":
|
||||
{"node-name": "mirror", "driver": "nbd",
|
||||
"server": {"type": "inet", "host": "127.0.0.1", "port": PORT},
|
||||
"export": "drive_image1", "tls-creds": "tls0",
|
||||
"tls-hostname": "127.0.0.1"}}
|
||||
{"return": {}}
|
||||
{"execute": "blockdev-mirror", "arguments":
|
||||
{"sync": "full", "device": "drive_image1", "target": "mirror",
|
||||
"job-id": "drive_image1_53"}}
|
||||
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "drive_image1_53"}}
|
||||
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "drive_image1_53"}}
|
||||
{"return": {}}
|
||||
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "ready", "id": "drive_image1_53"}}
|
||||
|
||||
=== Cleaning up ===
|
||||
|
||||
{"execute":"quit"}
|
||||
{"execute":"quit"}
|
||||
*** done
|
||||
Loading…
Reference in New Issue
Block a user