lkml.org 
[lkml]   [2014]   [Oct]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 06/16] virtio_blk: drop config_enable
On Mon, Oct 06, 2014 at 01:42:29PM +0200, Cornelia Huck wrote:
> On Sun, 5 Oct 2014 19:07:07 +0300
> "Michael S. Tsirkin" <mst@redhat.com> wrote:
>
> > Now that virtio core ensures config changes don't
> > arrive during probing, drop config_enable flag
> > in virtio blk.
> > On removal, flush is now sufficient to guarantee that
> > no change work is queued.
> >
> > This help simplify the driver, and will allow
> > setting DRIVER_OK earlier without losing config
> > change notifications.
> >
> > Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> > ---
> > drivers/block/virtio_blk.c | 19 ++-----------------
> > 1 file changed, 2 insertions(+), 17 deletions(-)
> >
> > diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
> > index 0a58140..c8cf6a1 100644
> > --- a/drivers/block/virtio_blk.c
> > +++ b/drivers/block/virtio_blk.c
>
> > @@ -772,9 +766,7 @@ static void virtblk_remove(struct virtio_device *vdev)
> > int refc;
> >
> > /* Prevent config work handler from accessing the device. */
>
> /* Common code ensures no further work will be queued. */
>
> instead?

No, I think you missed the point:
this comment now refers to the flush below: flush is required to
ensure work handler is not running.

Agree?

> > - mutex_lock(&vblk->config_lock);
> > - vblk->config_enable = false;
> > - mutex_unlock(&vblk->config_lock);
> > + flush_work(&vblk->config_work);
> >
> > del_gendisk(vblk->disk);
> > blk_cleanup_queue(vblk->disk->queue);
>
> > @@ -806,10 +796,6 @@ static int virtblk_freeze(struct virtio_device *vdev)
> > vdev->config->reset(vdev);
> >
> > /* Prevent config work handler from accessing the device. */
>
> dito on the comment

Same here and in -net.
Pls confirm.

> > - mutex_lock(&vblk->config_lock);
> > - vblk->config_enable = false;
> > - mutex_unlock(&vblk->config_lock);
> > -
> > flush_work(&vblk->config_work);
> >
> > blk_mq_stop_hw_queues(vblk->disk->queue);


\
 
 \ /
  Last update: 2014-10-06 14:41    [W:0.072 / U:0.408 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site