From nobody Mon Nov 09 03:14:23 2026 X-Original-To: dev-commits-src-all@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 4jNFHz3jZRz70SXb for ; Mon, 09 Nov 2026 03:14:23 +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 4jNFHz0mSTz3GMs for ; Mon, 09 Nov 2026 03:14:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794194063; 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=xz0H8seBWF2xYX45dWM97028niv6CMLvMlcRBcrxLXA=; b=wzRsS/scWvJt79UrI+lnG+/u+FDQyR0cK+ng8OWfBbaWZJF0IiDfkZT6Ox3GHvPlnGRFXY FSqL3KsI4Ixi+kC3P0a+5bt82GDXHb4Iank/MV4P1H1d8GkLwVystx0wfTsPiOvr+cmGUx +oR+W1I0g2dKnlVJ5rPu3RdPlI0XW76NXVKuQCToH/BBuliBfC4QTCn2KappLNLtUrVy+M PDvGglz8kUHst56kMv7OO76Q7IZuq0td13e8CQqMm6IUccbWG+XKRJAFQS+KyG5mLmeDRJ TV3rfK6djYpViPbFxXvNcYJJBk5opfUrwsRG82oLqpDtmn7/uVYY3BFEJ2jzaw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794194063; b=JRIjR3X32SKwSidqQl7PV5D54ieNtwYBFQc+D54ZIvXMMTaiGMS20B8O5dLBCNV5qo880s SYUiyVrQU7Z45tYJoDAET4wtHEU4aWL44BFOYfyWlHm782zTVG8/wXZX8fQrc7RMjbYMxP FS2iqfqA4nYu0gSItoCz8Vl00mpDbJXM94EX+UnD4iXbsmowleh/M8CLZKtMeu/fFz/JXS GWlCg4eJJYTkQaZl1z8NgQsNxZULAhL3xQ0LDpUP4q6z0bzRyodYjwnQF8K4LZYhC6NK7P +PpONzGhK9d82otd/YhcyQF0Fy6K3pYjltoS0K+2iwpaGLQZ30AEPdwnzj60Bg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794194063; 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=xz0H8seBWF2xYX45dWM97028niv6CMLvMlcRBcrxLXA=; b=PIoNoahkFLBY9PiIdiFb6Ge8XqH5dPvMRgdY6SSWcXlTH0yLPy93J6hb9yCXswFyjRY8NY 9BK7/I0ycopSM1V5+3o/zOPZqqCI9j+RSaFFx9rNZ6xoAZtKhW3CBCT6QbsEI4LkMW6O2n QddlR6fZ2yK1DCknaqiv3dq5dETVGV4AeZv6uM8gYNlx+L0xFULoLWgisMzimaM+R6KYmV YEoTeIu7pJBGnZlMENA7d2oNepeFS3NfbMVBCp8LKRHgyFsEvL+hLHxFDQjEwxtaOIyuJG iMDJhjtvX6zaz9QU0pnWV3yPxDPBEtsUzxXMdItw7PCrSgO/05CNsHe+Rqz86Q== 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 4jNFHz0RdlzKkn for ; Mon, 09 Nov 2026 03:14:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 10b8c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Nov 2026 03:14:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 601d2a9a31d1 - stable/14 - virtio_random: stop on detach, don't poll List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 601d2a9a31d1a6253673551e403e7e4c84a6be67 Auto-Submitted: auto-generated Date: Mon, 09 Nov 2026 03:14:23 +0000 Message-Id: <6af13a8f.10b8c.7ed37823@gitrepo.freebsd.org> The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=601d2a9a31d1a6253673551e403e7e4c84a6be67 commit 601d2a9a31d1a6253673551e403e7e4c84a6be67 Author: Kyle Evans AuthorDate: 2026-11-04 21:31:31 +0000 Commit: Kyle Evans CommitDate: 2026-11-09 03:14:12 +0000 virtio_random: stop on detach, don't poll If the device is hung, then polling will block the detach and hang us. Stop it and drain the queue instead. This fixes a hang on detach in some circumstances without the upcoming virtio_pci_modern fix. Reviewed by: bnovkov, kfv Sponsored by: Stormshield Sponsored by: Klara, Inc. (cherry picked from commit cce522853aae3da45b131c2522dd2510edf083e7) --- sys/dev/virtio/random/virtio_random.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/sys/dev/virtio/random/virtio_random.c b/sys/dev/virtio/random/virtio_random.c index 86c8b52444ec..0cffcc3962e6 100644 --- a/sys/dev/virtio/random/virtio_random.c +++ b/sys/dev/virtio/random/virtio_random.c @@ -202,7 +202,7 @@ static int vtrnd_detach(device_t dev) { struct vtrnd_softc *sc; - uint32_t rdlen; + int last; sc = device_get_softc(dev); KASSERT( @@ -216,8 +216,14 @@ vtrnd_detach(device_t dev) } random_source_deregister(&random_vtrnd); - /* clear the queue */ - virtqueue_poll(sc->vtrnd_vq, &rdlen); + /* + * Just reset the device; if it's hanging, for some reason, then polling + * may put us in a bad position. + */ + virtio_stop(dev); + last = 0; + while (virtqueue_drain(sc->vtrnd_vq, &last) != NULL) + ; atomic_store_explicit(&g_vtrnd_softc, NULL, memory_order_release); sglist_free(sc->vtrnd_sg);