Page MenuHomeFreeBSD
Differential D29708

bhyve: Add virtio modern support handling
Needs ReviewPublic
Actions

Authored by khng on Apr 11 2021, 5:03 PM.
Tags
None
Referenced Files
Unknown Object (File)
Wed, Jan 21, 10:06 PM
Unknown Object (File)
Tue, Jan 20, 1:20 AM
Unknown Object (File)
Wed, Jan 14, 8:13 AM
Unknown Object (File)
Tue, Jan 13, 10:20 PM
Unknown Object (File)
Mon, Jan 12, 3:31 AM
Unknown Object (File)
Sun, Jan 11, 7:48 PM
Unknown Object (File)
Fri, Jan 9, 1:58 PM
Unknown Object (File)
Thu, Jan 8, 8:18 AM
View All Files
Subscribers
afedorov
bcran
corvink
emaste
imp
lwhsu
novel
rgrimes

Details

Reviewers
None
Group Reviewers
bhyve
Summary

This adds virtio modern support handling to bhyve.
pci_emul_add_capability is exposed to support PCIY_VENDOR-type
virtio modern capabilities.

Current virtio devices are slightly changed to adopt
vi_pci_cfgread/vi_pci_cfg_write.

Virtio modern is not exposed to device emulation code currently.

Sponsored by: The FreeBSD Foundation

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
Lint Passed
Unit
No Test Coverage
Build Status
Buildable 38506
Build 35395: arc lint + arc unit

Event Timeline

khng created this revision.Apr 11 2021, 5:03 PM
Herald added a reviewer: bhyve. · View Herald TranscriptApr 11 2021, 5:03 PM
Herald added subscribers: bcran, rgrimes, imp. · View Herald Transcript
khng requested review of this revision.Apr 11 2021, 5:03 PM
Harbormaster completed remote builds in B38506: Diff 87260.Apr 11 2021, 5:03 PM
afedorov added a subscriber: afedorov.Apr 11 2021, 7:19 PM
lwhsu added a subscriber: lwhsu.Apr 23 2021, 7:08 AM
grehan mentioned this in D30020: bhyve: add virtio-input emulation.Jun 4 2021, 7:21 AM
khng updated this revision to Diff 91213.Jun 22 2021, 1:04 PM

Rebased after virtio-input support was added

Harbormaster completed remote builds in B40043: Diff 91213.Jun 22 2021, 1:04 PM
khng updated this revision to Diff 91259.Jun 23 2021, 10:04 AM

VS_LOCK/VS_UNLOCK in vi_interrupt causes deadlock in case MSI-X is disabled.

Harbormaster completed remote builds in B40058: Diff 91259.Jun 23 2021, 10:04 AM
corvink added a subscriber: corvink.Feb 3 2023, 8:56 AM

What's the state of this patch? Does it still works?

novel added a subscriber: novel.Oct 15 2025, 5:49 PM

I was looking into getting virtio-input working for Linux guests which apparently do not support legacy virtio input devices.

I was able to rebase this patch onto a fresh -CURRENT, it wasn't particularly straightforward, so I'm not sure I did it properly.

Anyway, I was able to boot a Linux guest, and lspci shows these devices like:

00:04.0 Ethernet controller: Red Hat, Inc. Virtio network device
        Subsystem: Red Hat, Inc. Device 0001
        Control: I/O+ Mem+ BusMaster+ SpecCycle- MemWINV+ VGASnoop- ParErr- Stepping- SERR- FastB2B- DisINTx+
        Status: Cap+ 66MHz- UDF- FastB2B- ParErr- DEVSEL=fast >TAbort- <TAbort- <MAbort- >SERR- <PERR- INTx-
        Latency: 64
        Interrupt: pin A routed to IRQ 17
        Region 0: I/O ports at 2080 [size=64]
        Region 1: Memory at c2004000 (32-bit, non-prefetchable) [size=8K]
        Region 2: Memory at 800000000 (64-bit, non-prefetchable) [size=32K]
        Capabilities: [40] MSI-X: Enable+ Count=3 Masked-
                Vector table: BAR=1 offset=00000000
                PBA: BAR=1 offset=00001000
        Capabilities: [4c] MSI: Enable- Count=1/1 Maskable- 64bit+
                Address: 0000000000000000  Data: 0000
        Capabilities: [5c] Vendor Specific Information: VirtIO: CommonCfg
                BAR=2 offset=00000000 size=00001000
        Capabilities: [6c] Vendor Specific Information: VirtIO: Notify
                BAR=2 offset=00001000 size=00002000 multiplier=00001000
        Capabilities: [80] Vendor Specific Information: VirtIO: DeviceCfg
                BAR=2 offset=00003000 size=00001000
        Capabilities: [90] Vendor Specific Information: VirtIO: ISR
                BAR=2 offset=00004000 size=00001000
        Capabilities: [a0] Vendor Specific Information: VirtIO: <unknown>
                BAR=0 offset=00000000 size=00000000
        Kernel driver in use: virtio-pci

...

00:06.0 Input device controller: Red Hat, Inc. Virtio 1.0 input (rev 01)
        Subsystem: Oracle/SUN Device 1100
        Control: I/O+ Mem+ BusMaster- SpecCycle- MemWINV+ VGASnoop- ParErr- Stepping- SERR- FastB2B- DisINTx-
        Status: Cap+ 66MHz- UDF- FastB2B- ParErr- DEVSEL=fast >TAbort- <TAbort- <MAbort- >SERR- <PERR- INTx-
        Interrupt: pin A routed to IRQ 19
        Region 1: Memory at c2002000 (32-bit, non-prefetchable) [size=8K]
        Capabilities: [40] MSI-X: Enable- Count=3 Masked-
                Vector table: BAR=1 offset=00000000
                PBA: BAR=1 offset=00001000
        Capabilities: [4c] MSI: Enable- Count=1/1 Maskable- 64bit+
                Address: 0000000000000000  Data: 0000

00:07.0 SCSI storage controller: Red Hat, Inc. Virtio block device
        Subsystem: Red Hat, Inc. Device 0002
        Control: I/O+ Mem+ BusMaster+ SpecCycle- MemWINV+ VGASnoop- ParErr- Stepping- SERR- FastB2B- DisINTx+
        Status: Cap+ 66MHz- UDF- FastB2B- ParErr- DEVSEL=fast >TAbort- <TAbort- <MAbort- >SERR- <PERR- INTx-
        Latency: 64
        Interrupt: pin A routed to IRQ 20
        Region 0: I/O ports at 2000 [size=128]
        Region 1: Memory at c2000000 (32-bit, non-prefetchable) [size=8K]
        Region 2: Memory at 800008000 (64-bit, non-prefetchable) [size=16K]
        Capabilities: [40] MSI-X: Enable+ Count=2 Masked-
                Vector table: BAR=1 offset=00000000
                PBA: BAR=1 offset=00001000
        Capabilities: [4c] MSI: Enable- Count=1/1 Maskable- 64bit+
                Address: 0000000000000000  Data: 0000
        Capabilities: [5c] Vendor Specific Information: VirtIO: CommonCfg
                BAR=2 offset=00000000 size=00001000
        Capabilities: [6c] Vendor Specific Information: VirtIO: Notify
                BAR=2 offset=00001000 size=00001000 multiplier=00001000
        Capabilities: [80] Vendor Specific Information: VirtIO: DeviceCfg
                BAR=2 offset=00002000 size=00001000
        Capabilities: [90] Vendor Specific Information: VirtIO: ISR
                BAR=2 offset=00003000 size=00001000
        Capabilities: [a0] Vendor Specific Information: VirtIO: <unknown>
                BAR=0 offset=00000000 size=00000000
        Kernel driver in use: virtio-pci

Virtio-input doesn't work still though:

kernel: virtio-pci 0000:00:06.0: virtio_pci: leaving for legacy driver

That's probably expected as in the original patch I don't see vc_en_modern and vc_hv_caps_modern set for the virtio-input.

When I update the code to set it, bhyve complains with:

vtinput: writing bad value to device_feature_select

Any hints how to update the virtio-input related bits?

FWIW, I pushed a rebased branch on github if somebody wants to experiment https://github.com/novel/freebsd-src/tree/D29708-rebase

emaste added a subscriber: emaste.Oct 20 2025, 6:30 PM

Revision Contents
Changeset List

PathSize
usr.sbin/
bhyve/
2 lines
16 lines
4 lines
4 lines
4 lines
6 lines
4 lines
4 lines
97 lines
1198 lines

Diff 87260

View Options

usr.sbin/bhyve/pci_emul.h

Loading...
View Options

usr.sbin/bhyve/pci_emul.c

Loading...
View Options

usr.sbin/bhyve/pci_virtio_9p.c

Loading...
View Options

usr.sbin/bhyve/pci_virtio_block.c

Loading...
View Options

usr.sbin/bhyve/pci_virtio_console.c

Loading...
View Options

usr.sbin/bhyve/pci_virtio_net.c

Loading...
View Options

usr.sbin/bhyve/pci_virtio_rnd.c

Loading...
View Options

usr.sbin/bhyve/pci_virtio_scsi.c

Loading...
View Options

usr.sbin/bhyve/virtio.h

Loading...
View Options

usr.sbin/bhyve/virtio.c

Loading...