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 1A1111DF27F; Tue, 8 Apr 2025 11:38:38 +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=1744112318; cv=none; b=gHzO41EvSg7f1FMjYqWV3PkEKrWLdVQ+jPg/vCv5u2JTn2U+IJy5/3pl46y1J/imqIHLAH9CvJFKlmfWij9kvJU0icnNTR5GZrc1i7duDwOzB9o5v5JuJXnxkAvmHy6tRftiKVaMOumTUa8nm08sBU/MdL4iQrvdFnb0VjBEYV4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744112318; c=relaxed/simple; bh=BMUL5tDa1XoSLiWfA0CnTE/QA94csEdZVjrzmm0GFf8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jtL7gyxjns/TNtxAJtTReODqwgiCSUp0HQhQ9NtkaCXlE+ZHkv+AdNPONFhgPQy+Y7f4mZcz6Kg1yxmy0SarV0tPDjRIunOlbwQ+LsORab5y0L8krDNU+mFoJF7lTRwCpTOLPpHxEg1PmeSqGm6BXLvbH11w/if11K/PPH2a3aE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=KfFgUam2; 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="KfFgUam2" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9FB2AC4CEE5; Tue, 8 Apr 2025 11:38:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1744112318; bh=BMUL5tDa1XoSLiWfA0CnTE/QA94csEdZVjrzmm0GFf8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KfFgUam2WI4P9ZYywQLurdvtvvpqnFi3GpiqiiEyEk2r2FkAxKQBgv+qoQIRkEuUH l8JMfOsAOWnGMNmEtUoIceSy1cpKLDsj2ojew4R1ngwuP8c6ZI0wxW9MsIVosWj6HX OPpwsdpaxtEU17k0oOF5LMds1juKZVG7nfOvfXBo= 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 5.15 024/279] nvme-fc: go straight to connecting state when initializing Date: Tue, 8 Apr 2025 12:46:47 +0200 Message-ID: <20250408104827.036394180@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250408104826.319283234@linuxfoundation.org> References: <20250408104826.319283234@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-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 8dfd317509aa6..ebe8c2f147a33 100644 --- a/drivers/nvme/host/fc.c +++ b/drivers/nvme/host/fc.c @@ -3547,8 +3547,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