From: Fam Zheng <famz@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: "James E.J. Bottomley" <JBottomley@parallels.com>,
linux-scsi@vger.kernel.org, Christoph Hellwig <hch@lst.de>,
"Michael S. Tsirkin" <mst@redhat.com>,
Venkatesh Srinivas <venkateshs@google.com>
Subject: [PATCH v4] virtio-scsi: Fix the race condition in virtscsi_handle_event
Date: Thu, 8 Jan 2015 10:57:32 +0800 [thread overview]
Message-ID: <1420685852-5078-1-git-send-email-famz@redhat.com> (raw)
There is a race condition in virtscsi_handle_event, when many device
hotplug/unplug events flush in quickly.
The scsi_remove_device in virtscsi_handle_transport_reset may trigger
the BUG_ON in scsi_target_reap, because the state is altered behind it,
probably by scsi_scan_host of another event. I'm able to reproduce it by
repeatedly plugging and unplugging a scsi disk with the same lun number.
To fix this, a single thread workqueue (local to the module) is added,
which makes the scan work serialized. With this change, the panic goes
away.
Signed-off-by: Fam Zheng <famz@redhat.com>
---
v4: Addressing MST's comments:
Use ordered workqueue, with WQ_FREEZABLE and WQ_MEM_RECLAIM flags.
Coding style fixes.
v3: Fix spacing and destroy order. (MST)
---
drivers/scsi/virtio_scsi.c | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/drivers/scsi/virtio_scsi.c b/drivers/scsi/virtio_scsi.c
index c52bb5d..0db63b5 100644
--- a/drivers/scsi/virtio_scsi.c
+++ b/drivers/scsi/virtio_scsi.c
@@ -120,6 +120,7 @@ struct virtio_scsi {
static struct kmem_cache *virtscsi_cmd_cache;
static mempool_t *virtscsi_cmd_pool;
+static struct workqueue_struct *virtscsi_scan_wq;
static inline struct Scsi_Host *virtio_scsi_host(struct virtio_device *vdev)
{
@@ -404,7 +405,7 @@ static void virtscsi_complete_event(struct virtio_scsi *vscsi, void *buf)
struct virtio_scsi_event_node *event_node = buf;
if (!vscsi->stop_events)
- queue_work(system_freezable_wq, &event_node->work);
+ queue_work(virtscsi_scan_wq, &event_node->work);
}
static void virtscsi_event_done(struct virtqueue *vq)
@@ -1119,6 +1120,14 @@ static int __init init(void)
pr_err("mempool_create() for virtscsi_cmd_pool failed\n");
goto error;
}
+
+ virtscsi_scan_wq =
+ alloc_ordered_workqueue("virtscsi-scan", WQ_FREEZABLE | WQ_MEM_RECLAIM);
+ if (!virtscsi_scan_wq) {
+ pr_err("create_singlethread_workqueue() for virtscsi_scan_wq failed\n");
+ goto error;
+ }
+
ret = register_virtio_driver(&virtio_scsi_driver);
if (ret < 0)
goto error;
@@ -1126,6 +1135,8 @@ static int __init init(void)
return 0;
error:
+ if (virtscsi_scan_wq)
+ destroy_workqueue(virtscsi_scan_wq);
if (virtscsi_cmd_pool) {
mempool_destroy(virtscsi_cmd_pool);
virtscsi_cmd_pool = NULL;
@@ -1140,6 +1151,7 @@ error:
static void __exit fini(void)
{
unregister_virtio_driver(&virtio_scsi_driver);
+ destroy_workqueue(virtscsi_scan_wq);
mempool_destroy(virtscsi_cmd_pool);
kmem_cache_destroy(virtscsi_cmd_cache);
}
--
1.9.3
next reply other threads:[~2015-01-08 2:57 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-08 2:57 Fam Zheng [this message]
2015-01-08 13:08 ` [PATCH v4] virtio-scsi: Fix the race condition in virtscsi_handle_event Paolo Bonzini
2015-01-08 16:36 ` Venkatesh Srinivas
2015-01-19 9:52 ` Christoph Hellwig
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=1420685852-5078-1-git-send-email-famz@redhat.com \
--to=famz@redhat.com \
--cc=JBottomley@parallels.com \
--cc=hch@lst.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=mst@redhat.com \
--cc=venkateshs@google.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