From nobody Tue Nov 10 20:51:33 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 4jPJjK3vNtz6vRNm for ; Tue, 10 Nov 2026 20:51:33 +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 4jPJjK3FF4z4HLj for ; Tue, 10 Nov 2026 20:51:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794343893; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jXYL8Xslf2aXQfdiKpiZTtIQnM5M73eJzyYbgLAWqtI=; b=nYftsjKOPgGNN9GxLJC/ope63ih2quSr6b3lFfhZaEFFR8aVFV4uW2PafV75xTXvpYJGq8 6nweIdQBb0dlQhoq7Y0rB53OWZPJwjVqCq3aBxvN4QBzN1hIdrS7d4ovgITrUl1BGsTN6u Q3H6ZTj0Dd8S5k2m+YkCIo4TQ7itVtiJHdf1N6O2SEfkZBm4tDuHtFlpZMDXG0ncQVXUH8 JCgqnAANWRz0w48ithoUr1s+SbfCQNDIPlZ9qOuWR6Ke1V0G8aYa6hyOjR9gBVzASfK+HM +rMq8uWH3CSKdLIrvgfTFhveAgetNxu5OxKoM1mkOPPWY3NQ987ivpd6GoFlfg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794343893; b=IQ92s6VWZ+lzY9OHKkqx6IXDdvN5FkuIBE7VQjfwQZszpOc3pFfet2rad9cguC3aFJlyei zk8zvU2Kic1mrorYW7kLcmD81EX4xt70vM14ODyj3yd3nNphK8JZtV5rcAA7DLj04f+Cbg T82r66nC0KRLchQwBo7eiMPR/1pR+R+a7aGPbbEv4FA4MJ4tLjvObdYSaBZlTl6/KhAf1I 1ZV83mJNUHmJSCQmrwfDcSxsaC4nl0vjg/d+ViwQ4y0osP9zuQJ5IKKBVdItRJ3f1IOYgy sZ2cNMMT7UztNEzUPwGCb5NkI1emllHfyckdUtuc63+iFwHJ/FtgDwTAdjQ9Dg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794343893; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jXYL8Xslf2aXQfdiKpiZTtIQnM5M73eJzyYbgLAWqtI=; b=mcso0UZgRndKqNZn3SL1yGfY7zmBlcoTIE9B8mk7bsSp0Cfa5Vv4Moq4FqxZjBUA3wT7pl lDTl77318gCJ3Wfu+CW4y2j+vP9cbZG+HVOs4D9Q6fwkUuKGB1HbjUKvBRTb+M3QUr2tKt Ez36EctKXpHInDu1pq7bmXFufSgJ7bbSultwJYxqn9T6fUPYHyOBwqWlHmhdk1yMvUvNVd xNvWuQA4skb75FcsMIE3Yy01zvm8CpvRAiyGPIsph3RgKo7K8DGSFqZZ23fGBi8kTsGTRo hQt4U41Na+vI1ExzkP4SZAKoM7mBSmHoulAi9g7vIK13Z9//5edIZE48mzcdZQ== 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 4jPJjK2vcMzlJN for ; Tue, 10 Nov 2026 20:51:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 7dc7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Nov 2026 20:51:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Kyle Evans From: Colin Percival Subject: git: 16edda206cc4 - releng/15.2 - virtio_pci_modern: enable virtqueues before completing attach List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.2 X-Git-Reftype: branch X-Git-Commit: 16edda206cc4972a9fbe1433fb5bb25907fc40cc Auto-Submitted: auto-generated Date: Tue, 10 Nov 2026 20:51:33 +0000 Message-Id: <6af383d5.7dc7.48e0f4c8@gitrepo.freebsd.org> The branch releng/15.2 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=16edda206cc4972a9fbe1433fb5bb25907fc40cc commit 16edda206cc4972a9fbe1433fb5bb25907fc40cc Author: Kyle Evans AuthorDate: 2026-11-04 21:31:31 +0000 Commit: Colin Percival CommitDate: 2026-11-10 20:51:14 +0000 virtio_pci_modern: enable virtqueues before completing attach Most of our drivers setup interrupt(s) and virtqueues are enabled at that time, but nothing will currently enable them for devices that we're only going to poll. This most notably affects virtio-random, and the problem can be observed with qemu's q35 emulation and a random device attached. The q35 implementation ignores the ring unless it's enabled, so vtrnd_harvest() will consistently EAGAIN rather than contribute anything of value, but with this patch it becomes functional. This can be reproduced with a qemu invocation like so: qemu-system-x86_64 -machine q35,accel=tcg -cpu max -smp 2 -m 2G \ -drive file=FreeBSD-16.0-CURRENT-amd64-ufs.qcow2,if=virtio \ -device pcie-root-port,id=rp1,bus=pcie.0,chassis=1 \ -object rng-random,id=rng0,filename=/dev/urandom \ -device virtio-rng-pci,rng=rng0,bus=rp1 \ -display curses Approved by: re (cperciva) Reviewed by: bnovkov, kfv Sponsored by: Stormshield Sponsored by: Klara, Inc. (cherry picked from commit c67e695b8f7eff84f7daa9e30eba7eb5ec552436) (cherry picked from commit ffa1d4d70a747abccc476321beaea7d1c0bd1cda) --- sys/dev/virtio/pci/virtio_pci_modern.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/sys/dev/virtio/pci/virtio_pci_modern.c b/sys/dev/virtio/pci/virtio_pci_modern.c index 4b16b198b3f0..685b113d11c4 100644 --- a/sys/dev/virtio/pci/virtio_pci_modern.c +++ b/sys/dev/virtio/pci/virtio_pci_modern.c @@ -1145,6 +1145,13 @@ vtpci_modern_probe_and_attach_child(struct vtpci_modern_softc *sc) /* Reset state for later attempt. */ vtpci_modern_child_detached(dev, child); } else { + /* + * It may be the case that the device will only be polled and + * an interrupt never configured, so enable our virtqueues here + * if they hadn't been already. + */ + vtpci_modern_enable_virtqueues(sc); + vtpci_modern_set_status(sc, VIRTIO_CONFIG_STATUS_DRIVER_OK); VIRTIO_ATTACH_COMPLETED(child); } @@ -1296,6 +1303,9 @@ vtpci_modern_enable_virtqueues(struct vtpci_modern_softc *sc) for (idx = 0; idx < sc->vtpci_common.vtpci_nvqs; idx++) { vtpci_modern_select_virtqueue(sc, idx); + if (vtpci_modern_read_common_2(sc, + VIRTIO_PCI_COMMON_Q_ENABLE) != 0) + continue; vtpci_modern_write_common_2(sc, VIRTIO_PCI_COMMON_Q_ENABLE, 1); } }