From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Uday Shankar <ushankar@purestorage.com>,
Costa Sapuntzakis <costa@purestorage.com>,
Randy Jennings <randyj@purestorage.com>,
Hannes Reinecke <hare@suse.de>, Sagi Grimberg <sagi@grimberg.me>,
Christoph Hellwig <hch@lst.de>, Keith Busch <kbusch@kernel.org>,
Sasha Levin <sashal@kernel.org>,
linux-nvme@lists.infradead.org
Subject: [PATCH AUTOSEL 6.1 13/16] nvme: double KA polling frequency to avoid KATO with TBKAS on
Date: Thu, 15 Jun 2023 07:38:13 -0400 [thread overview]
Message-ID: <20230615113816.649135-13-sashal@kernel.org> (raw)
In-Reply-To: <20230615113816.649135-1-sashal@kernel.org>
From: Uday Shankar <ushankar@purestorage.com>
[ Upstream commit ea4d453b9ec9ea279c39744cd0ecb47ef48ede35 ]
With TBKAS on, the completion of one command can defer sending a
keep alive for up to twice the delay between successive runs of
nvme_keep_alive_work. The current delay of KATO / 2 thus makes it
possible for one command to defer sending a keep alive for up to
KATO, which can result in the controller detecting a KATO. The following
trace demonstrates the issue, taking KATO = 8 for simplicity:
1. t = 0: run nvme_keep_alive_work, no keep-alive sent
2. t = ε: I/O completion seen, set comp_seen = true
3. t = 4: run nvme_keep_alive_work, see comp_seen == true,
skip sending keep-alive, set comp_seen = false
4. t = 8: run nvme_keep_alive_work, see comp_seen == false,
send a keep-alive command.
Here, there is a delay of 8 - ε between receiving a command completion
and sending the next command. With ε small, the controller is likely to
detect a keep alive timeout.
Fix this by running nvme_keep_alive_work with a delay of KATO / 4
whenever TBKAS is on. Going through the above trace now gives us a
worst-case delay of 4 - ε, which is in line with the recommendation of
sending a command every KATO / 2 in the NVMe specification.
Reported-by: Costa Sapuntzakis <costa@purestorage.com>
Reported-by: Randy Jennings <randyj@purestorage.com>
Signed-off-by: Uday Shankar <ushankar@purestorage.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Keith Busch <kbusch@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/nvme/host/core.c | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index f502e032e7e46..50a83306bea7b 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -1198,9 +1198,25 @@ EXPORT_SYMBOL_NS_GPL(nvme_execute_passthru_rq, NVME_TARGET_PASSTHRU);
* The host should send Keep Alive commands at half of the Keep Alive Timeout
* accounting for transport roundtrip times [..].
*/
+static unsigned long nvme_keep_alive_work_period(struct nvme_ctrl *ctrl)
+{
+ unsigned long delay = ctrl->kato * HZ / 2;
+
+ /*
+ * When using Traffic Based Keep Alive, we need to run
+ * nvme_keep_alive_work at twice the normal frequency, as one
+ * command completion can postpone sending a keep alive command
+ * by up to twice the delay between runs.
+ */
+ if (ctrl->ctratt & NVME_CTRL_ATTR_TBKAS)
+ delay /= 2;
+ return delay;
+}
+
static void nvme_queue_keep_alive_work(struct nvme_ctrl *ctrl)
{
- queue_delayed_work(nvme_wq, &ctrl->ka_work, ctrl->kato * HZ / 2);
+ queue_delayed_work(nvme_wq, &ctrl->ka_work,
+ nvme_keep_alive_work_period(ctrl));
}
static enum rq_end_io_ret nvme_keep_alive_end_io(struct request *rq,
--
2.39.2
next prev parent reply other threads:[~2023-06-15 11:41 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-15 11:38 [PATCH AUTOSEL 6.1 01/16] regmap: Account for register length when chunking Sasha Levin
2023-06-15 11:38 ` [PATCH AUTOSEL 6.1 02/16] iommu/amd: Handle GALog overflows Sasha Levin
2023-06-15 11:38 ` [PATCH AUTOSEL 6.1 03/16] scsi: target: iscsi: Prevent login threads from racing between each other Sasha Levin
2023-06-15 11:38 ` [PATCH AUTOSEL 6.1 04/16] HID: google: add jewel USB id Sasha Levin
2023-06-15 11:38 ` [PATCH AUTOSEL 6.1 05/16] HID: wacom: Add error check to wacom_parse_and_register() Sasha Levin
2023-06-15 11:38 ` [PATCH AUTOSEL 6.1 06/16] arm64: Add missing Set/Way CMO encodings Sasha Levin
2023-06-15 11:38 ` [PATCH AUTOSEL 6.1 07/16] smb3: missing null check in SMB2_change_notify Sasha Levin
2023-06-16 19:39 ` Pavel Machek
2023-06-20 14:44 ` Sasha Levin
2023-06-15 11:38 ` [PATCH AUTOSEL 6.1 08/16] media: cec: core: disable adapter in cec_devnode_unregister Sasha Levin
2023-06-15 11:38 ` [PATCH AUTOSEL 6.1 09/16] media: cec: core: don't set last_initiator if tx in progress Sasha Levin
2023-06-15 11:38 ` [PATCH AUTOSEL 6.1 10/16] nfcsim.c: Fix error checking for debugfs_create_dir Sasha Levin
2023-06-15 11:38 ` [PATCH AUTOSEL 6.1 11/16] btrfs: fix an uninitialized variable warning in btrfs_log_inode Sasha Levin
2023-06-15 11:38 ` [PATCH AUTOSEL 6.1 12/16] usb: gadget: udc: fix NULL dereference in remove() Sasha Levin
2023-06-15 11:38 ` Sasha Levin [this message]
2023-06-15 11:38 ` [PATCH AUTOSEL 6.1 14/16] nvme: check IO start time when deciding to defer KA Sasha Levin
2023-06-15 11:38 ` [PATCH AUTOSEL 6.1 15/16] ext4: enable the lazy init thread when remounting read/write Sasha Levin
2023-06-15 11:38 ` [PATCH AUTOSEL 6.1 16/16] nvme: improve handling of long keep alives Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230615113816.649135-13-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=costa@purestorage.com \
--cc=hare@suse.de \
--cc=hch@lst.de \
--cc=kbusch@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=randyj@purestorage.com \
--cc=sagi@grimberg.me \
--cc=stable@vger.kernel.org \
--cc=ushankar@purestorage.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).