Commit 1831e150 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging 



This update brings dataplane to virtio-scsi (NOT
yet 100% thread-safe, though, which makes it really, really
experimental.  It also brings asynchronous cancellation to
the SCSI subsystem and implements it in virtio-scsi.  This
is a pretty important feature.  Almost all the work here
was done by Fam Zheng.

I also included the virtio refcount fixes from Gonglei,
because they had a small conflict with virtio-scsi dataplane.

This pull request is using the new subkey 4E6B09D7.

# gpg: Signature made Tue 30 Sep 2014 12:31:02 BST using RSA key ID 4E6B09D7
# gpg: Good signature from "Paolo Bonzini <pbonzini@redhat.com>"
# gpg:                 aka "Paolo Bonzini <bonzini@gnu.org>"

* remotes/bonzini/tags/for-upstream: (39 commits)
  block/iscsi: handle failure on malloc of the allocationmap
  util: introduce bitmap_try_new
  virtio-scsi: Handle TMF request cancellation asynchronously
  scsi: Introduce scsi_req_cancel_async
  scsi: Introduce scsi_req_cancel_complete
  scsi: Drop SCSIReqOps.cancel_io
  scsi: Unify request unref in scsi_req_cancel
  scsi-generic: Handle canceled request in scsi_command_complete
  scsi: Drop scsi_req_abort
  virtio-scsi: Process ".iothread" property
  virtio-scsi: Call bdrv_io_plug/bdrv_io_unplug in cmd request handling
  virtio-scsi: Batched prepare for cmd reqs
  virtio-scsi: Two stages processing of cmd request
  virtio-scsi: Add migration state notifier for dataplane code
  virtio-scsi: Hook up with dataplane
  virtio-scsi-dataplane: Code to run virtio-scsi on iothread
  virtio-scsi: Add VirtIOSCSIVring in VirtIOSCSIReq
  virtio-scsi: Add 'iothread' property to virtio-scsi
  virtio: add a wrapper for virtio-backend initialization
  virtio-9p: fix virtio-9p child refcount in transports
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 7be3c140 a9fe4c95

block/iscsi.c

+12 −7
Original line number Diff line number Diff line
@@ -316,6 +316,13 @@ static bool is_request_lun_aligned(int64_t sector_num, int nb_sectors, 
    return 1;

}



static unsigned long *iscsi_allocationmap_init(IscsiLun *iscsilun)

{

    return bitmap_try_new(DIV_ROUND_UP(sector_lun2qemu(iscsilun->num_blocks,

                                                       iscsilun),

                                       iscsilun->cluster_sectors));

}



static void iscsi_allocationmap_set(IscsiLun *iscsilun, int64_t sector_num,

                                    int nb_sectors)

{
@@ -1402,9 +1409,10 @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags, 
        iscsilun->cluster_sectors = (iscsilun->bl.opt_unmap_gran *

                                     iscsilun->block_size) >> BDRV_SECTOR_BITS;

        if (iscsilun->lbprz && !(bs->open_flags & BDRV_O_NOCACHE)) {

            iscsilun->allocationmap =

                bitmap_new(DIV_ROUND_UP(bs->total_sectors,

                                        iscsilun->cluster_sectors));

            iscsilun->allocationmap = iscsi_allocationmap_init(iscsilun);

            if (iscsilun->allocationmap == NULL) {

                ret = -ENOMEM;

            }

        }

    }
@@ -1497,10 +1505,7 @@ static int iscsi_truncate(BlockDriverState *bs, int64_t offset) 


    if (iscsilun->allocationmap != NULL) {

        g_free(iscsilun->allocationmap);

        iscsilun->allocationmap =

            bitmap_new(DIV_ROUND_UP(sector_lun2qemu(iscsilun->num_blocks,

                                                    iscsilun),

                                    iscsilun->cluster_sectors));

        iscsilun->allocationmap = iscsi_allocationmap_init(iscsilun);

    }



    return 0;

hw/s390x/s390-virtio-bus.c

+18 −20
Original line number Diff line number Diff line
@@ -159,8 +159,9 @@ static int s390_virtio_net_init(VirtIOS390Device *s390_dev) 
static void s390_virtio_net_instance_init(Object *obj)

{

    VirtIONetS390 *dev = VIRTIO_NET_S390(obj);

    object_initialize(&dev->vdev, sizeof(dev->vdev), TYPE_VIRTIO_NET);

    object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL);



    virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev),

                                TYPE_VIRTIO_NET);

}



static int s390_virtio_blk_init(VirtIOS390Device *s390_dev)
@@ -177,10 +178,9 @@ static int s390_virtio_blk_init(VirtIOS390Device *s390_dev) 
static void s390_virtio_blk_instance_init(Object *obj)

{

    VirtIOBlkS390 *dev = VIRTIO_BLK_S390(obj);

    object_initialize(&dev->vdev, sizeof(dev->vdev), TYPE_VIRTIO_BLK);

    object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL);

    object_unref(OBJECT(&dev->vdev));

    qdev_alias_all_properties(DEVICE(&dev->vdev), obj);



    virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev),

                                TYPE_VIRTIO_BLK);

    object_property_add_alias(obj, "iothread", OBJECT(&dev->vdev),"iothread",

                              &error_abort);

}
@@ -222,8 +222,9 @@ static int s390_virtio_serial_init(VirtIOS390Device *s390_dev) 
static void s390_virtio_serial_instance_init(Object *obj)

{

    VirtIOSerialS390 *dev = VIRTIO_SERIAL_S390(obj);

    object_initialize(&dev->vdev, sizeof(dev->vdev), TYPE_VIRTIO_SERIAL);

    object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL);



    virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev),

                                TYPE_VIRTIO_SERIAL);

}



static int s390_virtio_scsi_init(VirtIOS390Device *s390_dev)
@@ -254,8 +255,9 @@ static int s390_virtio_scsi_init(VirtIOS390Device *s390_dev) 
static void s390_virtio_scsi_instance_init(Object *obj)

{

    VirtIOSCSIS390 *dev = VIRTIO_SCSI_S390(obj);

    object_initialize(&dev->vdev, sizeof(dev->vdev), TYPE_VIRTIO_SCSI);

    object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL);



    virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev),

                                TYPE_VIRTIO_SCSI);

}



#ifdef CONFIG_VHOST_SCSI
@@ -275,8 +277,9 @@ static int s390_vhost_scsi_init(VirtIOS390Device *s390_dev) 
static void s390_vhost_scsi_instance_init(Object *obj)

{

    VHostSCSIS390 *dev = VHOST_SCSI_S390(obj);

    object_initialize(&dev->vdev, sizeof(dev->vdev), TYPE_VHOST_SCSI);

    object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL);



    virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev),

                                TYPE_VHOST_SCSI);

}

#endif
@@ -301,8 +304,9 @@ static int s390_virtio_rng_init(VirtIOS390Device *s390_dev) 
static void s390_virtio_rng_instance_init(Object *obj)

{

    VirtIORNGS390 *dev = VIRTIO_RNG_S390(obj);

    object_initialize(&dev->vdev, sizeof(dev->vdev), TYPE_VIRTIO_RNG);

    object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL);



    virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev),

                                TYPE_VIRTIO_RNG);

    object_property_add_link(obj, "rng", TYPE_RNG_BACKEND,

                             (Object **)&dev->vdev.conf.rng,

                             qdev_prop_allow_set_link_before_realize,
@@ -493,10 +497,8 @@ static unsigned virtio_s390_get_features(DeviceState *d) 
/**************** S390 Virtio Bus Device Descriptions *******************/



static Property s390_virtio_net_properties[] = {

    DEFINE_NIC_PROPERTIES(VirtIONetS390, vdev.nic_conf),

    DEFINE_VIRTIO_COMMON_FEATURES(VirtIOS390Device, host_features),

    DEFINE_VIRTIO_NET_FEATURES(VirtIOS390Device, host_features),

    DEFINE_VIRTIO_NET_PROPERTIES(VirtIONetS390, vdev.net_conf),

    DEFINE_PROP_END_OF_LIST(),

};
@@ -533,7 +535,6 @@ static const TypeInfo s390_virtio_blk = { 
};



static Property s390_virtio_serial_properties[] = {

    DEFINE_VIRTIO_SERIAL_PROPERTIES(VirtIOSerialS390, vdev.serial),

    DEFINE_PROP_END_OF_LIST(),

};
@@ -556,7 +557,6 @@ static const TypeInfo s390_virtio_serial = { 


static Property s390_virtio_rng_properties[] = {

    DEFINE_VIRTIO_COMMON_FEATURES(VirtIOS390Device, host_features),

    DEFINE_VIRTIO_RNG_PROPERTIES(VirtIORNGS390, vdev.conf),

    DEFINE_PROP_END_OF_LIST(),

};
@@ -614,7 +614,6 @@ static const TypeInfo virtio_s390_device_info = { 
};



static Property s390_virtio_scsi_properties[] = {

    DEFINE_VIRTIO_SCSI_PROPERTIES(VirtIOSCSIS390, vdev.parent_obj.conf),

    DEFINE_VIRTIO_COMMON_FEATURES(VirtIOS390Device, host_features),

    DEFINE_VIRTIO_SCSI_FEATURES(VirtIOS390Device, host_features),

    DEFINE_PROP_END_OF_LIST(),
@@ -640,7 +639,6 @@ static const TypeInfo s390_virtio_scsi = { 
#ifdef CONFIG_VHOST_SCSI

static Property s390_vhost_scsi_properties[] = {

    DEFINE_VIRTIO_COMMON_FEATURES(VirtIOS390Device, host_features),

    DEFINE_VHOST_SCSI_PROPERTIES(VHostSCSIS390, vdev.parent_obj.conf),

    DEFINE_PROP_END_OF_LIST(),

};

hw/s390x/virtio-ccw.c

+21 −21
Original line number Diff line number Diff line
@@ -792,8 +792,9 @@ static int virtio_ccw_net_init(VirtioCcwDevice *ccw_dev) 
static void virtio_ccw_net_instance_init(Object *obj)

{

    VirtIONetCcw *dev = VIRTIO_NET_CCW(obj);

    object_initialize(&dev->vdev, sizeof(dev->vdev), TYPE_VIRTIO_NET);

    object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL);



    virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev),

                                TYPE_VIRTIO_NET);

}



static int virtio_ccw_blk_init(VirtioCcwDevice *ccw_dev)
@@ -811,10 +812,9 @@ static int virtio_ccw_blk_init(VirtioCcwDevice *ccw_dev) 
static void virtio_ccw_blk_instance_init(Object *obj)

{

    VirtIOBlkCcw *dev = VIRTIO_BLK_CCW(obj);

    object_initialize(&dev->vdev, sizeof(dev->vdev), TYPE_VIRTIO_BLK);

    object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL);

    object_unref(OBJECT(&dev->vdev));

    qdev_alias_all_properties(DEVICE(&dev->vdev), obj);



    virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev),

                                TYPE_VIRTIO_BLK);

    object_property_add_alias(obj, "iothread", OBJECT(&dev->vdev),"iothread",

                              &error_abort);

}
@@ -848,8 +848,9 @@ static int virtio_ccw_serial_init(VirtioCcwDevice *ccw_dev) 
static void virtio_ccw_serial_instance_init(Object *obj)

{

    VirtioSerialCcw *dev = VIRTIO_SERIAL_CCW(obj);

    object_initialize(&dev->vdev, sizeof(dev->vdev), TYPE_VIRTIO_SERIAL);

    object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL);



    virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev),

                                TYPE_VIRTIO_SERIAL);

}



static int virtio_ccw_balloon_init(VirtioCcwDevice *ccw_dev)
@@ -896,7 +897,7 @@ static void virtio_ccw_balloon_instance_init(Object *obj) 
    VirtIOBalloonCcw *dev = VIRTIO_BALLOON_CCW(obj);

    object_initialize(&dev->vdev, sizeof(dev->vdev), TYPE_VIRTIO_BALLOON);

    object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL);



    object_unref(OBJECT(&dev->vdev));

    object_property_add(obj, "guest-stats", "guest statistics",

                        balloon_ccw_stats_get_all, NULL, NULL, dev, NULL);
@@ -934,8 +935,11 @@ static int virtio_ccw_scsi_init(VirtioCcwDevice *ccw_dev) 
static void virtio_ccw_scsi_instance_init(Object *obj)

{

    VirtIOSCSICcw *dev = VIRTIO_SCSI_CCW(obj);

    object_initialize(&dev->vdev, sizeof(dev->vdev), TYPE_VIRTIO_SCSI);

    object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL);



    virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev),

                                TYPE_VIRTIO_SCSI);

    object_property_add_alias(obj, "iothread", OBJECT(&dev->vdev), "iothread",

                              &error_abort);

}



#ifdef CONFIG_VHOST_SCSI
@@ -955,8 +959,9 @@ static int vhost_ccw_scsi_init(VirtioCcwDevice *ccw_dev) 
static void vhost_ccw_scsi_instance_init(Object *obj)

{

    VHostSCSICcw *dev = VHOST_SCSI_CCW(obj);

    object_initialize(&dev->vdev, sizeof(dev->vdev), TYPE_VHOST_SCSI);

    object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL);



    virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev),

                                TYPE_VHOST_SCSI);

}

#endif
@@ -1374,8 +1379,6 @@ static int virtio_ccw_load_config(DeviceState *d, QEMUFile *f) 
static Property virtio_ccw_net_properties[] = {

    DEFINE_PROP_STRING("devno", VirtioCcwDevice, bus_id),

    DEFINE_VIRTIO_NET_FEATURES(VirtioCcwDevice, host_features[0]),

    DEFINE_VIRTIO_NET_PROPERTIES(VirtIONetCcw, vdev.net_conf),

    DEFINE_NIC_PROPERTIES(VirtIONetCcw, vdev.nic_conf),

    DEFINE_PROP_BIT("ioeventfd", VirtioCcwDevice, flags,

                    VIRTIO_CCW_FLAG_USE_IOEVENTFD_BIT, true),

    DEFINE_PROP_END_OF_LIST(),
@@ -1428,7 +1431,6 @@ static const TypeInfo virtio_ccw_blk = { 


static Property virtio_ccw_serial_properties[] = {

    DEFINE_PROP_STRING("devno", VirtioCcwDevice, bus_id),

    DEFINE_VIRTIO_SERIAL_PROPERTIES(VirtioSerialCcw, vdev.serial),

    DEFINE_PROP_BIT("ioeventfd", VirtioCcwDevice, flags,

                    VIRTIO_CCW_FLAG_USE_IOEVENTFD_BIT, true),

    DEFINE_PROP_END_OF_LIST(),
@@ -1481,7 +1483,6 @@ static const TypeInfo virtio_ccw_balloon = { 


static Property virtio_ccw_scsi_properties[] = {

    DEFINE_PROP_STRING("devno", VirtioCcwDevice, bus_id),

    DEFINE_VIRTIO_SCSI_PROPERTIES(VirtIOSCSICcw, vdev.parent_obj.conf),

    DEFINE_VIRTIO_SCSI_FEATURES(VirtioCcwDevice, host_features[0]),

    DEFINE_PROP_BIT("ioeventfd", VirtioCcwDevice, flags,

                    VIRTIO_CCW_FLAG_USE_IOEVENTFD_BIT, true),
@@ -1510,7 +1511,6 @@ static const TypeInfo virtio_ccw_scsi = { 
#ifdef CONFIG_VHOST_SCSI

static Property vhost_ccw_scsi_properties[] = {

    DEFINE_PROP_STRING("devno", VirtioCcwDevice, bus_id),

    DEFINE_VHOST_SCSI_PROPERTIES(VirtIOSCSICcw, vdev.parent_obj.conf),

    DEFINE_PROP_END_OF_LIST(),

};
@@ -1537,8 +1537,9 @@ static const TypeInfo vhost_ccw_scsi = { 
static void virtio_ccw_rng_instance_init(Object *obj)

{

    VirtIORNGCcw *dev = VIRTIO_RNG_CCW(obj);

    object_initialize(&dev->vdev, sizeof(dev->vdev), TYPE_VIRTIO_RNG);

    object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL);



    virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev),

                                TYPE_VIRTIO_RNG);

    object_property_add_link(obj, "rng", TYPE_RNG_BACKEND,

                             (Object **)&dev->vdev.conf.rng,

                             qdev_prop_allow_set_link_before_realize,
@@ -1547,7 +1548,6 @@ static void virtio_ccw_rng_instance_init(Object *obj) 


static Property virtio_ccw_rng_properties[] = {

    DEFINE_PROP_STRING("devno", VirtioCcwDevice, bus_id),

    DEFINE_VIRTIO_RNG_PROPERTIES(VirtIORNGCcw, vdev.conf),

    DEFINE_PROP_BIT("ioeventfd", VirtioCcwDevice, flags,

                    VIRTIO_CCW_FLAG_USE_IOEVENTFD_BIT, true),

    DEFINE_PROP_END_OF_LIST(),

hw/scsi/Makefile.objs

+1 −1
Original line number Diff line number Diff line
@@ -8,6 +8,6 @@ common-obj-$(CONFIG_ESP_PCI) += esp-pci.o 
obj-$(CONFIG_PSERIES) += spapr_vscsi.o



ifeq ($(CONFIG_VIRTIO),y)

obj-y += virtio-scsi.o

obj-y += virtio-scsi.o virtio-scsi-dataplane.o

obj-$(CONFIG_VHOST_SCSI) += vhost-scsi.o

endif

hw/scsi/scsi-bus.c

+35 −16
Original line number Diff line number Diff line
@@ -551,8 +551,11 @@ SCSIRequest *scsi_req_alloc(const SCSIReqOps *reqops, SCSIDevice *d, 
    SCSIRequest *req;

    SCSIBus *bus = scsi_bus_from_device(d);

    BusState *qbus = BUS(bus);

    const int memset_off = offsetof(SCSIRequest, sense)

                           + sizeof(req->sense);



    req = g_malloc0(reqops->size);

    req = g_slice_alloc(reqops->size);

    memset((uint8_t *)req + memset_off, 0, reqops->size - memset_off);

    req->refcount = 1;

    req->bus = bus;

    req->dev = d;
@@ -560,10 +563,10 @@ SCSIRequest *scsi_req_alloc(const SCSIReqOps *reqops, SCSIDevice *d, 
    req->lun = lun;

    req->hba_private = hba_private;

    req->status = -1;

    req->sense_len = 0;

    req->ops = reqops;

    object_ref(OBJECT(d));

    object_ref(OBJECT(qbus->parent));

    notifier_list_init(&req->cancel_notifiers);

    trace_scsi_req_alloc(req->dev->id, req->lun, req->tag);

    return req;

}
@@ -1603,7 +1606,7 @@ void scsi_req_unref(SCSIRequest *req) 
        }

        object_unref(OBJECT(req->dev));

        object_unref(OBJECT(qbus->parent));

        g_free(req);

        g_slice_free1(req->ops->size, req);

    }

}
@@ -1713,40 +1716,56 @@ void scsi_req_complete(SCSIRequest *req, int status) 
    scsi_req_ref(req);

    scsi_req_dequeue(req);

    req->bus->info->complete(req, req->status, req->resid);



    /* Cancelled requests might end up being completed instead of cancelled */

    notifier_list_notify(&req->cancel_notifiers, req);

    scsi_req_unref(req);

}



void scsi_req_cancel(SCSIRequest *req)

/* Called by the devices when the request is canceled. */

void scsi_req_cancel_complete(SCSIRequest *req)

{

    assert(req->io_canceled);

    if (req->bus->info->cancel) {

        req->bus->info->cancel(req);

    }

    notifier_list_notify(&req->cancel_notifiers, req);

    scsi_req_unref(req);

}



/* Cancel @req asynchronously. @notifier is added to @req's cancellation

 * notifier list, the bus will be notified the requests cancellation is

 * completed.

 * */

void scsi_req_cancel_async(SCSIRequest *req, Notifier *notifier)

{

    trace_scsi_req_cancel(req->dev->id, req->lun, req->tag);

    if (!req->enqueued) {

    if (notifier) {

        notifier_list_add(&req->cancel_notifiers, notifier);

    }

    if (req->io_canceled) {

        return;

    }

    scsi_req_ref(req);

    scsi_req_dequeue(req);

    req->io_canceled = true;

    if (req->ops->cancel_io) {

        req->ops->cancel_io(req);

    }

    if (req->bus->info->cancel) {

        req->bus->info->cancel(req);

    if (req->aiocb) {

        bdrv_aio_cancel_async(req->aiocb);

    }

    scsi_req_unref(req);

}



void scsi_req_abort(SCSIRequest *req, int status)

void scsi_req_cancel(SCSIRequest *req)

{

    trace_scsi_req_cancel(req->dev->id, req->lun, req->tag);

    if (!req->enqueued) {

        return;

    }

    scsi_req_ref(req);

    scsi_req_dequeue(req);

    req->io_canceled = true;

    if (req->ops->cancel_io) {

        req->ops->cancel_io(req);

    if (req->aiocb) {

        bdrv_aio_cancel(req->aiocb);

    }

    scsi_req_complete(req, status);

    scsi_req_unref(req);

}



static int scsi_ua_precedence(SCSISense sense)