From nobody Mon Oct 19 06:24:37 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4j7QWB00ymz6vsXB for ; Mon, 19 Oct 2026 06:24:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4j7QW9522wz3PTg for ; Mon, 19 Oct 2026 06:24:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792391077; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0jjSIfRXZEO0YljazUPRheJOvLjT4ThAjN/+zeJmutk=; b=Ocbn8nKyJzCBkmOr/47BD/LnZa+hJJQjLNDNtov3rFHu5ywiHONf1POvW78ztJ8q6HExJh 6TxY6u2HB0jrXFciRiYWJr2hwuHkWarVwGt2D5I6gIW5hKb2rN0kjkHWoVf5fv0jyiZIyG mJQhIBv8aBB2cLu0qGNZmYP5+vOjVAsVBb7ZVONNMdXVUzh73BLg0Ezm08LapnF/+NXWAV Xe64fXzZVx1nXICj1gEXva7/vxmjV8n/EoNGFipyKlADMYw9k2J36ehWArM2ali+cdiP/v m35DG9q9fqOpmRYmJ3BbV7RLL7v/viPKY3QDAcC+Lx/ZY+Yw2Kjp0dDSaT3kbA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1792391077; b=Uy39TheQLQcskjtg55laqoB9dEt/LV1xI24j7F01QzaGURSmQCqbs3ATfBln5DERvB2XQ6 /DMgNP8TG6NKLr1FWXPs22MxF/N83Z+zUw0KP5XxPY3SDRc+gRemxkO8DiXLMisCRfzlzO G6bkz+fn2eF7viqhghU+lesm4ePX4JGrYLipjHTBTvcJdd7DtrdpenEYK8qLAdFMp7OjlA gVA9+eYYC/ybJ6Ody6DfRB/n4uowtJI4ByDaPg2rkfe+NZgVP8v070j2nd14p920GK/NuK VXwgPfWGJLEDZp0HW5d6hfToDHg1/TQQ4kr3BFqqzpuwhMPjTi6bBZRC+3zxfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792391077; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0jjSIfRXZEO0YljazUPRheJOvLjT4ThAjN/+zeJmutk=; b=UH6lT5hyBi+zVRJBhZVpv65mSnyU8FbqqUfgMuDeif/aASnvrPMZr+T796ELI3gPyy95Z2 l+qpy0X3yPjxeylR5EjquxVRhtMXmJo5Z39ooLt7oupTQswiRNCoN3xb5kWSMUBehu73XE k7nzfm2Y3sw3VCJ/42x8E/NqrXPV6QmeRoU0dpMezTYpgg5Fycx7qsO6rRg9E0l0pEhy5T DsOWHqi82vDGdPa8KQKY0VFpvzZDxT1nkx7gs6lv99xoLIu5uURFBMJEfsN35qO1ud+MpY cIjZB4fXeFnaZUJfG156HYtwYVuHy7zrZbCddh5DgT1DHXzEvoeQrf4TPQs8mQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4j7QW93sXVz1MXy for ; Mon, 19 Oct 2026 06:24:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33508 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 19 Oct 2026 06:24:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 15cd8528b196 - main - nvme: honor Linux passthrough command timeouts List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: Commit messages for the main branch of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 15cd8528b1964e646ed8d2282c42f5fe00b72ed2 Auto-Submitted: auto-generated Date: Mon, 19 Oct 2026 06:24:37 +0000 Message-Id: <6ad5b7a5.33508.5ee10908@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=15cd8528b1964e646ed8d2282c42f5fe00b72ed2 commit 15cd8528b1964e646ed8d2282c42f5fe00b72ed2 Author: Warner Losh AuthorDate: 2026-10-19 04:39:16 +0000 Commit: Warner Losh 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