Skip to content

Want virtio-vsock support #1031

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
papertigers wants to merge 3 commits into
base: master
Choose a base branch
from
+3,640 −1
Open

Want virtio-vsock support #1031

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
893c41d
[jj-spr] initial version
papertigers Feb 5, 2026
ab2542a
add license to poller_stub.rs
papertigers Feb 5, 2026
feba06b
fix gha style check
papertigers Feb 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ hex = "0.4.3"
http = "1.1.0"
hyper = "1.0"
linkme = "0.3.33"
iddqd = "0.3"
itertools = "0.13.0"
kstat-rs = "0.2.4"
lazy_static = "1.4"
Expand Down
15 changes: 15 additions & 0 deletions bin/propolis-standalone/src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ use std::sync::Arc;

use anyhow::Context;
use cpuid_utils::CpuidSet;
use propolis::vsock::proxy::VsockPortMapping;
use propolis_types::CpuidIdent;
use propolis_types::CpuidValues;
use propolis_types::CpuidVendor;
Expand Down Expand Up @@ -170,6 +171,20 @@ impl VionaDeviceParams {
}
}

#[derive(Deserialize)]
pub struct VsockDevice {
pub guest_cid: u32,
pub port_mappings: Vec<VsockPortMapping>,
}

impl VsockDevice {
pub fn from_opts(
opts: &BTreeMap<String, toml::Value>,
) -> Result<VsockDevice, anyhow::Error> {
opt_deser(opts)
}
}

// Try to turn unmatched flattened options into a config struct
fn opt_deser<'de, T: Deserialize<'de>>(
value: &BTreeMap<String, toml::Value>,
Expand Down
13 changes: 13 additions & 0 deletions bin/propolis-standalone/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1308,6 +1308,19 @@ fn setup_instance(
guard.inventory.register(&pvpanic);
}
}
"pci-virtio-vsock" => {
// XXX MTZ: add the vsock device
Copy link
Member

@hawkw hawkw Feb 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

isn't that what this PR does?

Suggested change
// XXX MTZ: add the vsock device

let config = config::VsockDevice::from_opts(&dev.options)?;
let bdf = bdf.unwrap();
Copy link
Contributor

@jordanhendricks jordanhendricks Feb 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

throw in an error message here if no bdf is specified?

let vsock = hw::virtio::PciVirtioSock::new(
512,
config.guest_cid,
log.new(slog::o!("dev" => "vsock")),
config.port_mappings,
);
guard.inventory.register(&vsock);
chipset_pci_attach(bdf, vsock);
}
_ => {
slog::error!(log, "unrecognized driver {driver}"; "name" => name);
return Err(Error::new(
Expand Down
1 change: 1 addition & 0 deletions lib/propolis/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ crucible = { workspace = true, optional = true }
oximeter = { workspace = true, optional = true }
nexus-client = { workspace = true, optional = true }
async-trait.workspace = true
iddqd.workspace = true

# falcon
libloading = { workspace = true, optional = true }
Expand Down
7 changes: 7 additions & 0 deletions lib/propolis/src/hw/virtio/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ mod queue;
#[cfg(feature = "falcon")]
pub mod softnpu;
pub mod viona;
pub mod vsock;

#[cfg(test)]
pub mod testutil;

use crate::common::RWOp;
use crate::hw::pci as pci_hw;
Expand All @@ -29,6 +33,7 @@ use queue::VirtQueue;

pub use block::PciVirtioBlock;
pub use viona::PciVirtioViona;
pub use vsock::PciVirtioSock;

bitflags! {
pub struct LegacyFeatures: u64 {
Expand Down Expand Up @@ -165,6 +170,7 @@ impl DeviceId {
match self {
Self::Network => Ok(pci_hw::bits::CLASS_NETWORK),
Self::Block | Self::NineP => Ok(pci_hw::bits::CLASS_STORAGE),
Self::Socket => Ok(pci_hw::bits::CLASS_UNCLASSIFIED),
_ => Err(self),
}
}
Expand Down Expand Up @@ -228,6 +234,7 @@ pub trait VirtioIntr: Send + 'static {
fn read(&self) -> VqIntr;
}

#[derive(Debug)]
pub enum VqChange {
/// Underlying virtio device has been reset
Reset,
Expand Down
2 changes: 1 addition & 1 deletion lib/propolis/src/hw/virtio/queue.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ impl VqAvail {
}
if let Some(idx) = mem.read::<u16>(self.gpa_idx) {
let ndesc = Wrapping(*idx) - self.cur_avail_idx;
if ndesc.0 != 0 && ndesc.0 < rsize {
if ndesc.0 != 0 && ndesc.0 <= rsize {
Copy link
Member

@hawkw hawkw Feb 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this a fix for a previous existing bug?

let avail_idx = self.cur_avail_idx.0 & (rsize - 1);
self.cur_avail_idx += Wrapping(1);

Expand Down
Loading
Loading