From: Hannes Reinecke <hare@suse.de>
To: Christoph Hellwig <hch@lst.de>
Cc: Sagi Grimberg <sagi@grimberg.me>, Keith Busch <kbusch@kernel.org>,
linux-nvme@lists.infradead.org, Daniel Wagner <dwagner@suse.de>,
Hannes Reinecke <hare@suse.de>
Subject: [PATCH 3/3] nvme-tcp: send quota for nvme_tcp_send_all()
Date: Thu, 19 May 2022 08:26:17 +0200 [thread overview]
Message-ID: <20220519062617.39715-4-hare@suse.de> (raw)
In-Reply-To: <20220519062617.39715-1-hare@suse.de>
From: Daniel Wagner <dwagner@suse.de>
Add a send quota in nvme_tcp_send_all() to avoid stalls when sending
large amounts of requests.
Signed-off-by: Daniel Wagner <dwagner@suse.de>
Signed-off-by: Hannes Reinecke <hare@suse.de>
---
drivers/nvme/host/tcp.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c
index 606565a4c708..87d760dfa3a9 100644
--- a/drivers/nvme/host/tcp.c
+++ b/drivers/nvme/host/tcp.c
@@ -308,11 +308,12 @@ static inline void nvme_tcp_advance_req(struct nvme_tcp_request *req,
static inline void nvme_tcp_send_all(struct nvme_tcp_queue *queue)
{
int ret;
+ unsigned long deadline = jiffies + msecs_to_jiffies(1);
/* drain the send queue as much as we can... */
do {
ret = nvme_tcp_try_send(queue);
- } while (ret > 0);
+ } while (ret > 0 || !time_after(jiffies, deadline));
}
static inline bool nvme_tcp_queue_more(struct nvme_tcp_queue *queue)
--
2.29.2
next prev parent reply other threads:[~2022-05-19 6:26 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-19 6:26 [PATCH 0/3] nvme-tcp: queue stalls under high load Hannes Reinecke
2022-05-19 6:26 ` [PATCH 1/3] nvme-tcp: spurious I/O timeout " Hannes Reinecke
2022-05-20 9:05 ` Sagi Grimberg
2022-05-23 8:42 ` Hannes Reinecke
2022-05-23 13:36 ` Sagi Grimberg
2022-05-23 14:01 ` Hannes Reinecke
2022-05-23 15:05 ` Sagi Grimberg
2022-05-23 16:07 ` Hannes Reinecke
2022-05-24 7:57 ` Sagi Grimberg
2022-05-24 8:08 ` Hannes Reinecke
2022-05-24 8:53 ` Sagi Grimberg
2022-05-24 9:34 ` Hannes Reinecke
2022-05-24 9:58 ` Sagi Grimberg
2022-05-19 6:26 ` [PATCH 2/3] nvme-tcp: Check for write space before queueing requests Hannes Reinecke
2022-05-20 9:17 ` Sagi Grimberg
2022-05-20 10:05 ` Hannes Reinecke
2022-05-21 20:01 ` Sagi Grimberg
2022-05-19 6:26 ` Hannes Reinecke [this message]
2022-05-20 9:19 ` [PATCH 3/3] nvme-tcp: send quota for nvme_tcp_send_all() Sagi Grimberg
2022-05-20 9:59 ` Hannes Reinecke
2022-05-21 20:02 ` Sagi Grimberg
2022-05-20 9:20 ` [PATCH 0/3] nvme-tcp: queue stalls under high load Sagi Grimberg
2022-05-20 10:01 ` Hannes Reinecke
2022-05-21 20:03 ` Sagi Grimberg
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=20220519062617.39715-4-hare@suse.de \
--to=hare@suse.de \
--cc=dwagner@suse.de \
--cc=hch@lst.de \
--cc=kbusch@kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=sagi@grimberg.me \
/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).