diff options
| author |  Christoph Hellwig <hch@lst.de>
| 2022-11-16 08:14:46 +0100 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de>
| 2022-12-06 09:16:56 +0100 |
| commit | ba0718a6d67130fd4bff664b86d2aa63fa49e241 (patch) | |
| tree | 3296ce83478a595298ff7c159353a060c8d3c70c /drivers/nvme | |
| parent | blk-throttle: Use more suitable time_after check for update of slice_start (diff) | |
| download | linux-ba0718a6d67130fd4bff664b86d2aa63fa49e241.tar.gz linux-ba0718a6d67130fd4bff664b86d2aa63fa49e241.tar.bz2 linux-ba0718a6d67130fd4bff664b86d2aa63fa49e241.zip | |
nvme: don't call blk_mq_{,un}quiesce_tagset when ctrl->tagset is NULL
The NVMe drivers support a mode where no tagset is allocated for the I/O
queues and only the admin queue is usable. In that case ctrl->tagset is
NULL and we must not call the block per-tagset quiesce helpers that
dereference it.
Fixes: 98d81f0df70c ("nvme: use blk_mq_[un]quiesce_tagset")
Reported-by: Gerd Bayer <gbayer@linux.ibm.com>
Reported-by: Chao Leng <lengchao@huawei.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Chao Leng <lengchao@huawei.com>
Diffstat (limited to 'drivers/nvme')
| -rw-r--r-- | drivers/nvme/host/core.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 3195ae17df30..fd2e26cb7a68 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -5215,6 +5215,8 @@ EXPORT_SYMBOL_GPL(nvme_start_freeze); void nvme_quiesce_io_queues(struct nvme_ctrl *ctrl) { + if (!ctrl->tagset) + return; if (!test_and_set_bit(NVME_CTRL_STOPPED, &ctrl->flags)) blk_mq_quiesce_tagset(ctrl->tagset); else @@ -5224,6 +5226,8 @@ EXPORT_SYMBOL_GPL(nvme_quiesce_io_queues); void nvme_unquiesce_io_queues(struct nvme_ctrl *ctrl) { + if (!ctrl->tagset) + return; if (test_and_clear_bit(NVME_CTRL_STOPPED, &ctrl->flags)) blk_mq_unquiesce_tagset(ctrl->tagset); } |