qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
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>,
	"Paolo Bonzini" <pbonzini@redhat.com>
Subject: [PATCH v2 5/7] virtio-scsi: don't touch scsi devices that are not yet realized or about to be un-realized
Date: Mon, 11 May 2020 19:09:49 +0300	[thread overview]
Message-ID: <20200511160951.8733-6-mlevitsk@redhat.com> (raw)
In-Reply-To: <20200511160951.8733-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>
---
 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 b0f4a35f81..1cc1fc557c 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.17.2



  parent reply	other threads:[~2020-05-11 16:13 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-11 16:09 [PATCH v2 0/7] RFC/WIP: Fix scsi devices plug/unplug races w.r.t virtio-scsi iothread Maxim Levitsky
2020-05-11 16:09 ` [PATCH v2 1/7] scsi/scsi_bus: switch search direction in scsi_device_find Maxim Levitsky
2020-05-27 12:53   ` Stefan Hajnoczi
2020-05-11 16:09 ` [PATCH v2 2/7] Implement drain_call_rcu and use it in hmp_device_del Maxim Levitsky
2020-05-27 13:11   ` Stefan Hajnoczi
2020-07-09  9:34     ` Maxim Levitsky
2020-07-09 11:42   ` Markus Armbruster
2020-07-09 11:56     ` Maxim Levitsky
2020-07-09 12:02       ` Paolo Bonzini
2020-05-11 16:09 ` [PATCH v2 3/7] device-core: use RCU for list of childs of a bus Maxim Levitsky
2020-05-27 14:45   ` Stefan Hajnoczi
2020-07-09  9:40     ` Maxim Levitsky
2020-05-11 16:09 ` [PATCH v2 4/7] device-core: use atomic_set on .realized property Maxim Levitsky
2020-05-27 15:00   ` Stefan Hajnoczi
2020-07-09 10:24     ` Maxim Levitsky
2020-05-11 16:09 ` Maxim Levitsky [this message]
2020-05-27 15:08   ` [PATCH v2 5/7] virtio-scsi: don't touch scsi devices that are not yet realized or about to be un-realized Stefan Hajnoczi
2020-05-11 16:09 ` [PATCH v2 6/7] scsi: Add scsi_device_get Maxim Levitsky
2020-05-27 15:27   ` Stefan Hajnoczi
2020-07-09 10:35     ` Maxim Levitsky
2020-05-11 16:09 ` [PATCH v2 7/7] virtio-scsi: use scsi_device_get Maxim Levitsky
2020-05-27 15:50   ` Stefan Hajnoczi
2020-07-09 10:43     ` Maxim Levitsky
2020-05-27 15:50   ` Stefan Hajnoczi
2020-05-11 18:03 ` [PATCH v2 0/7] RFC/WIP: Fix scsi devices plug/unplug races w.r.t virtio-scsi iothread no-reply
2020-05-11 18:03 ` no-reply

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=20200511160951.8733-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 \
    /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).