186 lines
5.5 KiB
Diff
186 lines
5.5 KiB
Diff
From 215a509da9a0a8918ab1bfbd0f6ccfb765578f0f Mon Sep 17 00:00:00 2001
|
|
From: Markus Armbruster <armbru@redhat.com>
|
|
Date: Thu, 6 Jun 2019 19:15:22 +0100
|
|
Subject: [PATCH 5/8] virtio-scsi: Move BlockBackend back to the main
|
|
AioContext on unplug
|
|
|
|
RH-Author: Markus Armbruster <armbru@redhat.com>
|
|
Message-id: <20190606191524.30797-2-armbru@redhat.com>
|
|
Patchwork-id: 88607
|
|
O-Subject: [RHEL-8.1.0 qemu-kvm PATCH 1/3] virtio-scsi: Move BlockBackend back to the main AioContext on unplug
|
|
Bugzilla: 1673396 1673401
|
|
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
|
From: Alberto Garcia <berto@igalia.com>
|
|
|
|
This fixes a crash when attaching a disk to a SCSI device using
|
|
iothreads, then detaching it and reattaching it again. Test case
|
|
included.
|
|
|
|
Signed-off-by: Alberto Garcia <berto@igalia.com>
|
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
(cherry picked from commit a6f230c8d13a7ff3a0c7f1097412f44bfd9eff0b)
|
|
[Trivial conflict in tests/qemu-iotests/group resolved]
|
|
Signed-off-by: Markus Armbruster <armbru@redhat.com>
|
|
|
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
|
---
|
|
hw/scsi/virtio-scsi.c | 6 ++++
|
|
tests/qemu-iotests/240 | 89 ++++++++++++++++++++++++++++++++++++++++++++++
|
|
tests/qemu-iotests/240.out | 18 ++++++++++
|
|
tests/qemu-iotests/group | 1 +
|
|
4 files changed, 114 insertions(+)
|
|
create mode 100755 tests/qemu-iotests/240
|
|
create mode 100644 tests/qemu-iotests/240.out
|
|
|
|
diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c
|
|
index 52a3c1d..85073f6 100644
|
|
--- a/hw/scsi/virtio-scsi.c
|
|
+++ b/hw/scsi/virtio-scsi.c
|
|
@@ -841,6 +841,12 @@ static void virtio_scsi_hotunplug(HotplugHandler *hotplug_dev, DeviceState *dev,
|
|
virtio_scsi_release(s);
|
|
}
|
|
|
|
+ if (s->ctx) {
|
|
+ virtio_scsi_acquire(s);
|
|
+ blk_set_aio_context(sd->conf.blk, qemu_get_aio_context());
|
|
+ virtio_scsi_release(s);
|
|
+ }
|
|
+
|
|
qdev_simple_device_unplug_cb(hotplug_dev, dev, errp);
|
|
}
|
|
|
|
diff --git a/tests/qemu-iotests/240 b/tests/qemu-iotests/240
|
|
new file mode 100755
|
|
index 0000000..ead7ee0
|
|
--- /dev/null
|
|
+++ b/tests/qemu-iotests/240
|
|
@@ -0,0 +1,89 @@
|
|
+#!/bin/bash
|
|
+#
|
|
+# Test hot plugging and unplugging with iothreads
|
|
+#
|
|
+# Copyright (C) 2019 Igalia, S.L.
|
|
+# Author: Alberto Garcia <berto@igalia.com>
|
|
+#
|
|
+# 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=berto@igalia.com
|
|
+
|
|
+seq=`basename $0`
|
|
+echo "QA output created by $seq"
|
|
+
|
|
+status=1 # failure is the default!
|
|
+
|
|
+# get standard environment, filters and checks
|
|
+. ./common.rc
|
|
+. ./common.filter
|
|
+
|
|
+_supported_fmt generic
|
|
+_supported_proto generic
|
|
+_supported_os Linux
|
|
+
|
|
+do_run_qemu()
|
|
+{
|
|
+ echo Testing: "$@"
|
|
+ $QEMU -nographic -qmp stdio -serial none "$@"
|
|
+ echo
|
|
+}
|
|
+
|
|
+# Remove QMP events from (pretty-printed) output. Doesn't handle
|
|
+# nested dicts correctly, but we don't get any of those in this test.
|
|
+_filter_qmp_events()
|
|
+{
|
|
+ tr '\n' '\t' | sed -e \
|
|
+ 's/{\s*"timestamp":\s*{[^}]*},\s*"event":[^,}]*\(,\s*"data":\s*{[^}]*}\)\?\s*}\s*//g' \
|
|
+ | tr '\t' '\n'
|
|
+}
|
|
+
|
|
+run_qemu()
|
|
+{
|
|
+ do_run_qemu "$@" 2>&1 | _filter_qmp | _filter_qmp_events
|
|
+}
|
|
+
|
|
+case "$QEMU_DEFAULT_MACHINE" in
|
|
+ s390-ccw-virtio)
|
|
+ virtio_scsi=virtio-scsi-ccw
|
|
+ ;;
|
|
+ *)
|
|
+ virtio_scsi=virtio-scsi-pci
|
|
+ ;;
|
|
+esac
|
|
+
|
|
+echo
|
|
+echo === Unplug a SCSI disk and then plug it again ===
|
|
+echo
|
|
+
|
|
+run_qemu <<EOF
|
|
+{ "execute": "qmp_capabilities" }
|
|
+{ "execute": "blockdev-add", "arguments": {"driver": "null-co", "node-name": "hd0"}}
|
|
+{ "execute": "object-add", "arguments": {"qom-type": "iothread", "id": "iothread0"}}
|
|
+{ "execute": "device_add", "arguments": {"id": "scsi0", "driver": "${virtio_scsi}", "iothread": "iothread0"}}
|
|
+{ "execute": "device_add", "arguments": {"id": "scsi-hd0", "driver": "scsi-hd", "drive": "hd0"}}
|
|
+{ "execute": "device_del", "arguments": {"id": "scsi-hd0"}}
|
|
+{ "execute": "device_add", "arguments": {"id": "scsi-hd0", "driver": "scsi-hd", "drive": "hd0"}}
|
|
+{ "execute": "device_del", "arguments": {"id": "scsi-hd0"}}
|
|
+{ "execute": "device_del", "arguments": {"id": "scsi0"}}
|
|
+{ "execute": "blockdev-del", "arguments": {"node-name": "hd0"}}
|
|
+{ "execute": "quit"}
|
|
+EOF
|
|
+
|
|
+# success, all done
|
|
+echo "*** done"
|
|
+rm -f $seq.full
|
|
+status=0
|
|
diff --git a/tests/qemu-iotests/240.out b/tests/qemu-iotests/240.out
|
|
new file mode 100644
|
|
index 0000000..432d981
|
|
--- /dev/null
|
|
+++ b/tests/qemu-iotests/240.out
|
|
@@ -0,0 +1,18 @@
|
|
+QA output created by 240
|
|
+
|
|
+=== Unplug a SCSI disk and then plug it again ===
|
|
+
|
|
+Testing:
|
|
+QMP_VERSION
|
|
+{"return": {}}
|
|
+{"return": {}}
|
|
+{"return": {}}
|
|
+{"return": {}}
|
|
+{"return": {}}
|
|
+{"return": {}}
|
|
+{"return": {}}
|
|
+{"return": {}}
|
|
+{"return": {}}
|
|
+{"return": {}}
|
|
+{"return": {}}
|
|
+*** done
|
|
diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
|
|
index 61c0f9c..5cbdc24 100644
|
|
--- a/tests/qemu-iotests/group
|
|
+++ b/tests/qemu-iotests/group
|
|
@@ -226,3 +226,4 @@
|
|
231 auto quick
|
|
232 auto quick
|
|
234 auto quick migration
|
|
+240 auto quick
|
|
--
|
|
1.8.3.1
|
|
|