* [PATCH v4] virtio-scsi: Fix the race condition in virtscsi_handle_event
@ 2015-01-08 2:57 Fam Zheng
2015-01-08 13:08 ` Paolo Bonzini
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Fam Zheng @ 2015-01-08 2:57 UTC (permalink / raw)
To: linux-kernel
Cc: James E.J. Bottomley, linux-scsi, Christoph Hellwig,
Michael S. Tsirkin, Venkatesh Srinivas
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
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH v4] virtio-scsi: Fix the race condition in virtscsi_handle_event
2015-01-08 2:57 [PATCH v4] virtio-scsi: Fix the race condition in virtscsi_handle_event Fam Zheng
@ 2015-01-08 13:08 ` Paolo Bonzini
2015-01-08 16:36 ` Venkatesh Srinivas
2015-01-19 9:52 ` Christoph Hellwig
2 siblings, 0 replies; 4+ messages in thread
From: Paolo Bonzini @ 2015-01-08 13:08 UTC (permalink / raw)
To: Fam Zheng, linux-kernel
Cc: James E.J. Bottomley, linux-scsi, Christoph Hellwig,
Michael S. Tsirkin, Venkatesh Srinivas
On 08/01/2015 03:57, Fam Zheng wrote:
> 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>
Reviewed-by: Paolo Bonzini <pbonzini@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);
> }
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH v4] virtio-scsi: Fix the race condition in virtscsi_handle_event
2015-01-08 2:57 [PATCH v4] virtio-scsi: Fix the race condition in virtscsi_handle_event Fam Zheng
2015-01-08 13:08 ` Paolo Bonzini
@ 2015-01-08 16:36 ` Venkatesh Srinivas
2015-01-19 9:52 ` Christoph Hellwig
2 siblings, 0 replies; 4+ messages in thread
From: Venkatesh Srinivas @ 2015-01-08 16:36 UTC (permalink / raw)
To: Fam Zheng
Cc: Linux Kernel Developers List, James E.J. Bottomley, linux-scsi,
Christoph Hellwig, Michael S. Tsirkin
On Wed, Jan 7, 2015 at 6:57 PM, Fam Zheng <famz@redhat.com> wrote:
>
> 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>
Reviewed-by: Venkatesh Srinivas <venkateshs@google.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
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH v4] virtio-scsi: Fix the race condition in virtscsi_handle_event
2015-01-08 2:57 [PATCH v4] virtio-scsi: Fix the race condition in virtscsi_handle_event Fam Zheng
2015-01-08 13:08 ` Paolo Bonzini
2015-01-08 16:36 ` Venkatesh Srinivas
@ 2015-01-19 9:52 ` Christoph Hellwig
2 siblings, 0 replies; 4+ messages in thread
From: Christoph Hellwig @ 2015-01-19 9:52 UTC (permalink / raw)
To: Fam Zheng
Cc: linux-kernel, James E.J. Bottomley, linux-scsi, Christoph Hellwig,
Michael S. Tsirkin, Venkatesh Srinivas
Michael,
are you fine with this version?
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-01-19 9:52 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-01-08 2:57 [PATCH v4] virtio-scsi: Fix the race condition in virtscsi_handle_event Fam Zheng
2015-01-08 13:08 ` Paolo Bonzini
2015-01-08 16:36 ` Venkatesh Srinivas
2015-01-19 9:52 ` Christoph Hellwig
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).