From nobody Thu Apr 2 23:54:50 2026 Received: from mail-dl1-f54.google.com (mail-dl1-f54.google.com [74.125.82.54]) (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 7C9252BF006 for ; Sat, 14 Feb 2026 04:28:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771043327; cv=none; b=UT/xoZ6KmNs0CazInA5PhDM/9Y741e1aqEtFoPka6m4I+lu9KOw8ZLPS+3H70u0Hsu1Z9TvfdMWjqw7qxqPWZyDn2NxBKQwHnYry2LbJBbeo/zEV8ZdnYF2x5YyrL+PTXwK3rIM1JimbkrjtTum9fNS7+gQl+jMPCtiY6/a+3pM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771043327; c=relaxed/simple; bh=EOwrQrtPcAy4jDPFHyG9KNm/GPE7Fp++z4SJI2Vx0j4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iFKvwRpdOCe6dVJUFvpoApQxb9N8Ph7s+gl2qD5DN35Vk6hgvaStDaqQLo8XT3q6U9wjJQYiiQdP5i5JoAze+kMCV3jyurX6qXzXGa7n6AzbIfwWGGSYDlJB5/RMnwNJzI0YgUYQN1YAAjPR+2dkNPR7pyePLvfj7Ei1cfuaDTQ= 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=Q1Iu+/4O; arc=none smtp.client-ip=74.125.82.54 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="Q1Iu+/4O" Received: by mail-dl1-f54.google.com with SMTP id a92af1059eb24-12721cd256bso2118884c88.1 for ; Fri, 13 Feb 2026 20:28:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1771043316; x=1771648116; 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=G5ZA7/tV4zDqNdP5WkUsqXWJkCvvpgg6msvp7dtPWuI=; b=Q1Iu+/4OYVyoCZnXk1WIwRaKUwsmeRnyk6+brb3Q7yFKGfqpcdr/Xxe3GauytfghbF yqwJYRyFPcRqoxkBRb8aY7ouiYheFcg4/hoOjLruKHKF96LiuGNkRbyCm+susjMKZI8X 6FwJ4x0SP+yu8HXX4EO0fq/z6UTXYbCw3aYGBgxIit1iUE2K1fGT1s1Vvlqyyb58saFO 0DU8B2wLbsen7x7/VgKOuzhOk98RrJ6XKO5tKNRGKL4v+qWzEVdqnW5SOswfoq9mjmM8 9oddz38UD12oqyT94upbluwMhi1dSHQepENKxjTSieWMsbjNGhr0ZX4W/GGXwkSAtPnY NWIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771043316; x=1771648116; 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=G5ZA7/tV4zDqNdP5WkUsqXWJkCvvpgg6msvp7dtPWuI=; b=Gbs5bS0p19CGoMf3BLfIpBtS2O4dEGYzd1I7XLxlW6FQ0ZCIndDM8uq0mkf0JTrteu V9GD9hjHoRcm7iW5TPh7Ra8QT/hwPMW2vqQgtcUFxw0WoMEHw/YXK4Jwe/QFOe6kWGMB 0E1tDRtW2AboNgxtvMasmTwHR8lKCoCXNFV4HWY8mbHUIt/qE5+MSo6wsUkH9zsZHF7w krN9ns2d5SV6sE2veJda4jmkQJ7S79SebhGzVG1fEHF4UVmF4zrwgCkY/OHdNLABHNNe LIVxfRFjwFqAoNONvtRoLknoLLgOQsuo66/2I10ms3holZp1d1WrWxFJL5QqYgs+obqi 5TAg== X-Forwarded-Encrypted: i=1; AJvYcCVHiU/n8dxxNbHDjZ2SnctwGVHi5cpdmt77llduHjMZq85A5Oc2IpP73qOwoiXx/Tf0WpHZaR1A8QxMUBw=@vger.kernel.org X-Gm-Message-State: AOJu0YwLmF2Eb/0biFYUJ+8ZtEn2G2NYJLWemk7s/VpQWAeEUDTXRNW2 vpIp5zbtnQrMl+WYojYw3FO7QzFsOiNuqQkoTQ/FVJW1q8WXwjUVywpvClMz1ASjZBU= X-Gm-Gg: AZuq6aIYEuCTQ1h+aGLelWUeEklVh4gQLYhFZMesf8g0eSLk/ij13Stk+HE1wnpc4U9 BA/VY0yM53kcsrcqV7r8rDAIWGqyeIXkPpdP0A0R1CpFQRPhvx7sZzf5yfRUudpfACqmzDOdpav DXB3dPQb3N9vrDiRgI2cSBL8DwLWIRZfh47pruhMj7x6e6JsaGDoDoI6S7oeD9YCJ1uQykArnR2 o9luDlyeHx8Gc2Vq23Xcr+2DrhY1XGJ0lEzOCeMfn6vIH739uvo1yqHsVUdXJC6CA0ORbyA7GZK Y3qluI1wFM8JY87YZZM+Gbq6SJSHs+lwe/aBITCBGkjsRLub0OWFyif3wlze4wEyGlEEk/1Mrmr nt3V8kEvxZuBSUb4c7To+DnOr28InG6EzuKT5aB7iCEvgm3D3tmlDQCGyLhFQ2Xru7b6YUOMifG 3O8qkJa+IQMcNYTxMfPiOC1XXM5sPmbQ+FkO5hnsPBoKAPoA== X-Received: by 2002:a05:7022:662c:b0:11a:4ffb:9849 with SMTP id a92af1059eb24-12741b925d5mr742340c88.21.1771043315759; Fri, 13 Feb 2026 20:28:35 -0800 (PST) Received: from apollo.purestorage.com ([208.88.152.253]) by smtp.googlemail.com with ESMTPSA id a92af1059eb24-12742cbc900sm1021042c88.14.2026.02.13.20.28.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Feb 2026 20:28:35 -0800 (PST) From: Mohamed Khalfella To: Justin Tee , Naresh Gottumukkala , Paul Ely , Chaitanya Kulkarni , Christoph Hellwig , Jens Axboe , Keith Busch , Sagi Grimberg , James Smart , Hannes Reinecke Cc: Aaron Dailey , Randy Jennings , Dhaval Giani , linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org, Mohamed Khalfella Subject: [PATCH v3 18/21] nvme: Update CCR completion wait timeout to consider CQT Date: Fri, 13 Feb 2026 20:25:19 -0800 Message-ID: <20260214042753.4073668-19-mkhalfella@purestorage.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260214042753.4073668-1-mkhalfella@purestorage.com> References: <20260214042753.4073668-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" TP8028 Rapid Path Failure Recovery does not define how much time the host should wait for CCR operation to complete. It is reasonable to assume that CCR operation can take up to ctrl->cqt. Update wait time for CCR operation to be max(ctrl->cqt, ctrl->kato). Signed-off-by: Mohamed Khalfella --- drivers/nvme/host/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 0680d05900c1..ff479c0263ab 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -631,7 +631,7 @@ static int nvme_issue_wait_ccr(struct nvme_ctrl *sctrl,= struct nvme_ctrl *ictrl) if (result & 0x01) /* Immediate Reset Successful */ goto out; =20 - tmo =3D secs_to_jiffies(ictrl->kato); + tmo =3D msecs_to_jiffies(max(ictrl->cqt, ictrl->kato * 1000)); if (!wait_for_completion_timeout(&ccr.complete, tmo)) { ret =3D -ETIMEDOUT; goto out; --=20 2.52.0