From nobody Sun Apr 26 08:05:03 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 4g3K4J0qSrz6bCd5 for ; Sun, 26 Apr 2026 08:05:04 +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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g3K4H5Hwvz44lh for ; Sun, 26 Apr 2026 08:05:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777190703; 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=SISbAq41nWjoMo5vOf1gLT077pzUVqkhyUwDtpuztow=; b=lT35fUdH+ArT1bJWfZzQgPuGAkLCEWbtI10h0XgrG08jueCcMb0obSLEGSQeO/TCwruIIV 1/g2kKilL68CInFHp51WF/u9FEHKc3UtvnwD3Zk75cOmbKJ49C4zcPtg+waPobPWR3rJzz 6YV0xmoKGCiwAhUczXtRKdo/Zxe8HLgdH9KTmHzCCFSf5nkB0HvR7+WA/1hlvc0JMfoQo5 D+4ZpVqynxvx2mdDtYHIGyUN3d6aSTOjq7b7XPUga9Uj67SpZ7XeapMF1ElI6XAKcIt2L/ qEBevZSewOFU16IbOOYOu8+kglkzx3NuFp8+YkFz041vERYJnf3G1xDD/TyP2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777190703; a=rsa-sha256; cv=none; b=neTCapi01uLlUFkEQ76HupmZJd1RpVWmykOKdohtjOscoHQ1llzHBTQ18jltuB1tejTdvg 8xGibEva0wpSUP3uEqH+R6xIx7Uki+biSUzaszpICzW5HA3RzI8laj1Dk8AMShiTANVr0v 2HjeWDIw9lsO1LfIDi60V9vRILpo7sjpkqjhtFo8GDrZhfyhquhcECTgTyC1F/WwIWaJyE K2LZYVX4R6aORxNnAPyAOkZn9XYzPimZ7lDit4Md6SvAWu9znNN+crDBkBizSOe4DJphkV /h9b60FvR6Ksknz10hbUSrSiCwnJJqzEj3O+UqppowBnb1lToASX6fw8ZBZibg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777190703; 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=SISbAq41nWjoMo5vOf1gLT077pzUVqkhyUwDtpuztow=; b=FWzCV2NC2O4h1SgLspjddYmDBlVsLNn7hlRESe+ok9f//UTOApb/ND+FlTB7kJmETfTIgY nCilyMDMb3pae3KmdQGgLGWVMHJABj7uck1BHsMHT/su0abbaRLRnLcVS8lTlOPpOIQCLe X5i9cNP/k+ZPArk61tgqAvFKo0gNJ+V99H+GNV7NIVttvMOOfcE8tIUaTiHbFMMNKxS78K +RxqmzAhx6DWRh24edcLpJrC0PTC60wymZ6iK0ZPwicac903lnA3z9oqkR+Q9FV9YPGviG sPrNyT/JghIteShiyDfrrdFhpaHpYpMa+El20GAWKcdE1g4ILbwICk8zaHVf3A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g3K4H4GrMz19SL for ; Sun, 26 Apr 2026 08:05:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27b9e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 26 Apr 2026 08:05:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Timo =?utf-8?Q?V=C3=B6lker?= From: Michael Tuexen Subject: git: 8e13e9865402 - stable/15 - virtio: add loader tunables to sysctl List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 8e13e9865402a4148132da40481b05184e52f1f3 Auto-Submitted: auto-generated Date: Sun, 26 Apr 2026 08:05:03 +0000 Message-Id: <69edc72f.27b9e.23cdc6bb@gitrepo.freebsd.org> The branch stable/15 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=8e13e9865402a4148132da40481b05184e52f1f3 commit 8e13e9865402a4148132da40481b05184e52f1f3 Author: Timo Völker AuthorDate: 2026-03-02 18:15:37 +0000 Commit: Michael Tuexen CommitDate: 2026-04-26 08:03:35 +0000 virtio: add loader tunables to sysctl virtio_pci uses two loader tunables that should be more visible. This patch adds these loader tunables to sysctl and describes them in the virtio(4) man page. Reviewed by: imp (erlier version), tuexen Differential Revision: https://reviews.freebsd.org/D55533 Event: Wiesbaden Hackathon 2026 (cherry picked from commit c70755bc0d8f703dbaa1520c15e8213a95847dd5) --- share/man/man4/virtio.4 | 28 ++++++++++++++++++++++++++-- sys/dev/virtio/pci/virtio_pci.c | 7 ++++++- sys/dev/virtio/pci/virtio_pci_modern.c | 7 ++++++- sys/dev/virtio/virtio.c | 4 ++++ 4 files changed, 42 insertions(+), 4 deletions(-) diff --git a/share/man/man4/virtio.4 b/share/man/man4/virtio.4 index 1e5ea0e4a7da..0598d5d8621d 100644 --- a/share/man/man4/virtio.4 +++ b/share/man/man4/virtio.4 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd May 26, 2019 +.Dd March 2, 2026 .Dt VIRTIO 4 .Os .Sh NAME @@ -54,7 +54,7 @@ The .Nm module provides a shared memory transport called a virtqueue. The -.Xr virtio_pci +.Sy virtio_pci device driver represents an emulated PCI device that the hypervisor makes available to the VM. This device provides the probing, configuration, and @@ -92,6 +92,30 @@ An emulated SCSI HBA is provided by the .Xr virtio_scsi 4 device driver. .El +.Sh LOADER TUNABLES +Tunables can be set at the +.Xr loader 8 +prompt before booting the kernel or stored in +.Xr loader.conf 5 . +.Bl -tag -width "hw.virtio.pci.transitional" +.It Va hw.virtio.pci.disable_msix +If set to 1, disables MSI-X. +The default value is 0. +.It Va hw.virtio.pci.transitional +For a transitional +.Nm +device, this tunable specifies whether to negotiate +modern mode and use the modern +.Nm +driver +.Pq 1 +or to negotiate legacy mode and +use the legacy +.Nm +driver +.Pq 1 . +The default value is 0. +.El .Sh SEE ALSO .Xr virtio_balloon 4 , .Xr virtio_blk 4 , diff --git a/sys/dev/virtio/pci/virtio_pci.c b/sys/dev/virtio/pci/virtio_pci.c index b7b34b448f6e..2d33d99014ae 100644 --- a/sys/dev/virtio/pci/virtio_pci.c +++ b/sys/dev/virtio/pci/virtio_pci.c @@ -97,8 +97,13 @@ MODULE_VERSION(virtio_pci, 1); MODULE_DEPEND(virtio_pci, pci, 1, 1, 1); MODULE_DEPEND(virtio_pci, virtio, 1, 1, 1); +SYSCTL_DECL(_hw_virtio); +SYSCTL_NODE(_hw_virtio, OID_AUTO, pci, CTLFLAG_RD | CTLFLAG_MPSAFE, 0, + "VirtIO PCI driver parameters"); + int vtpci_disable_msix = 0; -TUNABLE_INT("hw.virtio.pci.disable_msix", &vtpci_disable_msix); +SYSCTL_INT(_hw_virtio_pci, OID_AUTO, disable_msix, CTLFLAG_RDTUN, + &vtpci_disable_msix, 0, "If set to 1, disables MSI-X."); static uint8_t vtpci_read_isr(struct vtpci_common *cn) diff --git a/sys/dev/virtio/pci/virtio_pci_modern.c b/sys/dev/virtio/pci/virtio_pci_modern.c index eb1d5a1e6989..108fd2b5f8e9 100644 --- a/sys/dev/virtio/pci/virtio_pci_modern.c +++ b/sys/dev/virtio/pci/virtio_pci_modern.c @@ -33,6 +33,7 @@ #include #include #include +#include #include #include @@ -188,8 +189,12 @@ static void vtpci_modern_write_device_8(struct vtpci_modern_softc *, bus_size_t, uint64_t); /* Tunables. */ +SYSCTL_DECL(_hw_virtio_pci); + static int vtpci_modern_transitional = 0; -TUNABLE_INT("hw.virtio.pci.transitional", &vtpci_modern_transitional); +SYSCTL_INT(_hw_virtio_pci, OID_AUTO, transitional, CTLFLAG_RDTUN, + &vtpci_modern_transitional, 0, + "If 0, a transitional VirtIO device is used in legacy mode; otherwise, in modern mode."); static device_method_t vtpci_modern_methods[] = { /* Device interface. */ diff --git a/sys/dev/virtio/virtio.c b/sys/dev/virtio/virtio.c index 75d65ba4a8c8..be5edcafa7ff 100644 --- a/sys/dev/virtio/virtio.c +++ b/sys/dev/virtio/virtio.c @@ -30,6 +30,7 @@ #include #include #include +#include #include #include @@ -90,6 +91,9 @@ static struct virtio_feature_desc virtio_common_feature_desc[] = { { 0, NULL } }; +SYSCTL_NODE(_hw, OID_AUTO, virtio, CTLFLAG_RD | CTLFLAG_MPSAFE, 0, + "VirtIO driver parameters"); + const char * virtio_device_name(uint16_t devid) {