From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 909EE265601; Tue, 25 Mar 2025 12:25:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742905544; cv=none; b=TyU2wbKOrxkC5kQrqqasBWWj+O7YgrccKsfHk/TwdM9YbmWlO7lGFJm7S6t5ox4P6um5HkJPBtD//bzbO2WfQQiYSAi4FazmlUn3zkWFOTX0sdH3h0L4TIXMzOnGANRVxYNmZP+2yJ97MncoW5adhOL8bSzrxWVIJAUuaS7EOUY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742905544; c=relaxed/simple; bh=c0jzLqaOFfFJago++bT/NgSPcQYlrfmkJ14TS4OBwTI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uHOSF2r1Ollz/AwZl7rO2kUu5GjglMbZh/jnFKM39r6qm4J+5FT+GTcM1t5C5xtTSknZxoCDIQJydmXuJ5xiIu5e/RqRfVhPfOXVfQ8krHQZzXJ7uYc09m0hVfyH1uJaKH03I2QmCKHVZv2lekwGD71xo9g3GEejeDRAj4dfbeM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=OePcR0T7; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="OePcR0T7" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E2CE5C4CEEF; Tue, 25 Mar 2025 12:25:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1742905543; bh=c0jzLqaOFfFJago++bT/NgSPcQYlrfmkJ14TS4OBwTI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OePcR0T70lhwgw49cTsAJc0Zf0QfNLnefySOUpcCI8ga04p/4J1f5rR3IcjduA3Og OGqiMM47KRuUc2AmxlBIqJ9gTfrZYa5zYOS0MF6WIW6gV62+8xs6dmQfcJoYA4OUtG Qpe1svLR37L/nK5rnIZmY1QVMwRhNu6jGy2BmMLM= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Sagi Grimberg , Hannes Reinecke , Christoph Hellwig , Daniel Wagner , Keith Busch , Sasha Levin Subject: [PATCH 6.1 031/198] nvme-fc: go straight to connecting state when initializing Date: Tue, 25 Mar 2025 08:19:53 -0400 Message-ID: <20250325122157.457358740@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250325122156.633329074@linuxfoundation.org> References: <20250325122156.633329074@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Daniel Wagner [ Upstream commit d3d380eded7ee5fc2fc53b3b0e72365ded025c4a ] The initial controller initialization mimiks the reconnect loop behavior by switching from NEW to RESETTING and then to CONNECTING. The transition from NEW to CONNECTING is a valid transition, so there is no point entering the RESETTING state. TCP and RDMA also transition directly to CONNECTING state. Reviewed-by: Sagi Grimberg Reviewed-by: Hannes Reinecke Reviewed-by: Christoph Hellwig Signed-off-by: Daniel Wagner Signed-off-by: Keith Busch Signed-off-by: Sasha Levin --- drivers/nvme/host/fc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c index 3dbf926fd99fd..2b0f15de77111 100644 --- a/drivers/nvme/host/fc.c +++ b/drivers/nvme/host/fc.c @@ -3525,8 +3525,7 @@ nvme_fc_init_ctrl(struct device *dev, struct nvmf_ctrl_options *opts, list_add_tail(&ctrl->ctrl_list, &rport->ctrl_list); spin_unlock_irqrestore(&rport->lock, flags); - if (!nvme_change_ctrl_state(&ctrl->ctrl, NVME_CTRL_RESETTING) || - !nvme_change_ctrl_state(&ctrl->ctrl, NVME_CTRL_CONNECTING)) { + if (!nvme_change_ctrl_state(&ctrl->ctrl, NVME_CTRL_CONNECTING)) { dev_err(ctrl->ctrl.device, "NVME-FC{%d}: failed to init ctrl state\n", ctrl->cnum); goto fail_ctrl; -- 2.39.5