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 05B961D5AB2; Wed, 19 Mar 2025 14:37:14 +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=1742395035; cv=none; b=ONG9XvZPy1Y5ptHe6U/AkGi3XQ2N5/04cJknkJuAj6V3qTlSBrvqhlenkVEQsaImVjUx2o9A0rVQkKMU+lJKnA4upR65JyUVD05iS9OgICmnKD5hVKypJdonM6sXBylyJdgDsDCHcJg32KZfjFAZQSQOEsBlkecKRcpF2gxfsHk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742395035; c=relaxed/simple; bh=gScPToxdNtI84tjlJHMojcm8hMwb3UT1D/3MWvcfk30=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=On68IsO0BPo4ptgcYdaYyIBf8+CFGrQg8x62bsVE5SC6YEF+EhPWv510eShwouNJ2OxH4wOXYYhXyR2wKyNpDkXP394tTs19JZq3MI1DqOrw5LJ1yBtBv8hbJuNh+jAY4prG/yIJMB1yZIZonZlHK7+rd7IVGTRgbK1VTTfT8hQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=oVxflK/g; 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="oVxflK/g" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 69E6EC4CEEA; Wed, 19 Mar 2025 14:37:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1742395034; bh=gScPToxdNtI84tjlJHMojcm8hMwb3UT1D/3MWvcfk30=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oVxflK/gHibZDE75CKfaFobEeM8vjeJU7vaNoRnLECf6EAcyKsjtOCCd6/eD7VZ3x nNsi9HPFxNr+IH9ASaslM7HlvGzIBnpf6RZEhgm7jLQbW9A+3XIKah//b4qid53/Ch whhx7bM5G5bd8NbP92bj/QK9Mc8IqDM1aEVqtn9I= 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.12 056/231] nvme-fc: go straight to connecting state when initializing Date: Wed, 19 Mar 2025 07:29:09 -0700 Message-ID: <20250319143028.207583118@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250319143026.865956961@linuxfoundation.org> References: <20250319143026.865956961@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 6.12-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 682234da2fabe..a458d939ab662 100644 --- a/drivers/nvme/host/fc.c +++ b/drivers/nvme/host/fc.c @@ -3582,8 +3582,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