lkml.org 
[lkml]   [2016]   [Apr]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.19.y-ckt 060/170] mtip32xx: Handle safe removal during IO
    Date
    3.19.8-ckt18 -stable review patch.  If anyone has any objections, please let me know.

    ---8<------------------------------------------------------------

    From: Asai Thambi SP <asamymuthupa@micron.com>

    commit 51c6570eb922146470c2fe660c34585414679bd6 upstream.

    Flush inflight IOs using fsync_bdev() when the device is safely
    removed. Also, block further IOs in device open function.

    Signed-off-by: Selvan Mani <smani@micron.com>
    Signed-off-by: Rajesh Kumar Sambandam <rsambandam@micron.com>
    Signed-off-by: Asai Thambi S P <asamymuthupa@micron.com>
    Signed-off-by: Jens Axboe <axboe@fb.com>
    [ kamal: backport to 3.19-stable: context ]
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    drivers/block/mtip32xx/mtip32xx.c | 33 ++++++++++++++++++++++++++++++++-
    drivers/block/mtip32xx/mtip32xx.h | 1 +
    2 files changed, 33 insertions(+), 1 deletion(-)

    diff --git a/drivers/block/mtip32xx/mtip32xx.c b/drivers/block/mtip32xx/mtip32xx.c
    index 0722c67..5613774 100644
    --- a/drivers/block/mtip32xx/mtip32xx.c
    +++ b/drivers/block/mtip32xx/mtip32xx.c
    @@ -3685,6 +3685,28 @@ static int mtip_block_getgeo(struct block_device *dev,
    return 0;
    }

    +static int mtip_block_open(struct block_device *dev, fmode_t mode)
    +{
    + struct driver_data *dd;
    +
    + if (dev && dev->bd_disk) {
    + dd = (struct driver_data *) dev->bd_disk->private_data;
    +
    + if (dd) {
    + if (test_bit(MTIP_DDF_REMOVAL_BIT,
    + &dd->dd_flag)) {
    + return -ENODEV;
    + }
    + return 0;
    + }
    + }
    + return -ENODEV;
    +}
    +
    +void mtip_block_release(struct gendisk *disk, fmode_t mode)
    +{
    +}
    +
    /*
    * Block device operation function.
    *
    @@ -3692,6 +3714,8 @@ static int mtip_block_getgeo(struct block_device *dev,
    * layer.
    */
    static const struct block_device_operations mtip_block_ops = {
    + .open = mtip_block_open,
    + .release = mtip_block_release,
    .ioctl = mtip_block_ioctl,
    #ifdef CONFIG_COMPAT
    .compat_ioctl = mtip_block_compat_ioctl,
    @@ -4486,7 +4510,7 @@ static void mtip_pci_remove(struct pci_dev *pdev)
    struct driver_data *dd = pci_get_drvdata(pdev);
    unsigned long flags, to;

    - set_bit(MTIP_DDF_REMOVE_PENDING_BIT, &dd->dd_flag);
    + set_bit(MTIP_DDF_REMOVAL_BIT, &dd->dd_flag);

    spin_lock_irqsave(&dev_lock, flags);
    list_del_init(&dd->online_list);
    @@ -4503,11 +4527,18 @@ static void mtip_pci_remove(struct pci_dev *pdev)
    } while (atomic_read(&dd->irq_workers_active) != 0 &&
    time_before(jiffies, to));

    + fsync_bdev(dd->bdev);
    +
    if (atomic_read(&dd->irq_workers_active) != 0) {
    dev_warn(&dd->pdev->dev,
    "Completion workers still active!\n");
    }

    + if (dd->sr)
    + blk_mq_stop_hw_queues(dd->queue);
    +
    + set_bit(MTIP_DDF_REMOVE_PENDING_BIT, &dd->dd_flag);
    +
    /* Clean up the block layer. */
    mtip_block_remove(dd);

    diff --git a/drivers/block/mtip32xx/mtip32xx.h b/drivers/block/mtip32xx/mtip32xx.h
    index 03d1607..578ad36 100644
    --- a/drivers/block/mtip32xx/mtip32xx.h
    +++ b/drivers/block/mtip32xx/mtip32xx.h
    @@ -160,6 +160,7 @@ enum {
    MTIP_DDF_RESUME_BIT = 6,
    MTIP_DDF_INIT_DONE_BIT = 7,
    MTIP_DDF_REBUILD_FAILED_BIT = 8,
    + MTIP_DDF_REMOVAL_BIT = 9,

    MTIP_DDF_STOP_IO = ((1 << MTIP_DDF_REMOVE_PENDING_BIT) |
    (1 << MTIP_DDF_SEC_LOCK_BIT) |
    --
    2.7.4
    \
     
     \ /
      Last update: 2016-04-02 03:21    [W:4.870 / U:0.216 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site