git: 15cd8528b196 - main - nvme: honor Linux passthrough command timeouts
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 19 Oct 2026 06:24:37 UTC
The branch main has been updated by imp:
URL: https://cgit.FreeBSD.org/src/commit/?id=15cd8528b1964e646ed8d2282c42f5fe00b72ed2
commit 15cd8528b1964e646ed8d2282c42f5fe00b72ed2
Author: Warner Losh <imp@FreeBSD.org>
AuthorDate: 2026-10-19 04:39:16 +0000
Commit: Warner Losh <imp@FreeBSD.org>
CommitDate: 2026-10-19 06:22:50 +0000
nvme: honor Linux passthrough command timeouts
Now that we have per-command timeouts, allow linux-compat ioctls to have
a passed-in timeout.
Reviewed by: seuros, chuck
Differential Revision: https://reviews.freebsd.org/D59829
---
sys/dev/nvme/nvme_ctrlr.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c
index c8c891eaf806..7b2c73c5863b 100644
--- a/sys/dev/nvme/nvme_ctrlr.c
+++ b/sys/dev/nvme/nvme_ctrlr.c
@@ -1679,7 +1679,7 @@ nvme_ctrlr_linux_passthru_cmd(struct nvme_controller *ctrlr,
mtx = mtx_pool_find(mtxpool_sleep, npc);
npc->metadata = (uintptr_t) mtx;
- /* XXX no timeout passed down */
+ req->timeout_ms = npc->timeout_ms;
if (is_admin)
nvme_ctrlr_submit_admin_request(ctrlr, req);
else