From: Maxim Levitsky <mlevitsk@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Fam Zheng" <fam@euphon.net>,
"Daniel P. Berrangé" <berrange@redhat.com>,
"Eduardo Habkost" <ehabkost@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Maxim Levitsky" <mlevitsk@redhat.com>,
"Stefan Hajnoczi" <stefanha@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>
Subject: [PATCH v3 5/7] virtio-scsi: don't touch scsi devices that are not yet realized or about to be un-realized
Date: Wed, 15 Jul 2020 18:01:57 +0300 [thread overview]
Message-ID: <20200715150159.95050-6-mlevitsk@redhat.com> (raw)
In-Reply-To: <20200715150159.95050-1-mlevitsk@redhat.com>
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1812399
Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
---
hw/scsi/virtio-scsi.c | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c
index d3cfc8dfb6..18952e0f1c 100644
--- a/hw/scsi/virtio-scsi.c
+++ b/hw/scsi/virtio-scsi.c
@@ -35,13 +35,30 @@ static inline int virtio_scsi_get_lun(uint8_t *lun)
static inline SCSIDevice *virtio_scsi_device_find(VirtIOSCSI *s, uint8_t *lun)
{
+ SCSIDevice *device = NULL;
+
if (lun[0] != 1) {
return NULL;
}
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));
+
+ device = scsi_device_find(&s->bus, 0, lun[1], virtio_scsi_get_lun(lun));
+
+ /*
+ * 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 (!device || !atomic_load_acquire(&device->qdev.realized)) {
+ return NULL;
+ }
+
+ return device;
}
void virtio_scsi_init_req(VirtIOSCSI *s, VirtQueue *vq, VirtIOSCSIReq *req)
--
2.26.2
next prev parent reply other threads:[~2020-07-15 15:08 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-15 15:01 [PATCH v3 0/7] Fix scsi devices plug/unplug races w.r.t virtio-scsi iothread Maxim Levitsky
2020-07-15 15:01 ` [PATCH v3 1/7] scsi/scsi_bus: switch search direction in scsi_device_find Maxim Levitsky
2020-07-15 15:01 ` [PATCH v3 2/7] Implement drain_call_rcu and use it in hmp_device_del Maxim Levitsky
2020-07-15 15:01 ` [PATCH v3 3/7] device-core: use RCU for list of childs of a bus Maxim Levitsky
2020-08-05 10:32 ` Stefan Hajnoczi
2020-07-15 15:01 ` [PATCH v3 4/7] device-core: use atomic_set on .realized property Maxim Levitsky
2020-08-05 10:33 ` Stefan Hajnoczi
2020-07-15 15:01 ` Maxim Levitsky [this message]
2020-07-15 15:01 ` [PATCH v3 6/7] scsi: Add scsi_device_get Maxim Levitsky
2020-08-05 10:45 ` Stefan Hajnoczi
2020-07-15 15:01 ` [PATCH v3 7/7] virtio-scsi: use scsi_device_get Maxim Levitsky
2020-07-29 19:56 ` [PATCH v3 0/7] Fix scsi devices plug/unplug races w.r.t virtio-scsi iothread Maxim Levitsky
2020-08-05 10:48 ` Stefan Hajnoczi
2020-08-13 12:26 ` Maxim Levitsky
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=20200715150159.95050-6-mlevitsk@redhat.com \
--to=mlevitsk@redhat.com \
--cc=berrange@redhat.com \
--cc=ehabkost@redhat.com \
--cc=fam@euphon.net \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.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).