 aba0d042b1
			
		
	
	
		aba0d042b1
		
	
	
	
	
		
			
			This is below memleak detected when to quit the qemu-system-x86_64 (with
vhost-scsi-pci).
(qemu) quit
=================================================================
==15568==ERROR: LeakSanitizer: detected memory leaks
Direct leak of 40 byte(s) in 1 object(s) allocated from:
    #0 0x7f00aec57917 in __interceptor_calloc (/lib64/libasan.so.6+0xb4917)
    #1 0x7f00ada0d7b5 in g_malloc0 (/lib64/libglib-2.0.so.0+0x517b5)
    #2 0x5648ffd38bac in vhost_scsi_start ../hw/scsi/vhost-scsi.c:92
    #3 0x5648ffd38d52 in vhost_scsi_set_status ../hw/scsi/vhost-scsi.c:131
    #4 0x5648ffda340e in virtio_set_status ../hw/virtio/virtio.c:2036
    #5 0x5648ff8de281 in virtio_ioport_write ../hw/virtio/virtio-pci.c:431
    #6 0x5648ff8deb29 in virtio_pci_config_write ../hw/virtio/virtio-pci.c:576
    #7 0x5648ffe5c0c2 in memory_region_write_accessor ../softmmu/memory.c:493
    #8 0x5648ffe5c424 in access_with_adjusted_size ../softmmu/memory.c:555
    #9 0x5648ffe6428f in memory_region_dispatch_write ../softmmu/memory.c:1515
    #10 0x5648ffe8613d in flatview_write_continue ../softmmu/physmem.c:2825
    #11 0x5648ffe86490 in flatview_write ../softmmu/physmem.c:2867
    #12 0x5648ffe86d9f in address_space_write ../softmmu/physmem.c:2963
    #13 0x5648ffe86e57 in address_space_rw ../softmmu/physmem.c:2973
    #14 0x5648fffbfb3d in kvm_handle_io ../accel/kvm/kvm-all.c:2639
    #15 0x5648fffc0e0d in kvm_cpu_exec ../accel/kvm/kvm-all.c:2890
    #16 0x5648fffc90a7 in kvm_vcpu_thread_fn ../accel/kvm/kvm-accel-ops.c:51
    #17 0x56490042400a in qemu_thread_start ../util/qemu-thread-posix.c:505
    #18 0x7f00ac3b6ea4 in start_thread (/lib64/libpthread.so.0+0x7ea4)
Free the vsc->inflight at the 'stop' path.
Fixes: b82526c7ee ("vhost-scsi: support inflight io track")
Cc: Joe Jin <joe.jin@oracle.com>
Cc: Li Feng <fengli@smartx.com>
Signed-off-by: Dongli Zhang <dongli.zhang@oracle.com>
Message-Id: <20230104160433.21353-1-dongli.zhang@oracle.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
		
	
			
		
			
				
	
	
		
			173 lines
		
	
	
		
			5.0 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			173 lines
		
	
	
		
			5.0 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * vhost-scsi-common
 | |
|  *
 | |
|  * Copyright (c) 2016 Nutanix Inc. All rights reserved.
 | |
|  *
 | |
|  * Author:
 | |
|  *  Felipe Franciosi <felipe@nutanix.com>
 | |
|  *
 | |
|  * This work is largely based on the "vhost-scsi" implementation by:
 | |
|  *  Stefan Hajnoczi    <stefanha@linux.vnet.ibm.com>
 | |
|  *  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 "qemu/osdep.h"
 | |
| #include "qemu/error-report.h"
 | |
| #include "qemu/module.h"
 | |
| #include "hw/virtio/vhost.h"
 | |
| #include "hw/virtio/vhost-scsi-common.h"
 | |
| #include "hw/virtio/virtio-scsi.h"
 | |
| #include "hw/virtio/virtio-bus.h"
 | |
| #include "hw/virtio/virtio-access.h"
 | |
| #include "hw/fw-path-provider.h"
 | |
| 
 | |
| int vhost_scsi_common_start(VHostSCSICommon *vsc)
 | |
| {
 | |
|     int ret, i;
 | |
|     VirtIODevice *vdev = VIRTIO_DEVICE(vsc);
 | |
|     BusState *qbus = BUS(qdev_get_parent_bus(DEVICE(vdev)));
 | |
|     VirtioBusClass *k = VIRTIO_BUS_GET_CLASS(qbus);
 | |
| 
 | |
|     VirtIOSCSICommon *vs = (VirtIOSCSICommon *)vsc;
 | |
| 
 | |
|     if (!k->set_guest_notifiers) {
 | |
|         error_report("binding does not support guest notifiers");
 | |
|         return -ENOSYS;
 | |
|     }
 | |
| 
 | |
|     ret = vhost_dev_enable_notifiers(&vsc->dev, vdev);
 | |
|     if (ret < 0) {
 | |
|         return ret;
 | |
|     }
 | |
| 
 | |
|     ret = k->set_guest_notifiers(qbus->parent, vsc->dev.nvqs, true);
 | |
|     if (ret < 0) {
 | |
|         error_report("Error binding guest notifier");
 | |
|         goto err_host_notifiers;
 | |
|     }
 | |
| 
 | |
|     vsc->dev.acked_features = vdev->guest_features;
 | |
| 
 | |
|     assert(vsc->inflight == NULL);
 | |
|     vsc->inflight = g_new0(struct vhost_inflight, 1);
 | |
|     ret = vhost_dev_get_inflight(&vsc->dev,
 | |
|                                  vs->conf.virtqueue_size,
 | |
|                                  vsc->inflight);
 | |
|     if (ret < 0) {
 | |
|         error_report("Error get inflight: %d", -ret);
 | |
|         goto err_guest_notifiers;
 | |
|     }
 | |
| 
 | |
|     ret = vhost_dev_set_inflight(&vsc->dev, vsc->inflight);
 | |
|     if (ret < 0) {
 | |
|         error_report("Error set inflight: %d", -ret);
 | |
|         goto err_guest_notifiers;
 | |
|     }
 | |
| 
 | |
|     ret = vhost_dev_start(&vsc->dev, vdev, true);
 | |
|     if (ret < 0) {
 | |
|         error_report("Error start vhost dev");
 | |
|         goto err_guest_notifiers;
 | |
|     }
 | |
| 
 | |
|     /* 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 < vsc->dev.nvqs; i++) {
 | |
|         vhost_virtqueue_mask(&vsc->dev, vdev, vsc->dev.vq_index + i, false);
 | |
|     }
 | |
| 
 | |
|     return ret;
 | |
| 
 | |
| err_guest_notifiers:
 | |
|     g_free(vsc->inflight);
 | |
|     vsc->inflight = NULL;
 | |
| 
 | |
|     k->set_guest_notifiers(qbus->parent, vsc->dev.nvqs, false);
 | |
| err_host_notifiers:
 | |
|     vhost_dev_disable_notifiers(&vsc->dev, vdev);
 | |
|     return ret;
 | |
| }
 | |
| 
 | |
| void vhost_scsi_common_stop(VHostSCSICommon *vsc)
 | |
| {
 | |
|     VirtIODevice *vdev = VIRTIO_DEVICE(vsc);
 | |
|     BusState *qbus = BUS(qdev_get_parent_bus(DEVICE(vdev)));
 | |
|     VirtioBusClass *k = VIRTIO_BUS_GET_CLASS(qbus);
 | |
|     int ret = 0;
 | |
| 
 | |
|     vhost_dev_stop(&vsc->dev, vdev, true);
 | |
| 
 | |
|     if (k->set_guest_notifiers) {
 | |
|         ret = k->set_guest_notifiers(qbus->parent, vsc->dev.nvqs, false);
 | |
|         if (ret < 0) {
 | |
|                 error_report("vhost guest notifier cleanup failed: %d", ret);
 | |
|         }
 | |
|     }
 | |
|     assert(ret >= 0);
 | |
| 
 | |
|     if (vsc->inflight) {
 | |
|         vhost_dev_free_inflight(vsc->inflight);
 | |
|         g_free(vsc->inflight);
 | |
|         vsc->inflight = NULL;
 | |
|     }
 | |
| 
 | |
|     vhost_dev_disable_notifiers(&vsc->dev, vdev);
 | |
| }
 | |
| 
 | |
| uint64_t vhost_scsi_common_get_features(VirtIODevice *vdev, uint64_t features,
 | |
|                                         Error **errp)
 | |
| {
 | |
|     VHostSCSICommon *vsc = VHOST_SCSI_COMMON(vdev);
 | |
| 
 | |
|     /* Turn on predefined features supported by this device */
 | |
|     features |= vsc->host_features;
 | |
| 
 | |
|     return vhost_get_features(&vsc->dev, vsc->feature_bits, features);
 | |
| }
 | |
| 
 | |
| void vhost_scsi_common_set_config(VirtIODevice *vdev, const uint8_t *config)
 | |
| {
 | |
|     VirtIOSCSIConfig *scsiconf = (VirtIOSCSIConfig *)config;
 | |
|     VirtIOSCSICommon *vs = VIRTIO_SCSI_COMMON(vdev);
 | |
| 
 | |
|     if ((uint32_t)virtio_ldl_p(vdev, &scsiconf->sense_size) != vs->sense_size ||
 | |
|         (uint32_t)virtio_ldl_p(vdev, &scsiconf->cdb_size) != vs->cdb_size) {
 | |
|         error_report("vhost-scsi does not support changing the sense data and "
 | |
|                      "CDB sizes");
 | |
|         exit(1);
 | |
|     }
 | |
| }
 | |
| 
 | |
| /*
 | |
|  * Implementation of an interface to adjust firmware path
 | |
|  * for the bootindex property handling.
 | |
|  */
 | |
| char *vhost_scsi_common_get_fw_dev_path(FWPathProvider *p, BusState *bus,
 | |
|                                         DeviceState *dev)
 | |
| {
 | |
|     VHostSCSICommon *vsc = VHOST_SCSI_COMMON(dev);
 | |
|     /* format: /channel@channel/vhost-scsi@target,lun */
 | |
|     return g_strdup_printf("/channel@%x/%s@%x,%x", vsc->channel,
 | |
|                            qdev_fw_name(dev), vsc->target, vsc->lun);
 | |
| }
 | |
| 
 | |
| static const TypeInfo vhost_scsi_common_info = {
 | |
|     .name = TYPE_VHOST_SCSI_COMMON,
 | |
|     .parent = TYPE_VIRTIO_SCSI_COMMON,
 | |
|     .instance_size = sizeof(VHostSCSICommon),
 | |
|     .abstract = true,
 | |
| };
 | |
| 
 | |
| static void virtio_register_types(void)
 | |
| {
 | |
|     type_register_static(&vhost_scsi_common_info);
 | |
| }
 | |
| 
 | |
| type_init(virtio_register_types)
 |