 0a99aae5fa
			
		
	
	
		0a99aae5fa
		
	
	
	
	
		
			
			numa work by Hu Tao and others memory hotplug by Igor vhost-user by Nikolay, Antonios and others guest virtio announcements by Jason qtest fixes by Sergey qdev hotplug fixes by Paolo misc other fixes mostly by myself Signed-off-by: Michael S. Tsirkin <mst@redhat.com> -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJTowW+AAoJECgfDbjSjVRpnMMH/jp3sKGzJumYLbi5ihjmYyND jYd6ySXoVAjUTgaCvdje5srisOap8pbc783kQvQS4CeWsjZ5Vvh+PZjkBPIqF1pD celxGQ43CY7QSUWq+02Dg9VIUwLwZqdKlxNsV01FligQn+ZBQ6sQ6ksWx7oGzqRt 5/HMZykbwUvSk/4xGUaMn2+/4uhQ0Wz5EsCkv9L/u8kS72k6ldc/tCGZMzBUNHTM rW5FPYwMQP0MXgGTXnlLEQjJ7Lozc66IaMZoHw/a/aGSIxdag9Otj0ADuXq6yZaV Xi4O/EOJWd1JpSG7w8LOyIZNakpHkU43fmJCLzBjDAupHeRp57TcW5ox4PJYAtg= =Oxdt -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging pc,pci,virtio,hotplug fixes, enhancements numa work by Hu Tao and others memory hotplug by Igor vhost-user by Nikolay, Antonios and others guest virtio announcements by Jason qtest fixes by Sergey qdev hotplug fixes by Paolo misc other fixes mostly by myself Signed-off-by: Michael S. Tsirkin <mst@redhat.com> * remotes/mst/tags/for_upstream: (109 commits) numa: use RAM_ADDR_FMT with ram_addr_t qapi/string-output-visitor: fix bugs tests: simplify code qapi: fix input visitor bugs acpi: rephrase comment qmp: add ACPI_DEVICE_OST event handling qmp: add query-acpi-ospm-status command acpi: implement ospm_status() method for PIIX4/ICH9_LPC devices acpi: introduce TYPE_ACPI_DEVICE_IF interface qmp: add query-memory-devices command numa: handle mmaped memory allocation failure correctly pc: acpi: do not hardcode preprocessor qmp: clean out whitespace qdev: recursively unrealize devices when unrealizing bus qdev: reorganize error reporting in bus_set_realized qapi: fix build on glib < 2.28 qapi: make string output visitor parse int list qapi: make string input visitor parse int list tests: fix memory leak in test of string input visitor hmp: add info memdev ... Conflicts: include/hw/i386/pc.h [PMM: fixed minor conflict in pc.h] Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
		
			
				
	
	
		
			304 lines
		
	
	
		
			8.5 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			304 lines
		
	
	
		
			8.5 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * vhost_scsi host device
 | |
|  *
 | |
|  * Copyright IBM, Corp. 2011
 | |
|  *
 | |
|  * Authors:
 | |
|  *  Stefan Hajnoczi   <stefanha@linux.vnet.ibm.com>
 | |
|  *
 | |
|  * Changes for QEMU mainline + tcm_vhost kernel upstream:
 | |
|  *  Nicholas Bellinger <nab@risingtidesystems.com>
 | |
|  *
 | |
|  * This work is licensed under the terms of the GNU LGPL, version 2 or later.
 | |
|  * See the COPYING.LIB file in the top-level directory.
 | |
|  *
 | |
|  */
 | |
| 
 | |
| #include <sys/ioctl.h>
 | |
| #include "config.h"
 | |
| #include "qemu/queue.h"
 | |
| #include "monitor/monitor.h"
 | |
| #include "migration/migration.h"
 | |
| #include "hw/virtio/vhost-scsi.h"
 | |
| #include "hw/virtio/vhost.h"
 | |
| #include "hw/virtio/virtio-scsi.h"
 | |
| #include "hw/virtio/virtio-bus.h"
 | |
| 
 | |
| /* Features supported by host kernel. */
 | |
| static const int kernel_feature_bits[] = {
 | |
|     VIRTIO_F_NOTIFY_ON_EMPTY,
 | |
|     VIRTIO_RING_F_INDIRECT_DESC,
 | |
|     VIRTIO_RING_F_EVENT_IDX,
 | |
|     VIRTIO_SCSI_F_HOTPLUG,
 | |
|     VHOST_INVALID_FEATURE_BIT
 | |
| };
 | |
| 
 | |
| static int vhost_scsi_set_endpoint(VHostSCSI *s)
 | |
| {
 | |
|     VirtIOSCSICommon *vs = VIRTIO_SCSI_COMMON(s);
 | |
|     const VhostOps *vhost_ops = s->dev.vhost_ops;
 | |
|     struct vhost_scsi_target backend;
 | |
|     int ret;
 | |
| 
 | |
|     memset(&backend, 0, sizeof(backend));
 | |
|     pstrcpy(backend.vhost_wwpn, sizeof(backend.vhost_wwpn), vs->conf.wwpn);
 | |
|     ret = vhost_ops->vhost_call(&s->dev, VHOST_SCSI_SET_ENDPOINT, &backend);
 | |
|     if (ret < 0) {
 | |
|         return -errno;
 | |
|     }
 | |
|     return 0;
 | |
| }
 | |
| 
 | |
| static void vhost_scsi_clear_endpoint(VHostSCSI *s)
 | |
| {
 | |
|     VirtIOSCSICommon *vs = VIRTIO_SCSI_COMMON(s);
 | |
|     struct vhost_scsi_target backend;
 | |
|     const VhostOps *vhost_ops = s->dev.vhost_ops;
 | |
| 
 | |
|     memset(&backend, 0, sizeof(backend));
 | |
|     pstrcpy(backend.vhost_wwpn, sizeof(backend.vhost_wwpn), vs->conf.wwpn);
 | |
|     vhost_ops->vhost_call(&s->dev, VHOST_SCSI_CLEAR_ENDPOINT, &backend);
 | |
| }
 | |
| 
 | |
| static int vhost_scsi_start(VHostSCSI *s)
 | |
| {
 | |
|     int ret, abi_version, i;
 | |
|     VirtIODevice *vdev = VIRTIO_DEVICE(s);
 | |
|     BusState *qbus = BUS(qdev_get_parent_bus(DEVICE(vdev)));
 | |
|     VirtioBusClass *k = VIRTIO_BUS_GET_CLASS(qbus);
 | |
|     const VhostOps *vhost_ops = s->dev.vhost_ops;
 | |
| 
 | |
|     if (!k->set_guest_notifiers) {
 | |
|         error_report("binding does not support guest notifiers");
 | |
|         return -ENOSYS;
 | |
|     }
 | |
| 
 | |
|     ret = vhost_ops->vhost_call(&s->dev,
 | |
|                                 VHOST_SCSI_GET_ABI_VERSION, &abi_version);
 | |
|     if (ret < 0) {
 | |
|         return -errno;
 | |
|     }
 | |
|     if (abi_version > VHOST_SCSI_ABI_VERSION) {
 | |
|         error_report("vhost-scsi: The running tcm_vhost kernel abi_version:"
 | |
|                      " %d is greater than vhost_scsi userspace supports: %d, please"
 | |
|                      " upgrade your version of QEMU\n", abi_version,
 | |
|                      VHOST_SCSI_ABI_VERSION);
 | |
|         return -ENOSYS;
 | |
|     }
 | |
| 
 | |
|     ret = vhost_dev_enable_notifiers(&s->dev, vdev);
 | |
|     if (ret < 0) {
 | |
|         return ret;
 | |
|     }
 | |
| 
 | |
|     s->dev.acked_features = vdev->guest_features;
 | |
|     ret = vhost_dev_start(&s->dev, vdev);
 | |
|     if (ret < 0) {
 | |
|         error_report("Error start vhost dev");
 | |
|         goto err_notifiers;
 | |
|     }
 | |
| 
 | |
|     ret = vhost_scsi_set_endpoint(s);
 | |
|     if (ret < 0) {
 | |
|         error_report("Error set vhost-scsi endpoint");
 | |
|         goto err_vhost_stop;
 | |
|     }
 | |
| 
 | |
|     ret = k->set_guest_notifiers(qbus->parent, s->dev.nvqs, true);
 | |
|     if (ret < 0) {
 | |
|         error_report("Error binding guest notifier");
 | |
|         goto err_endpoint;
 | |
|     }
 | |
| 
 | |
|     /* guest_notifier_mask/pending not used yet, so just unmask
 | |
|      * everything here.  virtio-pci will do the right thing by
 | |
|      * enabling/disabling irqfd.
 | |
|      */
 | |
|     for (i = 0; i < s->dev.nvqs; i++) {
 | |
|         vhost_virtqueue_mask(&s->dev, vdev, i, false);
 | |
|     }
 | |
| 
 | |
|     return ret;
 | |
| 
 | |
| err_endpoint:
 | |
|     vhost_scsi_clear_endpoint(s);
 | |
| err_vhost_stop:
 | |
|     vhost_dev_stop(&s->dev, vdev);
 | |
| err_notifiers:
 | |
|     vhost_dev_disable_notifiers(&s->dev, vdev);
 | |
|     return ret;
 | |
| }
 | |
| 
 | |
| static void vhost_scsi_stop(VHostSCSI *s)
 | |
| {
 | |
|     VirtIODevice *vdev = VIRTIO_DEVICE(s);
 | |
|     BusState *qbus = BUS(qdev_get_parent_bus(DEVICE(vdev)));
 | |
|     VirtioBusClass *k = VIRTIO_BUS_GET_CLASS(qbus);
 | |
|     int ret = 0;
 | |
| 
 | |
|     if (k->set_guest_notifiers) {
 | |
|         ret = k->set_guest_notifiers(qbus->parent, s->dev.nvqs, false);
 | |
|         if (ret < 0) {
 | |
|                 error_report("vhost guest notifier cleanup failed: %d\n", ret);
 | |
|         }
 | |
|     }
 | |
|     assert(ret >= 0);
 | |
| 
 | |
|     vhost_scsi_clear_endpoint(s);
 | |
|     vhost_dev_stop(&s->dev, vdev);
 | |
|     vhost_dev_disable_notifiers(&s->dev, vdev);
 | |
| }
 | |
| 
 | |
| static uint32_t vhost_scsi_get_features(VirtIODevice *vdev,
 | |
|                                         uint32_t features)
 | |
| {
 | |
|     VHostSCSI *s = VHOST_SCSI(vdev);
 | |
| 
 | |
|     return vhost_get_features(&s->dev, kernel_feature_bits, features);
 | |
| }
 | |
| 
 | |
| static void vhost_scsi_set_config(VirtIODevice *vdev,
 | |
|                                   const uint8_t *config)
 | |
| {
 | |
|     VirtIOSCSIConfig *scsiconf = (VirtIOSCSIConfig *)config;
 | |
|     VirtIOSCSICommon *vs = VIRTIO_SCSI_COMMON(vdev);
 | |
| 
 | |
|     if ((uint32_t) ldl_p(&scsiconf->sense_size) != vs->sense_size ||
 | |
|         (uint32_t) ldl_p(&scsiconf->cdb_size) != vs->cdb_size) {
 | |
|         error_report("vhost-scsi does not support changing the sense data and CDB sizes");
 | |
|         exit(1);
 | |
|     }
 | |
| }
 | |
| 
 | |
| static void vhost_scsi_set_status(VirtIODevice *vdev, uint8_t val)
 | |
| {
 | |
|     VHostSCSI *s = (VHostSCSI *)vdev;
 | |
|     bool start = (val & VIRTIO_CONFIG_S_DRIVER_OK);
 | |
| 
 | |
|     if (s->dev.started == start) {
 | |
|         return;
 | |
|     }
 | |
| 
 | |
|     if (start) {
 | |
|         int ret;
 | |
| 
 | |
|         ret = vhost_scsi_start(s);
 | |
|         if (ret < 0) {
 | |
|             error_report("virtio-scsi: unable to start vhost: %s\n",
 | |
|                          strerror(-ret));
 | |
| 
 | |
|             /* There is no userspace virtio-scsi fallback so exit */
 | |
|             exit(1);
 | |
|         }
 | |
|     } else {
 | |
|         vhost_scsi_stop(s);
 | |
|     }
 | |
| }
 | |
| 
 | |
| static void vhost_dummy_handle_output(VirtIODevice *vdev, VirtQueue *vq)
 | |
| {
 | |
| }
 | |
| 
 | |
| static void vhost_scsi_realize(DeviceState *dev, Error **errp)
 | |
| {
 | |
|     VirtIOSCSICommon *vs = VIRTIO_SCSI_COMMON(dev);
 | |
|     VHostSCSI *s = VHOST_SCSI(dev);
 | |
|     Error *err = NULL;
 | |
|     int vhostfd = -1;
 | |
|     int ret;
 | |
| 
 | |
|     if (!vs->conf.wwpn) {
 | |
|         error_setg(errp, "vhost-scsi: missing wwpn");
 | |
|         return;
 | |
|     }
 | |
| 
 | |
|     if (vs->conf.vhostfd) {
 | |
|         vhostfd = monitor_handle_fd_param(cur_mon, vs->conf.vhostfd);
 | |
|         if (vhostfd == -1) {
 | |
|             error_setg(errp, "vhost-scsi: unable to parse vhostfd");
 | |
|             return;
 | |
|         }
 | |
|     } else {
 | |
|         vhostfd = open("/dev/vhost-scsi", O_RDWR);
 | |
|         if (vhostfd < 0) {
 | |
|             error_setg(errp, "vhost-scsi: open vhost char device failed: %s",
 | |
|                        strerror(errno));
 | |
|             return;
 | |
|         }
 | |
|     }
 | |
| 
 | |
|     virtio_scsi_common_realize(dev, &err, vhost_dummy_handle_output,
 | |
|                                vhost_dummy_handle_output,
 | |
|                                vhost_dummy_handle_output);
 | |
|     if (err != NULL) {
 | |
|         error_propagate(errp, err);
 | |
|         return;
 | |
|     }
 | |
| 
 | |
|     s->dev.nvqs = VHOST_SCSI_VQ_NUM_FIXED + vs->conf.num_queues;
 | |
|     s->dev.vqs = g_new(struct vhost_virtqueue, s->dev.nvqs);
 | |
|     s->dev.vq_index = 0;
 | |
| 
 | |
|     ret = vhost_dev_init(&s->dev, (void *)(uintptr_t)vhostfd,
 | |
|                          VHOST_BACKEND_TYPE_KERNEL, true);
 | |
|     if (ret < 0) {
 | |
|         error_setg(errp, "vhost-scsi: vhost initialization failed: %s",
 | |
|                    strerror(-ret));
 | |
|         return;
 | |
|     }
 | |
|     s->dev.backend_features = 0;
 | |
| 
 | |
|     error_setg(&s->migration_blocker,
 | |
|             "vhost-scsi does not support migration");
 | |
|     migrate_add_blocker(s->migration_blocker);
 | |
| }
 | |
| 
 | |
| static void vhost_scsi_unrealize(DeviceState *dev, Error **errp)
 | |
| {
 | |
|     VirtIODevice *vdev = VIRTIO_DEVICE(dev);
 | |
|     VHostSCSI *s = VHOST_SCSI(dev);
 | |
| 
 | |
|     migrate_del_blocker(s->migration_blocker);
 | |
|     error_free(s->migration_blocker);
 | |
| 
 | |
|     /* This will stop vhost backend. */
 | |
|     vhost_scsi_set_status(vdev, 0);
 | |
| 
 | |
|     g_free(s->dev.vqs);
 | |
| 
 | |
|     virtio_scsi_common_unrealize(dev, errp);
 | |
| }
 | |
| 
 | |
| static Property vhost_scsi_properties[] = {
 | |
|     DEFINE_VHOST_SCSI_PROPERTIES(VHostSCSI, parent_obj.conf),
 | |
|     DEFINE_PROP_END_OF_LIST(),
 | |
| };
 | |
| 
 | |
| static void vhost_scsi_class_init(ObjectClass *klass, void *data)
 | |
| {
 | |
|     DeviceClass *dc = DEVICE_CLASS(klass);
 | |
|     VirtioDeviceClass *vdc = VIRTIO_DEVICE_CLASS(klass);
 | |
| 
 | |
|     dc->props = vhost_scsi_properties;
 | |
|     set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
 | |
|     vdc->realize = vhost_scsi_realize;
 | |
|     vdc->unrealize = vhost_scsi_unrealize;
 | |
|     vdc->get_features = vhost_scsi_get_features;
 | |
|     vdc->set_config = vhost_scsi_set_config;
 | |
|     vdc->set_status = vhost_scsi_set_status;
 | |
| }
 | |
| 
 | |
| static const TypeInfo vhost_scsi_info = {
 | |
|     .name = TYPE_VHOST_SCSI,
 | |
|     .parent = TYPE_VIRTIO_SCSI_COMMON,
 | |
|     .instance_size = sizeof(VHostSCSI),
 | |
|     .class_init = vhost_scsi_class_init,
 | |
| };
 | |
| 
 | |
| static void virtio_register_types(void)
 | |
| {
 | |
|     type_register_static(&vhost_scsi_info);
 | |
| }
 | |
| 
 | |
| type_init(virtio_register_types)
 |