lkml.org 
[lkml]   [2019]   [Jul]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 088/271] nvme-pci: properly report state change failure in nvme_reset_work
    Date
    [ Upstream commit cee6c269b016ba89c62e34d6bccb103ee2c7de4f ]

    If the state change to NVME_CTRL_CONNECTING fails, the dmesg is going to
    be like:

    [ 293.689160] nvme nvme0: failed to mark controller CONNECTING
    [ 293.689160] nvme nvme0: Removing after probe failure status: 0

    Even it prints the first line to indicate the situation, the second line
    is not proper because the status is 0 which means normally success of
    the previous operation.

    This patch makes it indicate the proper error value when it fails.
    [ 25.932367] nvme nvme0: failed to mark controller CONNECTING
    [ 25.932369] nvme nvme0: Removing after probe failure status: -16

    This situation is able to be easily reproduced by:
    root@target:~# rmmod nvme && modprobe nvme && rmmod nvme

    Signed-off-by: Minwoo Im <minwoo.im.dev@gmail.com>
    Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/nvme/host/pci.c | 1 +
    1 file changed, 1 insertion(+)

    diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
    index c8eeecc58115..03e72e2f57f5 100644
    --- a/drivers/nvme/host/pci.c
    +++ b/drivers/nvme/host/pci.c
    @@ -2294,6 +2294,7 @@ static void nvme_reset_work(struct work_struct *work)
    if (!nvme_change_ctrl_state(&dev->ctrl, NVME_CTRL_CONNECTING)) {
    dev_warn(dev->ctrl.device,
    "failed to mark controller CONNECTING\n");
    + result = -EBUSY;
    goto out;
    }

    --
    2.20.1


    \
     
     \ /
      Last update: 2019-07-24 22:09    [W:4.304 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site