Fix scsi devices plug/unplug races w.r.t virtio-scsi iothread
v5 cover Fix scsi devices plug/unplug races w.r.t virtio-scsi iothread
Hi!
This is a patch series that is a result of my discussion with Paulo on how to correctly fix the root cause of the BZ #1812399.
The root cause of this bug is the fact that IO thread is running mostly unlocked versus main thread on which device hotplug is done.
qdev_device_add first creates the device object, then places it on the bus, and only then realizes it.
However some drivers and currently only virtio-scsi enumerate its child bus devices on each request that is received from the guest and that can happen on the IO thread.
Thus we have a window when new device is on the bus but not realized and can be accessed by the virtio-scsi driver in that state.
Fix that by doing two things:
1. Add partial RCU protection to the list of a bus's child devices. This allows the scsi IO thread to safely enumerate the child devices while it races with the hotplug placing the device on the bus.
2. Let scsi_device_find not return devices that are on the bus but not realized
Note that in the particular bug report the issue wasn't a race but rather due
to combination of things, the .realize code in the middle managed to trigger IO on the virtqueue which caused the virtio-scsi driver to access the half realized device. However since this can happen as well with real IO thread, this patch series was done, which fixes this as well.
Changes from V4:
* Addressed review feedback
Changes from V3:
* Rebased to latest qemu
* Added a new patch to fix related race in scsi_target_emulate_report_luns
* Moved the non-realized device check to scsi core, since there is no way a device driver will want to see non realized devices on a scsi bus. (scsi-bus still needs this and can using an internal function)
* Splitted patch that added drain_rcu and used it, to patch that only adds it, and one that uses it (no other changes so I kept Reviewed-by)
*Some tweaks to commits
This series was tested by adding a virtio-scsi drive with iothread, then running fio stress job in the guest in a loop, and then adding/removing the scsi drive on the host in the loop.
This test was failing usually on 1st iteration withouth this patch series, and now it seems to work smoothly.
Best regards,
Maxim Levitsky
Maxim Levitsky (9):
scsi/scsi_bus: switch search direction in scsi_device_find
rcu: Implement drain_call_rcu
device_core: use drain_call_rcu in in hmp_device_del/qmp_device_add
device-core: use RCU for list of childs of a bus
device-core: use atomic_set on .realized property scsi/scsi-bus: scsi_device_find: don't return unrealized devices scsi/scsi_bus: Add scsi_device_get
virtio-scsi: use scsi_device_get
scsi/scsi_bus: fix races in REPORT LUNS
hw/core/bus.c | 28 +++++--- hw/core/qdev.c | 56 +++++++++++---- hw/scsi/scsi-bus.c | 153 +++++++++++++++++++++++++++-------------- hw/scsi/virtio-scsi.c | 27 +++++--- include/hw/qdev-core.h | 11 +++ include/hw/scsi/scsi.h | 1 + include/qemu/rcu.h | 1 + qdev-monitor.c | 22 ++++++ util/rcu.c | 55 +++++++++++++++ 9 files changed, 267 insertions(+), 87 deletions(-)
Signature · 1 line
2.26.2
PATCH v5 1/9 scsi/scsi_bus: switch search direction in scsi_device_find
This change will allow us to convert the bus children list to RCU, while not changing the logic of this function
--- hw/scsi/scsi-bus.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
hw/scsi/scsi-bus.c +10 -2
@@ -1572,7 +1572,7 @@ SCSIDevice *scsi_device_find(SCSIBus *bus, int channel, int id, int lun)BusChild *kid;SCSIDevice *target_dev =NULL ; - QTAILQ_FOREACH_REVERSE(kid, &bus->qbus.children, sibling) { + QTAILQ_FOREACH(kid, &bus->qbus.children, sibling) {DeviceState *qdev = kid->child;SCSIDevice *dev =SCSI_DEVICE (qdev);
@@ -1580,7 +1580,15 @@ SCSIDevice *scsi_device_find(SCSIBus *bus, int channel, int id, int lun)if (dev->lun == lun) {return dev; } - target_dev = dev; + +/* +* If we don't find exact match (channel/bus/lun), +* we will return the first device which matches channel/bus +*/ + +if (!target_dev) { + target_dev = dev; + } } }return target_dev;
Signature · 1 line
2.26.2
Re: [PATCH v5 1/9] scsi/scsi_bus: switch search direction in scsi_device_find
Quoted 30 lines · Maxim Levitsky
This change will allow us to convert the bus children list to RCU, while not changing the logic of this function
Signed-off-by Maxim Levitsky <[email protected]>Reviewed-by Stefan Hajnoczi <[email protected]>--- hw/scsi/scsi-bus.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)hw/scsi/scsi-bus.c +3
-2@@ -1572,7 +1572,7 @@ SCSIDevice *scsi_device_find(SCSIBus *bus, int channel, int id, int lun)BusChild *kid;SCSIDevice *target_dev =NULL ; - QTAILQ_FOREACH_REVERSE(kid, &bus->qbus.children, sibling) { + QTAILQ_FOREACH(kid, &bus->qbus.children, sibling) {DeviceState *qdev = kid->child;SCSIDevice *dev =SCSI_DEVICE (qdev);@@ -1580,7 +1580,15 @@ SCSIDevice *scsi_device_find(SCSIBus *bus, int channel, int id, int lun)if (dev->lun == lun) {return dev; } - target_dev = dev; + +/*
hw/scsi/scsi-bus.c SCSIDevice *scsi_device_find(SCSIBus *bus, int channel, int id, int lun) · line 1594
Quoted 10 lines
hw/scsi/scsi-bus.c +7
-0+* If we don't find exact match (channel/bus/lun), +* we will return the first device which matches channel/bus +*/ + +if (!target_dev) { + target_dev = dev; + } } }return target_dev;
I think this breaks the detection of duplicate LUNs. I'll play with it and let you know.
Paolo
PATCH v5 2/9 rcu: Implement drain_call_rcu
In reply to Maxim LevitskyThis will allow is to preserve the semantics of hmp_device_del, that the device is deleted immediatly which was changed by previos patch that delayed this to RCU callback
--- include/qemu/rcu.h | 1 + util/rcu.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+)
include/qemu/rcu.h +1 -0
@@ -133,6 +133,7 @@ struct rcu_head { };extern void call_rcu1 (struct rcu_head *head,RCUCBFunc *func); +extern void drain_call_rcu (void );/* The operands of the minus operator must have the same type, * which must be the one that we specify in the cast.
util/rcu.c +55 -0
61 lines not on this page · raw message
Signature · 1 line
2.26.2
PATCH v5 3/9 device_core: use drain_call_rcu in in hmp_device_del/qmp_device_add
In reply to Maxim LevitskySoon, a device removal might only happen on RCU callback execution, but to avoid chanding HMP semantics, just drain all pending RCU callbacks
--- qdev-monitor.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)
qdev-monitor.c +22 -0
@@ -803,6 +803,18 @@ void qmp_device_add(QDict *qdict, QObject **ret_data, Error **errp)return ; } dev =qdev_device_add (opts, errp); + +/* +* Drain all pending RCU callbacks. This is done because +* some bus related operations can delay a device removal +* (in this case this can happen if device is added and then +* removed due to a configuration error) +* to a RCU callback, but user might expect that this interface +* will finish its job completely once qmp command returns result +* to the user +*/ +drain_call_rcu (); +if (!dev) {qemu_opts_del (opts);return ;
@@ -894,6 +906,16 @@ void qmp_device_del(const char *id, Error **errp) }qdev_unplug (dev, errp); + +/* +* Drain all pending RCU callbacks. This is done because +* some bus related operations can delay a device removal +* to a RCU callback, but user might expect that this interface +* will finish its job completely once qmp command returns result +* to the user +*/ + +drain_call_rcu (); } }
Signature · 1 line
2.26.2
PATCH v5 4/9 device-core: use RCU for list of childs of a bus
In reply to Maxim LevitskyThis fixes the race between device emulation code that tries to find a child device to dispatch the request to (e.g a scsi disk), and hotplug of a new device to that bus.
Note that this doesn't convert all the readers of the list but only these that might go over that list without BQL held.
This is a very small first step to make this code thread safe.
--- hw/core/bus.c | 28 ++++++++++++++++++---------- hw/core/qdev.c | 37 +++++++++++++++++++++++-------------- hw/scsi/scsi-bus.c | 17 ++++++++++++++--- hw/scsi/virtio-scsi.c | 6 +++++- include/hw/qdev-core.h | 9 +++++++++ 5 files changed, 69 insertions(+), 28 deletions(-)
hw/core/bus.c +18 -10
@@ -49,12 +49,14 @@ int qbus_walk_children(BusState *bus, } } - QTAILQ_FOREACH(kid, &bus->children, sibling) { - err =qdev_walk_children (kid->child, - pre_devfn, pre_busfn, - post_devfn, post_busfn, opaque); -if (err <0 ) { -return err; + WITH_RCU_READ_LOCK_GUARD() { + QTAILQ_FOREACH_RCU(kid, &bus->children, sibling) { + err =qdev_walk_children (kid->child, + pre_devfn, pre_busfn, + post_devfn, post_busfn, opaque); +if (err <0 ) { +return err; + } } }
@@ -90,9 +92,13 @@ static void bus_reset_child_foreach(Object *obj, ResettableChildCallback cb,BusState *bus =BUS (obj);BusChild *kid; - QTAILQ_FOREACH(kid, &bus->children, sibling) { +rcu_read_lock (); + + QTAILQ_FOREACH_RCU(kid, &bus->children, sibling) {cb (OBJECT (kid->child), opaque, type); } + +rcu_read_unlock (); }static void qbus_init (BusState *bus,DeviceState *parent,const char *name)
@@ -194,9 +200,11 @@ static void bus_set_realized(Object *obj, bool value, Error **errp)/* TODO: recursive realization */ }else if (!value && bus->realized) { - QTAILQ_FOREACH(kid, &bus->children, sibling) { -DeviceState *dev = kid->child; -qdev_unrealize (dev); + WITH_RCU_READ_LOCK_GUARD() { + QTAILQ_FOREACH_RCU(kid, &bus->children, sibling) { +DeviceState *dev = kid->child; +qdev_unrealize (dev); + } }if (bc->unrealize) { bc->unrealize (bus);
hw/core/qdev.c +23 -14
@@ -51,6 +51,12 @@ const VMStateDescription *qdev_get_vmsd(DeviceState *dev)return dc->vmsd; } +static void bus_free_bus_child (BusChild *kid) +{ +object_unref (OBJECT (kid->child)); +g_free (kid); +} +static void bus_remove_child (BusState *bus,DeviceState *child) {BusChild *kid;
@@ -60,15 +66,16 @@ static void bus_remove_child(BusState *bus, DeviceState *child)char name[32 ];snprintf (name,sizeof (name),"child[%d]" , kid->index); -QTAILQ_REMOVE (&bus->children, kid, sibling); +QTAILQ_REMOVE_RCU (&bus->children, kid, sibling); bus->num_children--;/* This gives back ownership of kid->child back to us. */ object_property_del (OBJECT (bus), name); -object_unref (OBJECT (kid->child)); -g_free (kid); -return ; + +/* free the bus kid, when it is safe to do so*/ +call_rcu (kid, bus_free_bus_child, rcu); +break ; } } }
@@ -83,7 +90,7 @@ static void bus_add_child(BusState *bus, DeviceState *child) kid->child = child;object_ref (OBJECT (kid->child)); -QTAILQ_INSERT_HEAD (&bus->children, kid, sibling); +QTAILQ_INSERT_HEAD_RCU (&bus->children, kid, sibling);/* This transfers ownership of kid->child to the property. */ snprintf (name,sizeof (name),"child[%d]" , kid->index);
@@ -659,17 +666,19 @@ DeviceState *qdev_find_recursive(BusState *bus, const char *id)DeviceState *ret;BusState *child; - QTAILQ_FOREACH(kid, &bus->children, sibling) { -DeviceState *dev = kid->child; + WITH_RCU_READ_LOCK_GUARD() { + QTAILQ_FOREACH_RCU(kid, &bus->children, sibling) { +DeviceState *dev = kid->child; -if (dev->id &&strcmp (dev->id, id) ==0 ) { -return dev; - } +if (dev->id &&strcmp (dev->id, id) ==0 ) { +return dev; + } - QLIST_FOREACH(child, &dev->child_bus, sibling) { - ret =qdev_find_recursive (child, id); -if (ret) { -return ret; + QLIST_FOREACH(child, &dev->child_bus, sibling) { + ret =qdev_find_recursive (child, id); +if (ret) { +return ret; + } } } }
hw/scsi/scsi-bus.c +14 -3
@@ -400,7 +400,10 @@ static bool scsi_target_emulate_report_luns(SCSITargetReq *r) id = r->req.dev->id; found_lun0 = false; n =0 ; - QTAILQ_FOREACH(kid, &r->req.bus->qbus.children, sibling) { + +rcu_read_lock (); + + QTAILQ_FOREACH_RCU(kid, &r->req.bus->qbus.children, sibling) {DeviceState *qdev = kid->child;SCSIDevice *dev =SCSI_DEVICE (qdev);
@@ -421,7 +424,7 @@ static bool scsi_target_emulate_report_luns(SCSITargetReq *r)memset (r->buf,0 , len);stl_be_p (&r->buf[0 ], n); i = found_lun0 ?8 :16 ; - QTAILQ_FOREACH(kid, &r->req.bus->qbus.children, sibling) { + QTAILQ_FOREACH_RCU(kid, &r->req.bus->qbus.children, sibling) {DeviceState *qdev = kid->child;SCSIDevice *dev =SCSI_DEVICE (qdev);
@@ -430,6 +433,9 @@ static bool scsi_target_emulate_report_luns(SCSITargetReq *r) i +=8 ; } } + +rcu_read_unlock (); +assert (i == n +8 ); r->len = len;return true;
@@ -1572,12 +1578,15 @@ SCSIDevice *scsi_device_find(SCSIBus *bus, int channel, int id, int lun)BusChild *kid;SCSIDevice *target_dev =NULL ; - QTAILQ_FOREACH(kid, &bus->qbus.children, sibling) { +rcu_read_lock (); + + QTAILQ_FOREACH_RCU(kid, &bus->qbus.children, sibling) {DeviceState *qdev = kid->child;SCSIDevice *dev =SCSI_DEVICE (qdev);if (dev->channel == channel && dev->id == id) {if (dev->lun == lun) { +rcu_read_unlock ();return dev; }
@@ -1591,6 +1600,8 @@ SCSIDevice *scsi_device_find(SCSIBus *bus, int channel, int id, int lun) } } } + +rcu_read_unlock ();return target_dev; }
hw/scsi/virtio-scsi.c +5 -1
@@ -367,12 +367,16 @@ static int virtio_scsi_do_tmf(VirtIOSCSI *s, VirtIOSCSIReq *req)case VIRTIO_SCSI_T_TMF_I_T_NEXUS_RESET : target = req->req.tmf.lun[1 ]; s->resetting++; - QTAILQ_FOREACH(kid, &s->bus.qbus.children, sibling) { + +rcu_read_lock (); + QTAILQ_FOREACH_RCU(kid, &s->bus.qbus.children, sibling) { d =SCSI_DEVICE (kid->child);if (d->channel ==0 && d->id == target) {qdev_reset_all (&d->qdev); } } +rcu_read_unlock (); + s->resetting--;break ;
include/hw/qdev-core.h +9 -0
@@ -3,6 +3,8 @@#include "qemu/queue.h" #include "qemu/bitmap.h" +#include "qemu/rcu.h" +#include "qemu/rcu_queue.h" #include "qom/object.h" #include "hw/hotplug.h" #include "hw/resettable.h"
@@ -229,6 +231,7 @@ struct BusClass { }; typedef struct BusChild { + struct rcu_head rcu; DeviceState *child; int index; QTAILQ_ENTRY(BusChild) sibling;
@@ -249,6 +252,12 @@ struct BusState {int max_index;bool realized;int num_children; + +/* +* children is a RCU QTAILQ, thus readers must use RCU to access it, +* and writers must hold the big qemu lock +*/ + QTAILQ_HEAD(, BusChild) children;QLIST_ENTRY (BusState) sibling;ResettableState reset;
Signature · 1 line
2.26.2
PATCH v5 5/9 device-core: use atomic_set on .realized property
In reply to Maxim LevitskySome code might race with placement of new devices on a bus. We currently first place a (unrealized) device on the bus and then realize it.
As a workaround, users that scan the child device list, can check the realized property to see if it is safe to access such a device. Use an atomic write here too to aid with this.
A separate discussion is what to do with devices that are unrealized:
It looks like for this case we only call the hotplug handler's unplug callback and its up to it to unrealize the device.
An atomic operation doesn't cause harm for this code path though.
--- hw/core/qdev.c | 19 ++++++++++++++++++- include/hw/qdev-core.h | 2 ++ 2 files changed, 20 insertions(+), 1 deletion(-)
hw/core/qdev.c +18 -1
@@ -933,7 +933,25 @@ static void device_set_realized(Object *obj, bool value, Error **errp) } } +atomic_store_release (&dev->realized, value); + }else if (!value && dev->realized) { + +/* +* Change the value so that any concurrent users are aware +* that the device is going to be unrealized +* +* TODO: change .realized property to enum that states +* each phase of the device realization/unrealization +*/ + +atomic_set (&dev->realized, value); +/* +* execute full memory barrier to ensure that concurrent users +* see this update prior to any other changes to the device +*/ +smp_mb (); + QLIST_FOREACH(bus, &dev->child_bus, sibling) {qbus_unrealize (bus); }
@@ -948,7 +966,6 @@ static void device_set_realized(Object *obj, bool value, Error **errp) }assert (local_err ==NULL ); - dev->realized = value;return ; child_realize_fail:
include/hw/qdev-core.h +2 -0
@@ -165,6 +165,8 @@ struct NamedClockList {/** * DeviceState: * @realized: Indicates whether the device has been fully constructed. +* When accessed outsize big qemu lock, must be accessed with +* atomic_load_acquire() * @reset: ResettableState for the device; handled by Resettable interface. * * This structure should not be accessed directly. We declare it here
Signature · 1 line
2.26.2
PATCH v5 6/9 scsi/scsi-bus: scsi_device_find: don't return unrealized devices
In reply to Maxim LevitskyThe device core first places a device on the bus and then realizes it. Make scsi_device_find avoid returing such devices to avoid races in drivers that use an iothread (currently virtio-scsi)
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1812399
--- hw/scsi/scsi-bus.c | 89 ++++++++++++++++++++++++++++------------------ 1 file changed, 54 insertions(+), 35 deletions(-)
hw/scsi/scsi-bus.c +54 -35
@@ -51,6 +51,57 @@ static const TypeInfo scsi_bus_info = { };static int next_scsi_bus; +static SCSIDevice *do_scsi_device_find (SCSIBus *bus, +int channel,int id,int lun, +bool include_unrealized) +{ +BusChild *kid; +SCSIDevice *retval =NULL ; + +rcu_read_lock (); + + QTAILQ_FOREACH_RCU(kid, &bus->qbus.children, sibling) { +DeviceState *qdev = kid->child; +SCSIDevice *dev =SCSI_DEVICE (qdev); + +if (dev->channel == channel && dev->id == id) { +if (dev->lun == lun) { + retval = dev; + goto out; + } + +/* +* If we don't find exact match (channel/bus/lun), +* we will return the first device which matches channel/bus +*/ + +if (!retval) { + retval = dev; + } + } + } +out: +/* +* This function might run on the IO thread and we might race against +* main thread hot-plugging the device. +* We assume that as soon as .realized is set to true we can let +* the user access the device. +*/ + +if (retval && !include_unrealized && + !atomic_load_acquire (&retval->qdev.realized)) { + retval =NULL ; + } + +rcu_read_unlock (); +return retval; +} + +SCSIDevice *scsi_device_find (SCSIBus *bus,int channel,int id,int lun) +{ +return do_scsi_device_find (bus, channel, id, lun, false); +} +static void scsi_device_realize (SCSIDevice *s,Error **errp) {SCSIDeviceClass *sc =SCSI_DEVICE_GET_CLASS (s);
@@ -186,7 +237,7 @@ static void scsi_qdev_realize(DeviceState *qdev, Error **errp) dev->lun =0 ; }do { - d =scsi_device_find (bus, dev->channel, ++id, dev->lun); + d =do_scsi_device_find (bus, dev->channel, ++id, dev->lun, true); }while (d && d->lun == dev->lun && id < bus->info->max_target);if (d && d->lun == dev->lun) {error_setg (errp,"no free target" );
@@ -196,7 +247,7 @@ static void scsi_qdev_realize(DeviceState *qdev, Error **errp) }else if (dev->lun ==-1 ) {int lun =-1 ;do { - d =scsi_device_find (bus, dev->channel, dev->id, ++lun); + d =do_scsi_device_find (bus, dev->channel, dev->id, ++lun, true); }while (d && d->lun == lun && lun < bus->info->max_lun);if (d && d->lun == lun) {error_setg (errp,"no free lun" );
@@ -204,7 +255,7 @@ static void scsi_qdev_realize(DeviceState *qdev, Error **errp) } dev->lun = lun; }else { - d =scsi_device_find (bus, dev->channel, dev->id, dev->lun); + d =do_scsi_device_find (bus, dev->channel, dev->id, dev->lun, true);assert (d);if (d->lun == dev->lun && dev != d) {error_setg (errp,"lun already used by '%s'" , d->qdev.id);
@@ -1573,38 +1624,6 @@ static char *scsibus_get_fw_dev_path(DeviceState *dev) qdev_fw_name(dev), d->id, d->lun); } -SCSIDevice *scsi_device_find (SCSIBus *bus,int channel,int id,int lun) -{ -BusChild *kid; -SCSIDevice *target_dev =NULL ; - -rcu_read_lock (); - - QTAILQ_FOREACH_RCU(kid, &bus->qbus.children, sibling) { -DeviceState *qdev = kid->child; -SCSIDevice *dev =SCSI_DEVICE (qdev); - -if (dev->channel == channel && dev->id == id) { -if (dev->lun == lun) { -rcu_read_unlock (); -return dev; - } - -/* -* If we don't find exact match (channel/bus/lun), -* we will return the first device which matches channel/bus -*/ - -if (!target_dev) { - target_dev = dev; - } - } - } - -rcu_read_unlock (); -return target_dev; -} -/* SCSI request list. For simplicity, pv points to the whole device */ static int put_scsi_requests(QEMUFile *f, void *pv, size_t size,
Signature · 1 line
2.26.2
PATCH v5 7/9 scsi/scsi_bus: Add scsi_device_get
In reply to Maxim LevitskyAdd scsi_device_get which finds the scsi device
and takes a reference to it.
--- hw/scsi/scsi-bus.c | 22 +++++++++++++++++----- include/hw/scsi/scsi.h | 1 + 2 files changed, 18 insertions(+), 5 deletions(-)
hw/scsi/scsi-bus.c +17 -5
@@ -53,7 +53,7 @@ static int next_scsi_bus;static SCSIDevice *do_scsi_device_find (SCSIBus *bus,int channel,int id,int lun, -bool include_unrealized) +bool include_unrealized,bool take_ref) {BusChild *kid;SCSIDevice *retval =NULL ;
@@ -93,13 +93,22 @@ out: retval =NULL ; } +if (take_ref) { +object_ref (OBJECT (retval)); + } +rcu_read_unlock ();return retval; }SCSIDevice *scsi_device_find (SCSIBus *bus,int channel,int id,int lun) { -return do_scsi_device_find (bus, channel, id, lun, false); +return do_scsi_device_find (bus, channel, id, lun, false, false); +} + +SCSIDevice *scsi_device_get (SCSIBus *bus,int channel,int id,int lun) +{ +return do_scsi_device_find (bus, channel, id, lun, false, true); }static void scsi_device_realize (SCSIDevice *s,Error **errp)
@@ -237,7 +246,8 @@ static void scsi_qdev_realize(DeviceState *qdev, Error **errp) dev->lun =0 ; }do { - d =do_scsi_device_find (bus, dev->channel, ++id, dev->lun, true); + d =do_scsi_device_find (bus, dev->channel, ++id, dev->lun, + true, false); }while (d && d->lun == dev->lun && id < bus->info->max_target);if (d && d->lun == dev->lun) {error_setg (errp,"no free target" );
@@ -247,7 +257,8 @@ static void scsi_qdev_realize(DeviceState *qdev, Error **errp) }else if (dev->lun ==-1 ) {int lun =-1 ;do { - d =do_scsi_device_find (bus, dev->channel, dev->id, ++lun, true); + d =do_scsi_device_find (bus, dev->channel, dev->id, ++lun, + true, false); }while (d && d->lun == lun && lun < bus->info->max_lun);if (d && d->lun == lun) {error_setg (errp,"no free lun" );
@@ -255,7 +266,8 @@ static void scsi_qdev_realize(DeviceState *qdev, Error **errp) } dev->lun = lun; }else { - d =do_scsi_device_find (bus, dev->channel, dev->id, dev->lun, true); + d =do_scsi_device_find (bus, dev->channel, dev->id, dev->lun, + true, false);assert (d);if (d->lun == dev->lun && dev != d) {error_setg (errp,"lun already used by '%s'" , d->qdev.id);
include/hw/scsi/scsi.h +1 -0
@@ -193,6 +193,7 @@ int scsi_device_get_sense(SCSIDevice *dev, uint8_t *buf, int len, bool fixed);int scsi_SG_IO_FROM_DEV (BlockBackend *blk,uint8_t *cmd,uint8_t cmd_size,uint8_t *buf,uint8_t buf_size);SCSIDevice *scsi_device_find (SCSIBus *bus,int channel,int target,int lun); +SCSIDevice *scsi_device_get (SCSIBus *bus,int channel,int target,int lun);/* scsi-generic.c. */ extern const SCSIReqOps scsi_generic_req_ops;
Signature · 1 line
2.26.2
PATCH v5 8/9 virtio-scsi: use scsi_device_get
In reply to Maxim LevitskyThis will help us to avoid the scsi device disappearing after we took a reference to it.
It doesn't by itself forbid case when we try to access an unrealized device
--- hw/scsi/virtio-scsi.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-)
hw/scsi/virtio-scsi.c +13 -8
@@ -33,7 +33,7 @@ static inline int virtio_scsi_get_lun(uint8_t *lun)return ((lun[2 ] <<8 ) | lun[3 ]) &0x3FFF ; } -static inline SCSIDevice *virtio_scsi_device_find (VirtIOSCSI *s,uint8_t *lun) +static inline SCSIDevice *virtio_scsi_device_get (VirtIOSCSI *s,uint8_t *lun) {if (lun[0 ] !=1 ) {return NULL ;
@@ -41,7 +41,7 @@ static inline SCSIDevice *virtio_scsi_device_find(VirtIOSCSI *s, uint8_t *lun)if (lun[2 ] !=0 && !(lun[2 ] >=0x40 && lun[2 ] <0x80 )) {return NULL ; } -return scsi_device_find (&s->bus,0 , lun[1 ],virtio_scsi_get_lun (lun)); +return scsi_device_get (&s->bus,0 , lun[1 ],virtio_scsi_get_lun (lun)); }void virtio_scsi_init_req (VirtIOSCSI *s,VirtQueue *vq,VirtIOSCSIReq *req)
@@ -256,7 +256,7 @@ static inline void virtio_scsi_ctx_check(VirtIOSCSI *s, SCSIDevice *d)* case of async cancellation. */ static int virtio_scsi_do_tmf (VirtIOSCSI *s,VirtIOSCSIReq *req) { -SCSIDevice *d =virtio_scsi_device_find (s, req->req.tmf.lun); +SCSIDevice *d =virtio_scsi_device_get (s, req->req.tmf.lun);SCSIRequest *r, *next;BusChild *kid;int target;
@@ -370,10 +370,10 @@ static int virtio_scsi_do_tmf(VirtIOSCSI *s, VirtIOSCSIReq *req)rcu_read_lock (); QTAILQ_FOREACH_RCU(kid, &s->bus.qbus.children, sibling) { - d =SCSI_DEVICE (kid->child); -if (d->channel ==0 && d->id == target) { -qdev_reset_all (&d->qdev); - } +SCSIDevice *d1 =SCSI_DEVICE (kid->child); +if (d1->channel ==0 && d1->id == target) { +qdev_reset_all (&d1->qdev); + } }rcu_read_unlock ();
@@ -386,14 +386,17 @@ static int virtio_scsi_do_tmf(VirtIOSCSI *s, VirtIOSCSIReq *req)break ; } +object_unref (OBJECT (d));return ret; incorrect_lun: req->resp.tmf.response =VIRTIO_SCSI_S_INCORRECT_LUN ; +object_unref (OBJECT (d));return ret; fail: req->resp.tmf.response =VIRTIO_SCSI_S_BAD_TARGET ; +object_unref (OBJECT (d));return ret; }
@@ -564,7 +567,7 @@ static int virtio_scsi_handle_cmd_req_prepare(VirtIOSCSI *s, VirtIOSCSIReq *req) } } - d =virtio_scsi_device_find (s, req->req.cmd.lun); + d =virtio_scsi_device_get (s, req->req.cmd.lun);if (!d) { req->resp.cmd.response =VIRTIO_SCSI_S_BAD_TARGET ;virtio_scsi_complete_cmd_req (req);
@@ -580,10 +583,12 @@ static int virtio_scsi_handle_cmd_req_prepare(VirtIOSCSI *s, VirtIOSCSIReq *req) req->sreq->cmd.xfer > req->qsgl.size)) { req->resp.cmd.response =VIRTIO_SCSI_S_OVERRUN ;virtio_scsi_complete_cmd_req (req); +object_unref (OBJECT (d));return -ENOBUFS ; }scsi_req_ref (req->sreq);blk_io_plug (d->conf.blk); +object_unref (OBJECT (d));return 0 ; }
Signature · 1 line
2.26.2
PATCH v5 9/9 scsi/scsi_bus: fix races in REPORT LUNS
In reply to Maxim LevitskyCurrently scsi_target_emulate_report_luns iterates over the child device list twice, and there is no guarantee that this list is the same in both iterations.
The reason for iterating twise is that the first iteration calculates how much memory to allocate.
However if we use a dynamic array we can avoid iterating twice, and therefore we avoid this race.
--- hw/scsi/scsi-bus.c | 65 ++++++++++++++++++++++------------------------ 1 file changed, 31 insertions(+), 34 deletions(-)
hw/scsi/scsi-bus.c +31 -34
@@ -439,19 +439,23 @@ struct SCSITargetReq {static void store_lun (uint8_t *outbuf,int lun) {if (lun <256 ) { +/* Simple logical unit addressing method*/ + outbuf[0 ] =0 ; outbuf[1 ] = lun; -return ; + }else { +/* Flat space addressing method */ + outbuf[0 ] =0x40 | (lun >>8 ); + outbuf[1 ] = (lun &255 ); } - outbuf[1 ] = (lun &255 ); - outbuf[0 ] = (lun >>8 ) |0x40 ; }static bool scsi_target_emulate_report_luns (SCSITargetReq *r) {BusChild *kid; -int i, len, n;int channel, id; -bool found_lun0; +uint8_t tmp[8 ] = {0 }; +int len =0 ; +GByteArray *buf;if (r->req.cmd.xfer <16 ) {return false;
@@ -459,48 +463,41 @@ static bool scsi_target_emulate_report_luns(SCSITargetReq *r)if (r->req.cmd.buf[2 ] >2 ) {return false; } + +/* reserve space for 63 LUNs*/ + buf =g_byte_array_sized_new (512 ); + channel = r->req.dev->channel; id = r->req.dev->id; - found_lun0 = false; - n =0 ; -rcu_read_lock (); +/* add size (will be updated later to correct value */ +g_byte_array_append (buf, tmp,8 ); + len +=8 ; - QTAILQ_FOREACH_RCU(kid, &r->req.bus->qbus.children, sibling) { -DeviceState *qdev = kid->child; -SCSIDevice *dev =SCSI_DEVICE (qdev); +/* add LUN0 */ +g_byte_array_append (buf, tmp,8 ); + len +=8 ; -if (dev->channel == channel && dev->id == id) { -if (dev->lun ==0 ) { - found_lun0 = true; - } - n +=8 ; - } - } -if (!found_lun0) { - n +=8 ; - } - -scsi_target_alloc_buf (&r->req, n +8 ); - - len =MIN (n +8 , r->req.cmd.xfer & ~7 ); -memset (r->buf,0 , len); -stl_be_p (&r->buf[0 ], n); - i = found_lun0 ?8 :16 ; +rcu_read_lock (); QTAILQ_FOREACH_RCU(kid, &r->req.bus->qbus.children, sibling) {DeviceState *qdev = kid->child;SCSIDevice *dev =SCSI_DEVICE (qdev); -if (dev->channel == channel && dev->id == id) { -store_lun (&r->buf[i], dev->lun); - i +=8 ; +if (dev->channel == channel && dev->id == id && dev->lun !=0 ) { +store_lun (tmp, dev->lun); +g_byte_array_append (buf, tmp,8 ); + len +=8 ; } } -rcu_read_unlock (); -assert (i == n +8 ); - r->len = len; + r->buf_len = len; + r->buf =g_byte_array_free (buf, FALSE); + r->len =MIN (len, r->req.cmd.xfer & ~7 ); + +/* store the LUN list length */ +stl_be_p (&r->buf[0 ], len -8 ); +return true; }
Signature · 1 line
2.26.2