From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org
Cc: Fam Zheng <fam@euphon.net>,
Peter Maydell <peter.maydell@linaro.org>,
Paolo Bonzini <pbonzini@redhat.com>,
David Vrabel <david.vrabel@nutanix.com>,
Raphael Norwitz <raphael.norwitz@nutanix.com>
Subject: [PULL v2 24/32] vhost-user-scsi: reset the device if supported
Date: Tue, 7 Jan 2020 02:37:11 -0500 [thread overview]
Message-ID: <20200107073451.298261-25-mst@redhat.com> (raw)
In-Reply-To: <20200107073451.298261-1-mst@redhat.com>
From: Raphael Norwitz <raphael.norwitz@nutanix.com>
If the vhost-user-scsi backend supports the VHOST_USER_F_RESET_DEVICE
protocol feature, then the device can be reset when requested.
If this feature is not supported, do not try a reset as this will send
a VHOST_USER_RESET_OWNER that the backend is not expecting,
potentially putting into an inoperable state.
Signed-off-by: David Vrabel <david.vrabel@nutanix.com>
Signed-off-by: Raphael Norwitz <raphael.norwitz@nutanix.com>
Message-Id: <1572385083-5254-3-git-send-email-raphael.norwitz@nutanix.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
hw/scsi/vhost-user-scsi.c | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/hw/scsi/vhost-user-scsi.c b/hw/scsi/vhost-user-scsi.c
index 6a6c15dd32..23f972df59 100644
--- a/hw/scsi/vhost-user-scsi.c
+++ b/hw/scsi/vhost-user-scsi.c
@@ -39,6 +39,10 @@ static const int user_feature_bits[] = {
VHOST_INVALID_FEATURE_BIT
};
+enum VhostUserProtocolFeature {
+ VHOST_USER_PROTOCOL_F_RESET_DEVICE = 13,
+};
+
static void vhost_user_scsi_set_status(VirtIODevice *vdev, uint8_t status)
{
VHostUserSCSI *s = (VHostUserSCSI *)vdev;
@@ -62,6 +66,25 @@ static void vhost_user_scsi_set_status(VirtIODevice *vdev, uint8_t status)
}
}
+static void vhost_user_scsi_reset(VirtIODevice *vdev)
+{
+ VHostSCSICommon *vsc = VHOST_SCSI_COMMON(vdev);
+ struct vhost_dev *dev = &vsc->dev;
+
+ /*
+ * Historically, reset was not implemented so only reset devices
+ * that are expecting it.
+ */
+ if (!virtio_has_feature(dev->protocol_features,
+ VHOST_USER_PROTOCOL_F_RESET_DEVICE)) {
+ return;
+ }
+
+ if (dev->vhost_ops->vhost_reset_device) {
+ dev->vhost_ops->vhost_reset_device(dev);
+ }
+}
+
static void vhost_dummy_handle_output(VirtIODevice *vdev, VirtQueue *vq)
{
}
@@ -182,6 +205,7 @@ static void vhost_user_scsi_class_init(ObjectClass *klass, void *data)
vdc->get_features = vhost_scsi_common_get_features;
vdc->set_config = vhost_scsi_common_set_config;
vdc->set_status = vhost_user_scsi_set_status;
+ vdc->reset = vhost_user_scsi_reset;
fwc->get_dev_path = vhost_scsi_common_get_fw_dev_path;
}
--
MST
next prev parent reply other threads:[~2020-01-07 9:08 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-07 7:35 [PULL v2 00/32] virtio, pci, pc: fixes, features Michael S. Tsirkin
2020-01-07 7:35 ` [PULL v2 01/32] virtio: add ability to delete vq through a pointer Michael S. Tsirkin
2020-01-07 7:35 ` [PULL v2 02/32] virtio: make virtio_delete_queue idempotent Michael S. Tsirkin
2020-01-07 7:35 ` [PULL v2 03/32] virtio-balloon: fix memory leak while attach virtio-balloon device Michael S. Tsirkin
2020-01-07 7:35 ` [PULL v2 04/32] virtio-serial-bus: fix memory leak while attach virtio-serial-bus Michael S. Tsirkin
2020-01-07 7:35 ` [PULL v2 05/32] virtio-input: convert to new virtio_delete_queue Michael S. Tsirkin
2020-01-07 7:35 ` [PULL v2 06/32] intel_iommu: fix bug to read DMAR_RTADDR_REG Michael S. Tsirkin
2020-01-07 7:35 ` [PULL v2 07/32] virtio: update queue size on guest write Michael S. Tsirkin
2020-01-07 7:35 ` [PULL v2 08/32] virtio-pci: disable vring processing when bus-mastering is disabled Michael S. Tsirkin
2020-01-07 7:35 ` [PULL v2 09/32] Implement backend program convention command for vhost-user-blk Michael S. Tsirkin
2020-01-07 7:35 ` [PULL v2 10/32] virtio: don't enable notifications during polling Michael S. Tsirkin
2020-01-07 7:36 ` [PULL v2 11/32] numa: Extend CLI to provide initiator information for numa nodes Michael S. Tsirkin
2020-01-07 7:36 ` [PULL v2 12/32] numa: Extend CLI to provide memory latency and bandwidth information Michael S. Tsirkin
2020-01-07 7:36 ` [PULL v2 13/32] numa: Extend CLI to provide memory side cache information Michael S. Tsirkin
2020-01-07 7:36 ` [PULL v2 14/32] hmat acpi: Build Memory Proximity Domain Attributes Structure(s) Michael S. Tsirkin
2020-01-07 7:36 ` [PULL v2 15/32] hmat acpi: Build System Locality Latency and Bandwidth Information Structure(s) Michael S. Tsirkin
2020-01-07 7:36 ` [PULL v2 16/32] hmat acpi: Build Memory Side Cache " Michael S. Tsirkin
2020-01-07 7:36 ` [PULL v2 17/32] tests/numa: Add case for QMP build HMAT Michael S. Tsirkin
2020-01-07 7:36 ` [PULL v2 18/32] tests/bios-tables-test: add test cases for ACPI HMAT Michael S. Tsirkin
2020-01-07 7:36 ` [PULL v2 19/32] ACPI: add expected files for HMAT tests (acpihmat) Michael S. Tsirkin
2020-01-07 7:36 ` [PULL v2 20/32] virtio-mmio: Clear v2 transport state on soft reset Michael S. Tsirkin
2020-01-07 7:36 ` [PULL v2 21/32] hw/pci/pci_host: Remove redundant PCI_DPRINTF() Michael S. Tsirkin
2020-01-07 7:37 ` [PULL v2 22/32] hw/pci/pci_host: Let pci_data_[read/write] use unsigned 'size' argument Michael S. Tsirkin
2020-01-07 7:37 ` [PULL v2 23/32] vhost-user: add VHOST_USER_RESET_DEVICE to reset devices Michael S. Tsirkin
2020-01-07 7:37 ` Michael S. Tsirkin [this message]
2020-01-07 7:37 ` [PULL v2 25/32] hw: fix using 4.2 compat in 5.0 machine types for i440fx/q35 Michael S. Tsirkin
2020-01-07 7:37 ` [PULL v2 26/32] virtio: make seg_max virtqueue size dependent Michael S. Tsirkin
2020-01-07 7:37 ` [PULL v2 27/32] tests: add virtio-scsi and virtio-blk seg_max_adjust test Michael S. Tsirkin
2020-01-07 7:37 ` [PULL v2 28/32] virtio-mmio: update queue size on guest write Michael S. Tsirkin
2020-01-07 7:37 ` [PULL v2 29/32] virtio: reset region cache when on queue deletion Michael S. Tsirkin
2020-01-07 7:37 ` [PULL v2 30/32] virtio-net: delete also control queue when TX/RX deleted Michael S. Tsirkin
2020-01-07 7:37 ` [PULL v2 31/32] intel_iommu: a fix to vtd_find_as_from_bus_num() Michael S. Tsirkin
2020-01-07 7:37 ` [PULL v2 32/32] intel_iommu: add present bit check for pasid table entries Michael S. Tsirkin
2020-01-07 17:08 ` [PULL v2 00/32] virtio, pci, pc: fixes, features Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200107073451.298261-25-mst@redhat.com \
--to=mst@redhat.com \
--cc=david.vrabel@nutanix.com \
--cc=fam@euphon.net \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=raphael.norwitz@nutanix.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).