From nobody Tue Dec 2 00:05:23 2025 Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8144A30C612 for ; Wed, 26 Nov 2025 02:13:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764123210; cv=none; b=ovioQ1yuOOcFRdRBB3QiD3Q/HHceKI4ay2PpI0tZhcDLDyCugKztEs44o7jLiUal19IyrHH3YDJLaeG7kjkgrCHK3Wf2+RruVOPsdeofShGQBIPMHiWUUWkZ747gZyvaAWsU2CBAQLConKaWa78rYMmHmwGfj6yc477qn+5idY8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764123210; c=relaxed/simple; bh=gXOjvEboseVtId1uagQgyDPNgelSyKfuK1gcsS48IXk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=g/T/BZhxah2x6Rqdyop8JFnn2+66RwSS4LhbogUf3ktNMnI3VaD59sOIdMKNdHF4BZ1ZFXCTmyblWfKsZ7jCM8viSFQmWSkSYqcNUtL0S80LW2KDc4wBWTu+d9Ij6kPqRjTwaf3p0Ij2MBhHKPJ3xTCxPz8ZRykG1fbsOBgrvY4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=purestorage.com; spf=fail smtp.mailfrom=purestorage.com; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b=J0y4lwFM; arc=none smtp.client-ip=209.85.214.169 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=purestorage.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=purestorage.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b="J0y4lwFM" Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-2984dfae0acso96959015ad.0 for ; Tue, 25 Nov 2025 18:13:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1764123208; x=1764728008; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+I4ImapQBrzyuEizr600XxZNr5XxxSLizDI0ARnZn/M=; b=J0y4lwFM/eYMcnGf7KiI+UYi6qtlpyowdMIYPFdB6rLM+q+xApWVuHFmpW8/0UyMxe uxGSKbSLfqASvM1MBbe88mlq2tqnZ/Ps/RgZpM7Yn/ZOLQl4A7wAufRC1AcTCl7i45N9 XYVHLJwQGQ/pdYZrdPe5J8shkeFn6lImHkSQJkVT5v9k4PguP+Y5ROy5TqkIfemJjYcf C/p7kw7CVCDbcx/Dk181t4lN8OA1LFd62T5r5pZwQkV6YqrrlM+4IZ0aLS7wxuJcx+kO INJMKNoJWEnJ6lQOZaKRArw3xR6t+YwwBY1MtEvJvsrDYaf9FNEfmSaeP3KDB/ssNlei FrKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764123208; x=1764728008; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=+I4ImapQBrzyuEizr600XxZNr5XxxSLizDI0ARnZn/M=; b=Iu1OCerMbCsnPLTKWZGGZFWi3kdghnFOtGs7kwZKktzD0dQEC1Fpc1hqkr7vH84BXL HmozC380IvNR4jvuqnSPyAwiDzY1qmRTdA+5kqU4nOACid4F99nVc+yaZEsFWNbF+gcC PnY9DQ0g2Hyf52jJNJCCvb9Fgtz7f9GKRxVIeHMK8U4yeCSVJeoDWxBgfc0KvrF3ue0e SWyanmqfrgKv4VTdjQcV2e7PYHm8NvBzd46i6dllAibjusKOPNLulJg2//p2WcsB39V7 8+AYV9BNijWgXdZTV5/hKRAYIUsi95/iiJR7FbDMkDR6BFdUDnFKNccl83BPQGWx2Z/0 jESQ== X-Forwarded-Encrypted: i=1; AJvYcCVfcYU8dFyVBvrUz+Xmmkc89Kbh9E8honBLrOnFv8Y01ZkARTkqt3OuTvND+TfuaAeyW4k6CM45EAY34to=@vger.kernel.org X-Gm-Message-State: AOJu0YwUxJuRD+Ev9AYXHGPKVIhQkgRbp/Ef3XL2WeH8NSkMXi9KCjXB rLVEyFlBzvhbH9OVP5GuoWj/r2efCKG3dQ+IH3ELmCZzVVRccVqTsbA9OfKygzAVLwk= X-Gm-Gg: ASbGncsriX+VP6nFy8N8LSeVqixnt3OuFLZzMLKBMuhM/8/I7nN+614mXpAHu0JnVRv k8BLkxBIpLqrrrxi5s7MrUNlMNvmLDiowhLOqVcRHuKxkceho04nmzM66X6HQ9Fphchh0hWaEnO EA+enFjnw91SAwE8mG17KHUe36PO6ozruikUMWsCH/qnmjRPFTXadTRaGBMGR9X3FeVO0AjNIGA U9h2noRHEyQhIM4kaKMnHTtNCt2a9hIqQ7lUrIaGDdk7nM07vv0aNdk4mV8vICZKntS9etVZZCr bMxphQsu6ZGLcaM6r6Bl9Q6dqKNUvyqvdwMy1mPp7SpjO+jo6Cj+GfPAAenJ+MtCJoPXVpr+ZiO 6P+/JEBSsnCTF2yT25Lp7//wSl1ihwLkkWhtgHMlCT5FYUOngZWNZ1Dx9Rb0cJzwj4n3yjLrqHD HI8okoKx8dSHi+OxqD+YfS0OTaCnKJEQlDwg== X-Google-Smtp-Source: AGHT+IFUalrTLmoXcAJDo3arJsqQ+UxGMbo4/XplRRBL96NzTQ9qPQ+9cU3UaRbqugcq/gua0Spoww== X-Received: by 2002:a05:7022:3d08:b0:11b:9386:7ecf with SMTP id a92af1059eb24-11cbba59308mr4282110c88.44.1764123207411; Tue, 25 Nov 2025 18:13:27 -0800 (PST) Received: from apollo.purestorage.com ([208.88.152.253]) by smtp.googlemail.com with ESMTPSA id a92af1059eb24-11cc631c236sm17922979c88.7.2025.11.25.18.13.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Nov 2025 18:13:27 -0800 (PST) From: Mohamed Khalfella To: Chaitanya Kulkarni , Christoph Hellwig , Jens Axboe , Keith Busch , Sagi Grimberg Cc: Aaron Dailey , Randy Jennings , John Meneghini , Hannes Reinecke , linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org, Mohamed Khalfella Subject: [RFC PATCH 07/14] nvme: Add RECOVERING nvme controller state Date: Tue, 25 Nov 2025 18:11:54 -0800 Message-ID: <20251126021250.2583630-8-mkhalfella@purestorage.com> X-Mailer: git-send-email 2.51.2 In-Reply-To: <20251126021250.2583630-1-mkhalfella@purestorage.com> References: <20251126021250.2583630-1-mkhalfella@purestorage.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add NVME_CTRL_RECOVERING as a new controller state to be used when impacted controller is being recovered. A LIVE controller enters RECOVERING state when an IO error is encountered. While recovering inflight IOs will not be canceled if they timeout. These IOs will be canceled after recovery finishes. Also, while recovering a controller can not be reset or deleted. This is intentional because reset or delete will result in canceling inflight IOs. When recovery finishes, the impacted controller transitions from RECOVERING state to RESETTING state. Reset codepath takes care of queues teardown and inflight requests cancellation. Note, there is no transition from RECOVERING to RESETTING added to nvme_change_ctrl_state(). The reason is that user should not be allowed to reset or delete a controller that is being recovered. Add NVME_CTRL_RECOVERED controller flag. This flag is set on a controller about to schedule delayed work for time based recovery. Signed-off-by: Mohamed Khalfella --- drivers/nvme/host/core.c | 10 ++++++++++ drivers/nvme/host/nvme.h | 2 ++ drivers/nvme/host/sysfs.c | 1 + 3 files changed, 13 insertions(+) diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index aa007a7b9606..f5b84bc327d3 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -574,6 +574,15 @@ bool nvme_change_ctrl_state(struct nvme_ctrl *ctrl, break; } break; + case NVME_CTRL_RECOVERING: + switch (old_state) { + case NVME_CTRL_LIVE: + changed =3D true; + fallthrough; + default: + break; + } + break; case NVME_CTRL_RESETTING: switch (old_state) { case NVME_CTRL_NEW: @@ -761,6 +770,7 @@ blk_status_t nvme_fail_nonready_command(struct nvme_ctr= l *ctrl, if (state !=3D NVME_CTRL_DELETING_NOIO && state !=3D NVME_CTRL_DELETING && state !=3D NVME_CTRL_DEAD && + state !=3D NVME_CTRL_RECOVERING && !test_bit(NVME_CTRL_FAILFAST_EXPIRED, &ctrl->flags) && !blk_noretry_request(rq) && !(rq->cmd_flags & REQ_NVME_MPATH)) return BLK_STS_RESOURCE; diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h index 5195a9abfadf..cde427353e0a 100644 --- a/drivers/nvme/host/nvme.h +++ b/drivers/nvme/host/nvme.h @@ -251,6 +251,7 @@ static inline u16 nvme_req_qid(struct request *req) enum nvme_ctrl_state { NVME_CTRL_NEW, NVME_CTRL_LIVE, + NVME_CTRL_RECOVERING, NVME_CTRL_RESETTING, NVME_CTRL_CONNECTING, NVME_CTRL_DELETING, @@ -275,6 +276,7 @@ enum nvme_ctrl_flags { NVME_CTRL_SKIP_ID_CNS_CS =3D 4, NVME_CTRL_DIRTY_CAPABILITY =3D 5, NVME_CTRL_FROZEN =3D 6, + NVME_CTRL_RECOVERED =3D 7, }; =20 struct nvme_ctrl { diff --git a/drivers/nvme/host/sysfs.c b/drivers/nvme/host/sysfs.c index ae36249ad61e..55f907fb6c86 100644 --- a/drivers/nvme/host/sysfs.c +++ b/drivers/nvme/host/sysfs.c @@ -443,6 +443,7 @@ static ssize_t nvme_sysfs_show_state(struct device *dev, static const char *const state_name[] =3D { [NVME_CTRL_NEW] =3D "new", [NVME_CTRL_LIVE] =3D "live", + [NVME_CTRL_RECOVERING] =3D "recovering", [NVME_CTRL_RESETTING] =3D "resetting", [NVME_CTRL_CONNECTING] =3D "connecting", [NVME_CTRL_DELETING] =3D "deleting", --=20 2.51.2