diff options
| author | Israel Rukshin <israelr@mellanox.com> | 2020-03-24 17:29:44 +0200 |
|---|---|---|
| committer | Keith Busch <kbusch@kernel.org> | 2020-03-26 04:51:56 +0900 |
| commit | 96135862dfcce38b98beff7d1009188263b7e6f7 (patch) | |
| tree | 0cba7d5848cb85a003036a57633e893acd8e4b6b | |
| parent | ce1518139e6976cf19c133b555083354fdb629b8 (diff) | |
| download | linux-stable-96135862dfcce38b98beff7d1009188263b7e6f7.tar.gz linux-stable-96135862dfcce38b98beff7d1009188263b7e6f7.tar.bz2 linux-stable-96135862dfcce38b98beff7d1009188263b7e6f7.zip | |
nvme-rdma: Add warning on state change failure at nvme_rdma_setup_ctrl
The transition to LIVE state should not fail in case of a new controller.
Moving to DELETING state before nvme_tcp_create_ctrl() allocates all the
resources may leads to NULL dereference at teardown flow (e.g., IO tagset,
admin_q, connect_q).
Signed-off-by: Israel Rukshin <israelr@mellanox.com>
Reviewed-by: Max Gurtovoy <maxg@mellanox.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Keith Busch <kbusch@kernel.org>
| -rw-r--r-- | drivers/nvme/host/rdma.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c index c99a88247660..3ae3011a95ea 100644 --- a/drivers/nvme/host/rdma.c +++ b/drivers/nvme/host/rdma.c @@ -1022,8 +1022,13 @@ static int nvme_rdma_setup_ctrl(struct nvme_rdma_ctrl *ctrl, bool new) changed = nvme_change_ctrl_state(&ctrl->ctrl, NVME_CTRL_LIVE); if (!changed) { - /* state change failure is ok if we're in DELETING state */ + /* + * state change failure is ok if we're in DELETING state, + * unless we're during creation of a new controller to + * avoid races with teardown flow. + */ WARN_ON_ONCE(ctrl->ctrl.state != NVME_CTRL_DELETING); + WARN_ON_ONCE(new); ret = -EINVAL; goto destroy_io; } |