Want virtio-vsock support

Cargo.toml

@@ -132,13 +132,15 @@ 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"
 libc = "0.2"
 mockall = "0.12"
 newtype_derive = "0.1.6"
 newtype-uuid = { version = "1.0.1", features = [ "v4" ] }
+nix = { version = "0.31", features = [ "poll" ] }
 owo-colors = "4"
 oxide-tokio-rt = "0.1.2"
 paste = "1.0.15"

bin/propolis-standalone/src/config.rs

@@ -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;
@@ -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>,

bin/propolis-standalone/src/main.rs

@@ -1319,6 +1319,18 @@ fn setup_instance(
                         guard.inventory.register(&pvpanic);
                     }
                 }
+                "pci-virtio-vsock" => {
+                    let config = config::VsockDevice::from_opts(&dev.options)?;
+                    let bdf = bdf.unwrap();
+                    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(

lib/propolis/Cargo.toml

@@ -39,6 +39,8 @@ crucible = { workspace = true, optional = true }
 oximeter = { workspace = true, optional = true }
 nexus-client = { workspace = true, optional = true }
 async-trait.workspace = true
+iddqd.workspace = true
+nix.workspace = true
 
 # falcon
 libloading = { workspace = true, optional = true }

lib/propolis/src/hw/virtio/mod.rs

@@ -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;
@@ -29,6 +33,7 @@ use queue::VirtQueue;
 
 pub use block::PciVirtioBlock;
 pub use viona::PciVirtioViona;
+pub use vsock::PciVirtioSock;
 
 bitflags! {
     pub struct LegacyFeatures: u64 {
@@ -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),
         }
     }
@@ -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,

lib/propolis/src/hw/virtio/queue.rs

@@ -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 {
                 let avail_idx = self.cur_avail_idx.0 & (rsize - 1);
                 self.cur_avail_idx += Wrapping(1);