Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a5e39a7f authored by Keith Busch's avatar Keith Busch Committed by Greg Kroah-Hartman
Browse files

nvme/core: Fix race kicking freed request_queue 



commit f33447b90e96076483525b21cc4e0a8977cdd07c upstream.

If a namespace has already been marked dead, we don't want to kick the
request_queue again since we may have just freed it from another thread.

Signed-off-by: default avatarKeith Busch <keith.busch@intel.com>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent eb8c62a3

drivers/nvme/host/core.c

+3 −3
Original line number Diff line number Diff line
@@ -2057,9 +2057,9 @@ void nvme_kill_queues(struct nvme_ctrl *ctrl) 
		 * Revalidating a dead namespace sets capacity to 0. This will

		 * end buffered writers dirtying pages that can't be synced.

		 */

		if (ns->disk && !test_and_set_bit(NVME_NS_DEAD, &ns->flags))

		if (!ns->disk || test_and_set_bit(NVME_NS_DEAD, &ns->flags))

			continue;

		revalidate_disk(ns->disk);



		blk_set_queue_dying(ns->queue);

		blk_mq_abort_requeue_list(ns->queue);

		blk_mq_start_stopped_hw_queues(ns->queue, true);