Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

nvme-pci: add missing unlock for reset error

Browse source 
[ Upstream commit 4726bcf30fad37cc555cd9dcd6c73f2b2668c879 ]

The reset work holds a mutex to prevent races with removal modifying the
same resources, but was unlocking only on success. Unlock on failure
too.

Fixes: 5c959d73dba64 ("nvme-pci: fix rapid add remove sequence")
Signed-off-by: Keith Busch <keith.busch@intel.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Keith Busch 2019-02-11 09:23:50 -07:00 committed by Greg Kroah-Hartman
parent 6d482bc569
commit 7066774e60
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/nvme/host/pci.c
View file

@ -2263,15 +2263,15 @@ static void nvme_reset_work(struct work_struct *work)
mutex_lock(&dev->shutdown_lock); mutex_lock(&dev->shutdown_lock);
result = nvme_pci_enable(dev); result = nvme_pci_enable(dev);
if (result) if (result)
goto out; goto out_unlock;
result = nvme_pci_configure_admin_queue(dev); result = nvme_pci_configure_admin_queue(dev);
if (result) if (result)
goto out; goto out_unlock;
result = nvme_alloc_admin_tags(dev); result = nvme_alloc_admin_tags(dev);
if (result) if (result)
goto out; goto out_unlock;
/* /*
* Limit the max command size to prevent iod->sg allocations going * Limit the max command size to prevent iod->sg allocations going
@ -2354,6 +2354,8 @@ static void nvme_reset_work(struct work_struct *work)
nvme_start_ctrl(&dev->ctrl); nvme_start_ctrl(&dev->ctrl);
return; return;
out_unlock:
mutex_unlock(&dev->shutdown_lock);
out: out:
nvme_remove_dead_ctrl(dev, result); nvme_remove_dead_ctrl(dev, result);
} }